diff --git a/.ci/check-performance-regression.sh b/.ci/check-performance-regression.sh
new file mode 100755
index 00000000000..776bf6f4db1
--- /dev/null
+++ b/.ci/check-performance-regression.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+set -e
+
+# max difference tolerance in %
+THRESHOLD_PERCENTAGE=10
+# baseline of execution time in seconds
+BASELINE_SECONDS=415.72
+
+# JDK version
+JDK_VERSION=17
+# sample project path
+SAMPLE_PROJECT="./.ci-temp/jdk$JDK_VERSION"
+# suppression file
+SUPPRESSION_FILE="./config/projects-to-test/openjdk$JDK_VERSION-excluded.files"
+# config file
+CONFIG_FILE="./config/benchmark-config.xml"
+
+# execute a command and time it
+# $TEST_COMMAND: command being timed
+time_command() {
+  # execute the command and time it
+  /usr/bin/time -o time.temp -q -f "%e" "$@" &>result.tmp
+
+  cat time.temp
+}
+
+# execute the benchmark a few times to calculate the average metrics
+# $JAR_PATH: path of the jar file being benchmarked
+execute_benchmark() {
+  local JAR_PATH=$1
+  if [ -z "$JAR_PATH" ]; then
+      echo "Missing JAR_PATH as an argument."
+      exit 1
+  fi
+
+  local TOTAL_SECONDS=0
+  local NUM_EXECUTIONS=3
+
+  [ ! -d "$SAMPLE_PROJECT" ] &&
+    echo "Directory $SAMPLE_PROJECT DOES NOT exist." | exit 1
+
+  # add suppressions to config file
+  sed -i "/  <!-- Filters -->/r $SUPPRESSION_FILE" \
+        $CONFIG_FILE
+
+  for ((i = 0; i < NUM_EXECUTIONS; i++)); do
+    local CMD=(java -jar "$JAR_PATH" -c "$CONFIG_FILE" \
+      -x .git -x module-info.java "$SAMPLE_PROJECT")
+    local BENCHMARK=($(time_command "${CMD[@]}"))
+    TOTAL_SECONDS=$(echo "$TOTAL_SECONDS + $BENCHMARK" | bc)
+  done
+
+  # average execution time in patch
+  local AVERAGE_IN_SECONDS=$(echo "scale=2; $TOTAL_SECONDS / $NUM_EXECUTIONS" | bc)
+  echo "$AVERAGE_IN_SECONDS"
+}
+
+# compare baseline and patch benchmarks
+# $EXECUTION_TIME_SECONDS execution time of the patch
+compare_results() {
+  local EXECUTION_TIME_SECONDS=$1
+  if [ -z "$EXECUTION_TIME_SECONDS" ]; then
+        echo "Missing EXECUTION_TIME_SECONDS as an argument."
+        exit 1
+    fi
+  # Calculate percentage difference for execution time
+  local DEVIATION_IN_SECONDS=$(echo "scale=4; \
+    ((${EXECUTION_TIME_SECONDS} - ${BASELINE_SECONDS}) / ${BASELINE_SECONDS}) * 100" | bc)
+  echo "Execution Time Difference: $DEVIATION_IN_SECONDS%"
+
+  # Check if differences exceed the maximum allowed difference
+  if (( $(echo "$DEVIATION_IN_SECONDS > $THRESHOLD_PERCENTAGE" | bc -l) )); then
+    echo "Difference exceeds the maximum allowed difference (${DEVIATION_IN_SECONDS}% \
+     > ${THRESHOLD_PERCENTAGE}%)!"
+    exit 1
+  else
+    echo "Difference is within the maximum allowed difference (${DEVIATION_IN_SECONDS}% \
+     <= ${THRESHOLD_PERCENTAGE}%)."
+    exit 0
+  fi
+}
+
+# package patch
+mvn -e --no-transfer-progress -Passembly,no-validations package
+
+# start benchmark
+echo "Benchmark launching..."
+AVERAGE_IN_SECONDS="$(execute_benchmark "$(find "./target/" -type f -name "checkstyle-*-all.jar")")"
+
+# print the command execution result
+echo "================ MOST RECENT COMMAND RESULT ================="
+cat result.tmp
+
+echo "===================== BENCHMARK SUMMARY ===================="
+echo "Execution Time Baseline: ${BASELINE_SECONDS} s"
+echo "Average Execution Time: ${AVERAGE_IN_SECONDS} s"
+echo "============================================================"
+
+# compare result with baseline
+compare_results "$AVERAGE_IN_SECONDS"
+
+exit $?
diff --git a/.ci/checker-framework.groovy b/.ci/checker-framework.groovy
index d51c0782e1f..5aca6f8b8d1 100644
--- a/.ci/checker-framework.groovy
+++ b/.ci/checker-framework.groovy
@@ -127,7 +127,10 @@ private static List<List<String>> getCheckerFrameworkErrors(final String profile
             checkerFrameworkLines.add(lineFromReader)
             lineFromReader = reader.readLine()
         }
-        process.waitFor()
+        int exitCode = process.waitFor()
+        if (exitCode != 0) {
+            throw new IllegalStateException("Maven process exited with error code: " + exitCode)
+        }
     } finally {
         reader.close()
     }
diff --git a/.ci/codenarc.groovy b/.ci/codenarc.groovy
index c0a8575d132..5ecd8db68d7 100644
--- a/.ci/codenarc.groovy
+++ b/.ci/codenarc.groovy
@@ -1,5 +1,5 @@
 @Grapes(
-        @Grab(group='org.codenarc', module='CodeNarc', version='1.4')
+        @Grab(group='org.codenarc', module='CodeNarc', version='2.2.0')
 )
 @GrabExclude('org.codehaus.groovy:groovy-xml')
 import java.lang.Object
diff --git a/.ci/diff-report.sh b/.ci/diff-report.sh
index 36e2efac305..b5860a8f0bb 100755
--- a/.ci/diff-report.sh
+++ b/.ci/diff-report.sh
@@ -95,6 +95,11 @@ parse-pr-description-text)
   NEW_MODULE_CONFIG_LINK=$(echo "$NEW_MODULE_CONFIG_PARAMETER" | sed -E 's/New module config: //')
   PATCH_CONFIG_LINK=$(echo "$PATCH_CONFIG_PARAMETER" | sed -E 's/Diff Regression patch config: //')
   REPORT_LABEL=$(echo "$REPORT_LABEL_PARAMETER" | sed -E 's/Report label: //')
+  # trim
+  PROJECTS_LINK=$(echo "$PROJECTS_LINK" | tr -d '[:space:]')
+  CONFIG_LINK=$(echo "$CONFIG_LINK" | tr -d '[:space:]')
+  NEW_MODULE_CONFIG_LINK=$(echo "$NEW_MODULE_CONFIG_LINK" | tr -d '[:space:]')
+  PATCH_CONFIG_LINK=$(echo "$PATCH_CONFIG_LINK" | tr -d '[:space:]')
 
   echo "URLs extracted from parameters:"
   echo "PROJECTS_LINK: '$PROJECTS_LINK'"
diff --git a/.ci/generate-extra-site-links.sh b/.ci/generate-extra-site-links.sh
index 3b934ed78bd..40d354e8a2c 100755
--- a/.ci/generate-extra-site-links.sh
+++ b/.ci/generate-extra-site-links.sh
@@ -18,12 +18,19 @@ checkForVariable "REPOSITORY_OWNER"
 echo "PR_NUMBER=$PR_NUMBER"
 echo "AWS_FOLDER_LINK=$AWS_FOLDER_LINK"
 
-# Extract a list of the changed xdocs in the pull request. For example 'src/xdocs/config_misc.xml'.
-CHANGED_XDOCS_PATHS=$(curl --fail-with-body -Ls \
+GITHUB_API_RESPONSE=$(curl --fail-with-body -Ls \
   -H "Accept: application/vnd.github+json" \
   -H "Authorization: Bearer $GITHUB_TOKEN" \
-  "https://api.github.com/repos/$REPOSITORY_OWNER/checkstyle/pulls/$PR_NUMBER/files?per_page=100" |
-  jq -r ".[] | .filename" | grep src/xdocs/ || true)
+  "https://api.github.com/repos/$REPOSITORY_OWNER/checkstyle/pulls/$PR_NUMBER/files?per_page=100")
+echo "GITHUB_API_RESPONSE=$GITHUB_API_RESPONSE"
+
+# Extract a list of the changed xdocs in the pull request. For example 'src/xdocs/config_misc.xml'.
+# We ignore template files and deleted files.
+CHANGED_XDOCS_PATHS=$(echo "$GITHUB_API_RESPONSE" \
+  | jq -r '.[] | select(.status != "removed") | .filename' \
+  | grep src/xdocs/ \
+  | grep -v '.*xml.template$' \
+  || true)
 echo "CHANGED_XDOCS_PATHS=$CHANGED_XDOCS_PATHS"
 
 if [[ -z "$CHANGED_XDOCS_PATHS" ]]; then
diff --git a/.ci/no-exception-test.sh b/.ci/no-exception-test.sh
index 2e6ee11b6d3..29f08aeff4e 100755
--- a/.ci/no-exception-test.sh
+++ b/.ci/no-exception-test.sh
@@ -115,6 +115,28 @@ openjdk20-with-checks-nonjavadoc-error)
   removeFolderWithProtectedFiles contribution
   ;;
 
+openjdk21-with-checks-nonjavadoc-error)
+  LOCAL_GIT_REPO=$(pwd)
+  BRANCH=$(git rev-parse --abbrev-ref HEAD)
+  checkout_from https://github.com/checkstyle/contribution
+  sed -i.'' 's/value=\"error\"/value=\"ignore\"/' \
+        .ci-temp/contribution/checkstyle-tester/checks-nonjavadoc-error.xml
+  cd .ci-temp/contribution/checkstyle-tester
+  cp ../../../config/projects-to-test/openjdk-21-projects-to-test-on.config \
+      openjdk-21-projects-to-test-on.config
+  sed -i '/  <!-- Filters -->/r ../../../config/projects-to-test/openjdk21-excluded.files' \
+      checks-nonjavadoc-error.xml
+  export MAVEN_OPTS="-Xmx2048m"
+  groovy ./diff.groovy --listOfProjects openjdk-21-projects-to-test-on.config \
+      --mode single --allowExcludes \
+      --patchConfig checks-nonjavadoc-error.xml \
+      --localGitRepo  "$LOCAL_GIT_REPO" \
+      --patchBranch "$BRANCH" -xm "-Dcheckstyle.failsOnError=false"
+
+  cd ../../
+  removeFolderWithProtectedFiles contribution
+  ;;
+
 no-exception-lucene-and-others-javadoc)
   CS_POM_VERSION="$(getCheckstylePomVersion)"
   BRANCH=$(git rev-parse --abbrev-ref HEAD)
@@ -218,6 +240,24 @@ no-exception-samples-ant)
   removeFolderWithProtectedFiles checkstyle-samples
   ;;
 
+no-exception-samples-gradle)
+  CS_POM_VERSION="$(getCheckstylePomVersion)"
+  echo 'CS_POM_VERSION='"${CS_POM_VERSION}"
+  mvn -e --no-transfer-progress -B install -Pno-validations
+  checkout_from https://github.com/sevntu-checkstyle/checkstyle-samples
+  cd .ci-temp/checkstyle-samples/gradle-project
+
+  sed -i "s/\(project\.ext\.checkstyleVersion = \)'[0-9.]\+'/\\1'${CS_POM_VERSION}'/" \
+    build.gradle
+
+   echo "Checking gradle properties..."
+  ./gradlew properties
+  ./gradlew check
+
+  cd ../..
+  removeFolderWithProtectedFiles checkstyle-samples
+  ;;
+
 
   *)
   echo "Unexpected argument: $1"
diff --git a/.ci/pitest-survival-check-xml.groovy b/.ci/pitest-survival-check-xml.groovy
index fa58dd33c25..d015cd9bb37 100644
--- a/.ci/pitest-survival-check-xml.groovy
+++ b/.ci/pitest-survival-check-xml.groovy
@@ -267,7 +267,7 @@ private static int printComparisonToConsole(Set<Mutation> survivingMutations,
         println 'No new surviving mutation(s) found.'
     }
     else if (survivingUnsuppressedMutations.isEmpty()
-            && !hasOnlyStableMutations(extraSuppressions)) {
+            && hasOnlyUnstableMutations(extraSuppressions)) {
         exitCode = 0
         println 'No new surviving mutation(s) found.'
     }
@@ -293,13 +293,13 @@ private static int printComparisonToConsole(Set<Mutation> survivingMutations,
 }
 
 /**
- * Whether a set has only stable mutations.
+ * Whether a set has only unstable mutations.
  *
  * @param mutations A set of mutations
- * @return {@code true} if a set has only stable mutations
+ * @return {@code true} if a set has only unstable mutations
  */
-private static boolean hasOnlyStableMutations(Set<Mutation> mutations) {
-    return mutations.every { !it.isUnstable() }
+private static boolean hasOnlyUnstableMutations(Set<Mutation> mutations) {
+    return mutations.every { it.isUnstable() }
 }
 
 /**
diff --git a/.ci/run-link-check-plugin.sh b/.ci/run-link-check-plugin.sh
index 851c146c305..7de3aa985c4 100755
--- a/.ci/run-link-check-plugin.sh
+++ b/.ci/run-link-check-plugin.sh
@@ -15,7 +15,8 @@ OPTION=$1
 
 echo "------------ grep of linkcheck.html--BEGIN"
 LINKCHECK_ERRORS=$(grep -E "doesn't exist|externalLink" target/site/linkcheck.html \
-  | grep -v 'Read timed out' | sed 's/<\/table><\/td><\/tr>//g' || true)
+  | grep -v 'Read timed out' | sed 's/<\/table><\/td><\/tr>//g' \
+  | sed 's/<td><i>//g' | sed 's/<\/i><\/td><\/tr>//g' | sed 's/<\/table><\/section>//g' || true)
 
 if [[ $OPTION == "--skip-external" ]]; then
   echo "Checking internal (checkstyle website) links only."
@@ -25,11 +26,10 @@ else
   echo "$LINKCHECK_ERRORS" | sort > .ci-temp/linkcheck-errors-sorted.txt
 fi
 
-sort config/linkcheck-suppressions.txt | sed 's/<\/table><\/td><\/tr>//g' \
-  > .ci-temp/linkcheck-suppressions-sorted.txt
+sort config/linkcheck-suppressions.txt > .ci-temp/linkcheck-suppressions-sorted.txt
 
 # Suppressions exist until https://github.com/checkstyle/checkstyle/issues/11572
-diff .ci-temp/linkcheck-suppressions-sorted.txt .ci-temp/linkcheck-errors-sorted.txt || true
+diff -u .ci-temp/linkcheck-suppressions-sorted.txt .ci-temp/linkcheck-errors-sorted.txt || true
 echo "------------ grep of linkcheck.html--END"
 
 RESULT=$(diff -y --suppress-common-lines .ci-temp/linkcheck-suppressions-sorted.txt \
diff --git a/.ci/validation.cmd b/.ci/validation.cmd
index 89e242f95ec..9b75db470b6 100644
--- a/.ci/validation.cmd
+++ b/.ci/validation.cmd
@@ -32,6 +32,19 @@ if "%OPTION%" ==  "site_without_verify" (
   goto :END_CASE
 )
 
+if "%OPTION%" == "git_diff" (
+  for /f "delims=" %%a in ('git status ^| findstr /c:"Changes not staged"') do set output=%%a
+  if defined output (
+    echo Please clean up or update .gitattributes file.
+    echo Git status output:
+    echo Top 300 lines of diff:
+    call git diff | find /v /n "" | findstr /R "^\[[1-2]*[1-9]*[0-9]\]"
+    echo There should be no changes in git repository after any CI job/task
+    goto :ERROR
+  )
+  goto :END_CASE
+)
+
 echo  Unexpected argument %OPTION%
 SET ERRORLEVEL=-1
 goto :END_CASE
diff --git a/.ci/validation.sh b/.ci/validation.sh
index da706869091..31394b483b7 100755
--- a/.ci/validation.sh
+++ b/.ci/validation.sh
@@ -18,6 +18,10 @@ addCheckstyleBundleToAntResolvers() {
     ivysettings.xml
 }
 
+function list_tasks() {
+  cat "${0}" | sed -E -n 's/^([a-zA-Z0-9\-]*)\)$/\1/p' | sort
+}
+
 case $1 in
 
 all-sevntu-checks)
@@ -135,47 +139,52 @@ test)
 
 test-de)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=de -Duser.country=DE -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=de -Duser.country=DE -Xms1024m -Xmx2048m'
   ;;
 
 test-es)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=es -Duser.country=ES -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=es -Duser.country=ES -Xms1024m -Xmx2048m'
   ;;
 
 test-fi)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=fi -Duser.country=FI -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=fi -Duser.country=FI -Xms1024m -Xmx2048m'
   ;;
 
 test-fr)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=fr -Duser.country=FR -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=fr -Duser.country=FR -Xms1024m -Xmx2048m'
   ;;
 
 test-zh)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=zh -Duser.country=CN -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=zh -Duser.country=CN -Xms1024m -Xmx2048m'
   ;;
 
 test-ja)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=ja -Duser.country=JP -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=ja -Duser.country=JP -Xms1024m -Xmx2048m'
   ;;
 
 test-pt)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=pt -Duser.country=PT -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=pt -Duser.country=PT -Xms1024m -Xmx2048m'
   ;;
 
 test-tr)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=tr -Duser.country=TR -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=tr -Duser.country=TR -Xms1024m -Xmx2048m'
   ;;
 
 test-ru)
   mvn -e --no-transfer-progress clean integration-test failsafe:verify \
-    -DargLine='-Duser.language=ru -Duser.country=RU -Xms1024m -Xmx2048m'
+    -Dsurefire.options='-Duser.language=ru -Duser.country=RU -Xms1024m -Xmx2048m'
+  ;;
+
+test-al)
+  mvn -e --no-transfer-progress clean integration-test failsafe:verify \
+    -Dsurefire.options='-Duser.language=sq -Duser.country=AL -Xms1024m -Xmx2048m'
   ;;
 
 versions)
@@ -527,51 +536,6 @@ javac11)
   done
   ;;
 
-javac14)
-  files=($(grep -Rl --include='*.java' ': Compilable with Java14' \
-        src/test/resources-noncompilable \
-        src/xdocs-examples/resources-noncompilable || true))
-  if [[  ${#files[@]} -eq 0 ]]; then
-    echo "No Java14 files to process"
-  else
-      mkdir -p target
-      for file in "${files[@]}"
-      do
-        javac --release 14 --enable-preview -d target "${file}"
-      done
-  fi
-  ;;
-
-javac15)
-  files=($(grep -Rl --include='*.java' ': Compilable with Java15' \
-        src/test/resources-noncompilable \
-        src/xdocs-examples/resources-noncompilable || true))
-  if [[  ${#files[@]} -eq 0 ]]; then
-    echo "No Java15 files to process"
-  else
-      mkdir -p target
-      for file in "${files[@]}"
-      do
-        javac --release 15 --enable-preview -d target "${file}"
-      done
-  fi
-  ;;
-
-javac16)
-  files=($(grep -Rl --include='*.java' ': Compilable with Java16' \
-        src/test/resources-noncompilable \
-        src/xdocs-examples/resources-noncompilable || true))
-  if [[  ${#files[@]} -eq 0 ]]; then
-    echo "No Java16 files to process"
-  else
-      mkdir -p target
-      for file in "${files[@]}"
-      do
-        javac --release 16 --enable-preview -d target "${file}"
-      done
-  fi
-  ;;
-
 javac17)
   files=($(grep -Rl --include='*.java' ': Compilable with Java17' \
         src/test/resources-noncompilable \
@@ -617,6 +581,21 @@ javac20)
   fi
   ;;
 
+javac21)
+  files=($(grep -Rl --include='*.java' ': Compilable with Java21' \
+        src/test/resources-noncompilable \
+        src/xdocs-examples/resources-noncompilable || true))
+  if [[  ${#files[@]} -eq 0 ]]; then
+    echo "No Java21 files to process"
+  else
+    mkdir -p target
+    for file in "${files[@]}"
+    do
+      javac --release 21 --enable-preview -d target "${file}"
+    done
+  fi
+  ;;
+
 package-site)
   mvn -e --no-transfer-progress package -Passembly,no-validations
   mvn -e --no-transfer-progress site -Dlinkcheck.skip=true
@@ -847,6 +826,20 @@ no-error-htmlunit)
   removeFolderWithProtectedFiles htmlunit
   ;;
 
+no-error-spotbugs)
+  CS_POM_VERSION="$(getCheckstylePomVersion)"
+  echo CS_version: "${CS_POM_VERSION}"
+  mvn -e --no-transfer-progress clean install -Pno-validations
+  echo "Checkout target sources ..."
+  checkout_from https://github.com/spotbugs/spotbugs
+  cd .ci-temp/spotbugs
+  sed -i'' "s/mavenCentral()/mavenLocal(); mavenCentral()/" build.gradle
+  sed -i'' "s/toolVersion.*$/toolVersion '${CS_POM_VERSION}'/" gradle/checkstyle.gradle
+  ./gradlew :eclipsePlugin-junit:checkstyleTest -Dcheckstyle.version="${CS_POM_VERSION}"
+  cd ../
+  removeFolderWithProtectedFiles spotbugs
+  ;;
+
 no-exception-struts)
   CS_POM_VERSION="$(getCheckstylePomVersion)"
   BRANCH=$(git rev-parse --abbrev-ref HEAD)
@@ -857,6 +850,7 @@ no-exception-struts)
   sed -i'' 's/#apache-struts/apache-struts/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -875,6 +869,7 @@ no-exception-checkstyle-sevntu)
   sed -i'' 's/#sevntu-checkstyle/sevntu-checkstyle/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -892,6 +887,7 @@ no-exception-checkstyle-sevntu-javadoc)
   sed -i'' 's/#sevntu-checkstyle/sevntu-checkstyle/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-only-javadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -908,6 +904,7 @@ no-exception-guava)
   sed -i'' 's/#guava/guava/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -923,7 +920,8 @@ no-exception-hibernate-orm)
   sed -i.'' 's/#hibernate-orm/hibernate-orm/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
-       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
+      --useShallowClone \
+      --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
   ;;
@@ -938,6 +936,7 @@ no-exception-spotbugs)
   sed -i.'' 's/#spotbugs/spotbugs/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -953,6 +952,7 @@ no-exception-spoon)
   sed -i.'' 's/#spoon/spoon/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -968,7 +968,8 @@ no-exception-spring-framework)
   sed -i.'' 's/#spring-framework/spring-framework/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
-       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
+      --useShallowClone \
+      --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
   ;;
@@ -983,6 +984,7 @@ no-exception-hbase)
   sed -i.'' 's/#Hbase/Hbase/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -1000,6 +1002,7 @@ no-exception-Pmd-elasticsearch-lombok-ast)
   sed -i.'' 's/#lombok-ast/lombok-ast/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../..  \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -1020,6 +1023,7 @@ no-exception-alot-of-projects)
   sed -i.'' 's/#android-launcher/android-launcher/' projects-to-test-on.properties
   groovy ./diff.groovy --listOfProjects projects-to-test-on.properties \
       --patchConfig checks-nonjavadoc-error.xml  -p "$BRANCH" -r ../../.. \
+      --useShallowClone \
       --allowExcludes --mode single -xm "-Dcheckstyle.failsOnError=false"
   cd ../../
   removeFolderWithProtectedFiles contribution
@@ -1036,6 +1040,7 @@ no-warning-imports-guava)
   cd .ci-temp/contribution/checkstyle-tester
   groovy ./diff.groovy --listOfProjects $PROJECTS --patchConfig $CONFIG \
       --allowExcludes -p "$BRANCH" -r ../../.. \
+      --useShallowClone \
       --mode single -xm "-Dcheckstyle.failsOnError=false"
   RESULT=$(grep -A 5 "&#160;Warning</td>" $REPORT | cat)
   cd ../../
@@ -1061,6 +1066,7 @@ no-warning-imports-java-design-patterns)
   cd .ci-temp/contribution/checkstyle-tester
   groovy ./diff.groovy --listOfProjects $PROJECTS --patchConfig $CONFIG \
       --allowExcludes -p "$BRANCH" -r ../../..\
+      --useShallowClone \
       --mode single
   RESULT=$(grep -A 5 "&#160;Warning</td>" $REPORT | cat)
   cd ../../
@@ -1182,7 +1188,8 @@ check-wildcards-on-pitest-target-classes)
 
 *)
   echo "Unexpected argument: $1"
-  sleep 5s
+  echo "Supported tasks:"
+  list_tasks "${0}"
   false
   ;;
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0c8209dc67..4ac32f23678 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
 
   run-inspections:
     docker:
-      - image: checkstyle/idea-docker:jdk11-idea2022.2.2
+      - image: checkstyle/idea-docker:jdk11-idea2022.3.3
 
     steps:
       - checkout
@@ -75,14 +75,12 @@ jobs:
             export PR_HEAD_SHA=$CIRCLE_SHA1
             export PR_NUMBER=$CIRCLE_PR_NUMBER
             << parameters.command >>
-
   sonarqube:
     docker:
-      - image: checkstyle/jdk-11-groovy-git-mvn:11.0.13__3.0.9__2.25.1__3.6.3
+      - image: checkstyle/jdk-11-groovy-git-mvn:11.0.20.1__2.4.21__2.42.0__3.9.5
 
     steps:
       - checkout
-      - run: apt-get install -y jq
       - run:
           name: Run sonarqube
           command: |
@@ -107,30 +105,31 @@ jobs:
           command: yamllint -f parsable -c config/yamllint.yaml .
 
 workflows:
-  sonarqube:
-    jobs:
-      - sonarqube:
-          context:
-            - sonarqube
+  #  until https://github.com/checkstyle/checkstyle/issues/13209
+  #  sonarqube:
+  #    jobs:
+  #      - sonarqube:
+  #          context:
+  #            - sonarqube
 
   test:
     jobs:
       # no-exception-test script
       - validate-with-maven-script:
           name: "no-exception-lucene-and-others-javadoc"
-          image-name: &custom_img "checkstyle/jdk-11-groovy-git-mvn:11.0.13__3.0.9__2.25.1__3.6.3"
+          image-name: &cs_img "checkstyle/jdk-11-groovy-git-mvn:11.0.20.1__2.4.21__2.42.0__3.9.5"
           command: "./.ci/no-exception-test.sh no-exception-lucene-and-others-javadoc"
       - validate-with-maven-script:
           name: "no-exception-cassandra-storm-tapestry-javadoc"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/no-exception-test.sh no-exception-cassandra-storm-tapestry-javadoc"
       - validate-with-maven-script:
           name: "no-exception-hadoop-apache-groovy-scouter-javadoc"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/no-exception-test.sh no-exception-hadoop-apache-groovy-scouter-javadoc"
       - validate-with-maven-script:
           name: "no-exception-only-javadoc"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/no-exception-test.sh no-exception-only-javadoc"
 
       # validation script
@@ -140,88 +139,97 @@ workflows:
           command: "./.ci/validation.sh no-error-xwiki"
       - validate-with-maven-script:
           name: "no-error-pmd"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-error-pmd"
       - validate-with-maven-script:
           name: "no-exception-struts"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-struts"
       - validate-with-maven-script:
           name: "no-exception-checkstyle-sevntu"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-checkstyle-sevntu"
       - validate-with-maven-script:
           name: "no-exception-checkstyle-sevntu-javadoc"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-checkstyle-sevntu-javadoc"
       - validate-with-maven-script:
           name: "no-exception-guava"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-guava"
       - validate-with-maven-script:
           name: "no-exception-hibernate-orm"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-hibernate-orm"
       - validate-with-maven-script:
           name: "no-exception-spotbugs"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-spotbugs"
       - validate-with-maven-script:
           name: "no-exception-spoon"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-spoon"
       - validate-with-maven-script:
           name: "no-exception-spring-framework"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-spring-framework"
       - validate-with-maven-script:
           name: "no-exception-hbase"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-hbase"
       - validate-with-maven-script:
           name: "no-exception-Pmd-elasticsearch-lombok-ast"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-Pmd-elasticsearch-lombok-ast"
       - validate-with-maven-script:
           name: "no-exception-alot-of-projects"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-exception-alot-of-projects"
       - validate-with-maven-script:
           name: "no-warning-imports-guava"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-warning-imports-guava"
       - validate-with-maven-script:
           name: "no-warning-imports-java-design-patterns"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-warning-imports-java-design-patterns"
       - validate-with-maven-script:
           name: "checkstyle-and-sevntu"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh checkstyle-and-sevntu"
-      - validate-with-maven-script:
-          name: "spotbugs-and-pmd"
-          image-name: *custom_img
-          command: "./.ci/validation.sh spotbugs-and-pmd"
+      # until https://github.com/spotbugs/spotbugs-maven-plugin/issues/806
+      # - validate-with-maven-script:
+      #    name: "spotbugs-and-pmd"
+      #    image-name: *cs_img
+      #    command: "./.ci/validation.sh spotbugs-and-pmd"
       - validate-with-maven-script:
           name: "site"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh site"
       - validate-with-maven-script:
           name: "release-dry-run"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh release-dry-run"
       - validate-with-maven-script:
           name: "assembly-run-all-jar"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh assembly-run-all-jar"
       - validate-with-maven-script:
           name: "no-error-test-sbe"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh no-error-test-sbe"
+      - validate-with-maven-script:
+          name: "no-error-spotbugs"
+          image-name: *cs_img
+          command: "./.ci/validation.sh no-error-spotbugs"
       - validate-with-maven-script:
           name: "linkcheck-plugin"
           image-name: "cimg/openjdk:11.0.19"
           command: "./.ci/run-link-check-plugin.sh --skip-external"
+      - validate-with-maven-script:
+          name: "no-exception-samples-gradle"
+          image-name: "cimg/openjdk:11.0.19"
+          command: "./.ci/no-exception-test.sh no-exception-samples-gradle"
 
   idea:
     jobs:
@@ -258,18 +266,6 @@ workflows:
       - validate-with-script:
           name: "javac11"
           command: "./.ci/validation.sh javac11"
-      - validate-with-script:
-          name: "javac14"
-          image-name: "cimg/openjdk:14.0.2"
-          command: "./.ci/validation.sh javac14"
-      - validate-with-script:
-          name: "javac15"
-          image-name: "cimg/openjdk:15.0.2"
-          command: "./.ci/validation.sh javac15"
-      - validate-with-script:
-          name: "javac16"
-          image-name: "cimg/openjdk:16.0.2"
-          command: "./.ci/validation.sh javac16"
       - validate-with-script:
           name: "javac17"
           image-name: "cimg/openjdk:17.0.5"
@@ -282,6 +278,10 @@ workflows:
           name: "javac20"
           image-name: "cimg/openjdk:20.0.1"
           command: "./.ci/validation.sh javac20"
+      - validate-with-script:
+          name: "javac21"
+          image-name: "cimg/openjdk:21.0.0"
+          command: "./.ci/validation.sh javac21"
 
   site-validation:
     jobs:
@@ -291,5 +291,5 @@ workflows:
           command: "./.ci/validation.sh package-site"
       - validate-with-maven-script:
           name: "jdk11-package-site"
-          image-name: *custom_img
+          image-name: *cs_img
           command: "./.ci/validation.sh package-site"
diff --git a/.cirrus.yml b/.cirrus.yml
index a223e308590..f9f79eb8489 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,3 +1,4 @@
+only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH
 task:
   name: Windows build
   windows_container:
@@ -29,7 +30,8 @@ task:
     MAVEN_OPTS: "-Dhttp.keepAlive=false \
       -Dmaven.repo.local=%CIRRUS_WORKING_DIR%/.m2 \
       -Dmaven.wagon.http.retryHandler.count=3"
-    MAVEN_VERSION: "3.8.4"
+    # This Maven version here should be same as minimum defined maven version in pom.xml
+    MAVEN_VERSION: "3.6.3"
     PATH: "%PATH%;C:/Program Files/OpenJDK/%OPENJDK_PATH%/bin;\
       C:/ProgramData/chocolatey/lib/maven/apache-maven-%MAVEN_VERSION%/bin;\
       C:/ProgramData/chocolatey/bin"
diff --git a/.gitattributes b/.gitattributes
index ef728b8eefe..6e74fbfb238 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,3 +20,4 @@
 src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockCrlf.java eol=crlf
 src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputCrAsNewlineMultiline.javadoc -text
 src/test/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/InputDosLineEndingAsNewlineMultiline.javadoc eol=crlf
+src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.java eol=crlf
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a6a86b73803..d1dca44b426 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,7 +4,7 @@
 
 * [Reporting issues](https://checkstyle.org/report_issue.html)
 * [How to report a bug?](https://checkstyle.org/report_issue.html#How_to_report_a_bug.3F)
-* [Issue Template](https://github.com/checkstyle/checkstyle/blob/master/.github/ISSUE_TEMPLATE.md)
+* [Issue Template](https://github.com/checkstyle/checkstyle/blob/master/.github/ISSUE_TEMPLATE/bug_report.md)
 
 Please provide issue report in the format that we request, EACH DETAIL IS A HUGE HELP.
 
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 900bd3e48af..70c0b1f2376 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -9,4 +9,3 @@ open_collective: checkstyle
 liberapay: checkstyle
 # issuehunt: # Replace with a single IssueHunt username
 # otechie: # Replace with a single Otechie username
-custom: https://www.bountysource.com/teams/checkstyle/issues
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cb2c3ce8a87..02a6aa481d4 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,3 +11,10 @@ updates:
           - "> 2.1"
     commit-message:
       prefix: dependency
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    commit-message:
+      prefix: dependency
diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
index b6a577e7c5e..81882a664e2 100644
--- a/.github/workflows/actionlint.yml
+++ b/.github/workflows/actionlint.yml
@@ -6,7 +6,8 @@ on:
     paths:
       - '.github/workflows/**'
   pull_request:
-    branches: '*'
+    branches:
+      - '*'
     paths:
       - '.github/workflows/**'
 
@@ -19,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check workflow files
         uses: docker://rhysd/actionlint:latest
diff --git a/.github/workflows/bump-license-year.yml b/.github/workflows/bump-license-year.yml
index b70d1762d0f..493a6fe3cd9 100644
--- a/.github/workflows/bump-license-year.yml
+++ b/.github/workflows/bump-license-year.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set Current Year
         run: |
diff --git a/.github/workflows/bump-version-and-update-milestone.yml b/.github/workflows/bump-version-and-update-milestone.yml
index c005686f6dd..570ff2ac68c 100644
--- a/.github/workflows/bump-version-and-update-milestone.yml
+++ b/.github/workflows/bump-version-and-update-milestone.yml
@@ -29,10 +29,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/check-performance-regression.yml b/.github/workflows/check-performance-regression.yml
new file mode 100644
index 00000000000..8b051d7bf88
--- /dev/null
+++ b/.github/workflows/check-performance-regression.yml
@@ -0,0 +1,50 @@
+#####################################################################################
+# GitHub Action to test performance regression.
+#
+# Workflow starts when:
+# 1) push to master
+# 2) PR created or pushed
+#
+#####################################################################################
+name: Check-Performance-Regression
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches: '*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    if: github.repository == 'checkstyle/checkstyle'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'temurin'
+
+      - name: Checkout Pull Request Code
+        uses: actions/checkout@v4
+
+      - name: Clone JDK 17 Repo
+        uses: actions/checkout@v4
+        with:
+          repository: openjdk/jdk17
+          path: ./.ci-temp/jdk17
+
+      - name: Setup local maven cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
+
+      - name: Run performance test
+        run: |
+          ./.ci/check-performance-regression.sh
diff --git a/.github/workflows/check-pr-description.yml b/.github/workflows/check-pr-description.yml
index f27e42bfc06..f280fd05c9f 100644
--- a/.github/workflows/check-pr-description.yml
+++ b/.github/workflows/check-pr-description.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Do action
         env:
diff --git a/.github/workflows/checker-framework.yml b/.github/workflows/checker-framework.yml
index d00bf0d4558..1af86d8c375 100644
--- a/.github/workflows/checker-framework.yml
+++ b/.github/workflows/checker-framework.yml
@@ -31,18 +31,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 11
+          distribution: 'temurin'
 
       - name: Install groovy
         run: sudo apt install groovy
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
@@ -58,7 +59,7 @@ jobs:
 
       - name: Share patch as artifact to apply on local
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: checker-${{ matrix.profile }}-patch
           path: target/checker-${{ matrix.profile }}.patch
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fa56110640e..408dd81bf6b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,17 +31,17 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v3
 
       # If the Autobuild fails above, remove it and uncomment the following three lines
       #    and modify them (or add more) to build your code if your project
@@ -63,4 +63,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/diff-report.yml b/.github/workflows/diff-report.yml
index 5cd0581ac11..3efada24df7 100644
--- a/.github/workflows/diff-report.yml
+++ b/.github/workflows/diff-report.yml
@@ -27,15 +27,9 @@ permissions:
   contents: read
   pull-requests: write
 
-# Current behavior for concurrency in GitHub Actions:
-# 1) If a Diff-Report workflow is NOT running for this PR, start a new one.
-# 2) If a Diff-Report workflow is running for this PR, queue this workflow.
-# 3) If a Diff-Report workflow is queued for this PR, cancel it and queue this workflow.
-#
-# It would be best to always queue a new workflow, but we are limited by
-# https://github.com/orgs/community/discussions/12835.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+  # run_id is guaranteed to be unique and present
+  group: ${{ github.run_id }}
   cancel-in-progress: false
 
 jobs:
@@ -53,7 +47,7 @@ jobs:
       commit_sha: ${{ steps.branch.outputs.commit_sha }}
 
     steps:
-      - uses: khan/pull-request-comment-trigger@master
+      - uses: shanegenschaw/pull-request-comment-trigger@v2.1.0
         name: React with rocket on run
         with:
           trigger: ','
@@ -65,7 +59,7 @@ jobs:
         if: 'true'
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Getting PR description
         env:
@@ -113,7 +107,7 @@ jobs:
     steps:
 
       - name: Download checkstyle
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download files
         env:
@@ -138,13 +132,13 @@ jobs:
           git fetch forked
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
 
       - name: Download contribution
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: checkstyle/contribution
           path: .ci-temp/contribution
@@ -156,7 +150,7 @@ jobs:
           sudo apt install groovy
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -213,7 +207,7 @@ jobs:
     if: failure() || success()
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get message
         env:
diff --git a/.github/workflows/error-prone.yml b/.github/workflows/error-prone.yml
index 0791a7f15d8..952e6387361 100644
--- a/.github/workflows/error-prone.yml
+++ b/.github/workflows/error-prone.yml
@@ -17,18 +17,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 11
+          distribution: 'temurin'
 
       - name: Install groovy
         run: sudo apt install groovy
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/no-exception-workflow.yml b/.github/workflows/no-exception-workflow.yml
index acea9b0ffa0..07ff2c6107b 100644
--- a/.github/workflows/no-exception-workflow.yml
+++ b/.github/workflows/no-exception-workflow.yml
@@ -18,15 +18,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 11
+          distribution: 'temurin'
 
       - name: Install dependencies
         run: sudo apt install groovy
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: .ci/no-exception-test.sh openjdk17-with-checks-nonjavadoc-error
   # this execution should stay on GitHub actions due to time/ memory limits in other CI
@@ -35,15 +36,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 11
+          distribution: 'temurin'
 
       - name: Install dependencies
         run: sudo apt install groovy
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: .ci/no-exception-test.sh openjdk19-with-checks-nonjavadoc-error
   # this execution should stay on GitHub actions due to time/ memory limits in other CI
@@ -52,14 +54,33 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 11
+          distribution: 'temurin'
 
       - name: Install dependencies
         run: sudo apt install groovy
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: .ci/no-exception-test.sh openjdk20-with-checks-nonjavadoc-error
+  # this execution should stay on GitHub actions due to time/ memory limits in other CI
+  no-exception-openjdk21:
+    if: github.repository == 'checkstyle/checkstyle'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'temurin'
+
+      - name: Install dependencies
+        run: sudo apt install groovy
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - run: .ci/no-exception-test.sh openjdk21-with-checks-nonjavadoc-error
diff --git a/.github/workflows/no-old-refs.yml b/.github/workflows/no-old-refs.yml
index 011b45610a7..f8c33b18bb1 100644
--- a/.github/workflows/no-old-refs.yml
+++ b/.github/workflows/no-old-refs.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Download checkstyle
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: PR linked issues
         id: links
diff --git a/.github/workflows/pitest.yml b/.github/workflows/pitest.yml
index d0553b2a9f1..ddc5f4fb8ec 100644
--- a/.github/workflows/pitest.yml
+++ b/.github/workflows/pitest.yml
@@ -51,9 +51,10 @@ jobs:
     continue-on-error: true
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 11
+          distribution: 'temurin'
 
       - name: Install groovy
         run: |
@@ -61,13 +62,13 @@ jobs:
           sudo apt install groovy
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Generate pitest-${{ matrix.profile }} report
         run: |
@@ -89,7 +90,7 @@ jobs:
 
       - name: Archive code coverage results
         if: failure() || github.ref == 'refs/heads/master'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pitest-${{ matrix.profile }}-coverage-report
           path: |
diff --git a/.github/workflows/release-copy-github-io-to-sourceforge.yml b/.github/workflows/release-copy-github-io-to-sourceforge.yml
index 793ead0d853..5674fb3c823 100644
--- a/.github/workflows/release-copy-github-io-to-sourceforge.yml
+++ b/.github/workflows/release-copy-github-io-to-sourceforge.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure SSH
         env:
diff --git a/.github/workflows/release-maven-perform.yml b/.github/workflows/release-maven-perform.yml
index 2822e781bd7..0e20975f195 100644
--- a/.github/workflows/release-maven-perform.yml
+++ b/.github/workflows/release-maven-perform.yml
@@ -26,13 +26,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: master
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release-maven-prepare.yml b/.github/workflows/release-maven-prepare.yml
index 6b7d4b836b8..74ed97b1af2 100644
--- a/.github/workflows/release-maven-prepare.yml
+++ b/.github/workflows/release-maven-prepare.yml
@@ -29,13 +29,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: master
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release-new-milestone-and-issues-in-other-repos.yml b/.github/workflows/release-new-milestone-and-issues-in-other-repos.yml
index bebcac8602c..268808b1dab 100644
--- a/.github/workflows/release-new-milestone-and-issues-in-other-repos.yml
+++ b/.github/workflows/release-new-milestone-and-issues-in-other-repos.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: master
@@ -41,7 +41,7 @@ jobs:
           sudo apt-get install ncal
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release-publish-releasenotes-twitter.yml b/.github/workflows/release-publish-releasenotes-twitter.yml
index 6406c504965..9858e6f0531 100644
--- a/.github/workflows/release-publish-releasenotes-twitter.yml
+++ b/.github/workflows/release-publish-releasenotes-twitter.yml
@@ -27,12 +27,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release-update-github-io.yml b/.github/workflows/release-update-github-io.yml
index b641bc59199..6ac03f7da07 100644
--- a/.github/workflows/release-update-github-io.yml
+++ b/.github/workflows/release-update-github-io.yml
@@ -27,13 +27,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/checkstyle
           fetch-depth: 0
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
@@ -43,7 +43,7 @@ jobs:
           ./.ci/generate-website.sh ${{ inputs.version }}
 
       - name: Checkout checkstyle.github.io repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/checkstyle.github.io
           token: ${{ secrets.PAT }}
diff --git a/.github/workflows/release-update-github-page.yml b/.github/workflows/release-update-github-page.yml
index b8c03f2026d..a47e8b60110 100644
--- a/.github/workflows/release-update-github-page.yml
+++ b/.github/workflows/release-update-github-page.yml
@@ -29,10 +29,10 @@ jobs:
       contents: write
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release-update-xdoc-with-releasenotes.yml b/.github/workflows/release-update-xdoc-with-releasenotes.yml
index 1f1a85afa0d..d488548af3e 100644
--- a/.github/workflows/release-update-xdoc-with-releasenotes.yml
+++ b/.github/workflows/release-update-xdoc-with-releasenotes.yml
@@ -28,10 +28,10 @@ jobs:
       contents: write
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release-upload-all-jar.yml b/.github/workflows/release-upload-all-jar.yml
index 57815a5d247..f3263b0bc96 100644
--- a/.github/workflows/release-upload-all-jar.yml
+++ b/.github/workflows/release-upload-all-jar.yml
@@ -30,13 +30,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: master
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/releasenotes-gen.yml b/.github/workflows/releasenotes-gen.yml
index 0b568b441e0..702aa57ca77 100644
--- a/.github/workflows/releasenotes-gen.yml
+++ b/.github/workflows/releasenotes-gen.yml
@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Download checkstyle
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/run-link-check.yml b/.github/workflows/run-link-check.yml
index 4cd9eda02e5..d82b0f1998b 100644
--- a/.github/workflows/run-link-check.yml
+++ b/.github/workflows/run-link-check.yml
@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Download checkstyle
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/set-milestone-on-referenced-issue.yml b/.github/workflows/set-milestone-on-referenced-issue.yml
index 8ab8e3aefd8..ba6964c7cc4 100644
--- a/.github/workflows/set-milestone-on-referenced-issue.yml
+++ b/.github/workflows/set-milestone-on-referenced-issue.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set milestone on issue
         env:
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 9e2f2390536..ba1bd185455 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -21,7 +21,7 @@ jobs:
         run: sudo apt install shellcheck
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Execute shellcheck
         run: shellcheck ./.ci/*.sh
diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
index 85aaa6602b6..548fde740df 100644
--- a/.github/workflows/site.yml
+++ b/.github/workflows/site.yml
@@ -27,7 +27,7 @@ permissions:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.issue.number || github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: false
 
 jobs:
   parse_pr_info:
@@ -40,7 +40,7 @@ jobs:
       commit_sha: ${{ steps.branch.outputs.commit_sha }}
 
     steps:
-      - uses: khan/pull-request-comment-trigger@master
+      - uses: shanegenschaw/pull-request-comment-trigger@v2.1.0
         name: React with rocket on run
         with:
           trigger: ','
@@ -77,14 +77,14 @@ jobs:
       message: ${{ steps.out.outputs.message}}
     steps:
       - name: Checkout repository from origin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # fetch-depth - number of commits to fetch.
       # 0 indicates all history for all branches and tags.
       # 0, because we need access to all branches to create a report.
       # ref - branch to checkout.
       - name: Download checkstyle for PR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         env:
           USER_LOGIN: ${{ github.event.issue.user.login }}
         with:
@@ -94,14 +94,14 @@ jobs:
           fetch-depth: 0
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ env.AWS_REGION }}
 
       - name: Setup local maven cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: checkstyle-maven-cache-${{ hashFiles('**/pom.xml') }}
@@ -138,7 +138,7 @@ jobs:
     if: failure() || success()
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get message
         env:
diff --git a/.gitignore b/.gitignore
index 47172199b52..20f6ee4a7ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,9 @@ checkstyle.ipr
 checkstyle.iws
 .idea
 
+# Vscode project files
+.vscode
+
 # Temp files
 *~
 
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 0381599ecdb..733d323fd27 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -47,11 +47,13 @@ blocks:
               values:
                 - .ci/validation.sh all-sevntu-checks
                 - .ci/validation.sh check-missing-pitests
-                - .ci/validation.sh eclipse-static-analysis
+                # until https://github.com/checkstyle/checkstyle/issues/13209
+                # - .ci/validation.sh eclipse-static-analysis
                 - .ci/validation.sh verify-regexp-id
                 - .ci/no-exception-test.sh guava-with-google-checks
                 - .ci/no-exception-test.sh guava-with-sun-checks
-                - .ci/no-exception-test.sh no-exception-samples-ant
+                # until https://github.com/checkstyle/checkstyle/issues/14086
+                # - .ci/no-exception-test.sh no-exception-samples-ant
                 - .ci/validation.sh nondex
                 # until https://github.com/checkstyle/checkstyle/issues/9807
                 # - mvn -e --no-transfer-progress clean package -Passembly,no-validations
diff --git a/README.md b/README.md
index cba86025761..3677cf9268c 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,7 @@ or set of validation rules (best practices).
 
 [![][milestone img]][milestone]
 
-Members chat: [![][gitter_mem img]][gitter_mem]
-Contributors chat: [![][gitter_con img]][gitter_con]
+Contributors chat: [![][matrix_con img]][matrix_con]
 
 The latest release version can be found at
 [GitHub releases](https://github.com/checkstyle/checkstyle/releases/)
@@ -73,8 +72,6 @@ Bugs and Feature requests (not the questions): https://github.com/checkstyle/che
 
 If you want to speed up fixing of issue and want to encourage somebody in
 internet to resolve any issue:
-[![][bountysource img]][bountysource]
-[![][salt.bountysource img]][salt.bountysource]
 [![][flattr img]][flattr]
 [![][liberapay img]][liberapay]
 [![][backers.opencollective img]][backers.opencollective]
@@ -128,11 +125,8 @@ are in the file named "LICENSE.apache20" in this directory.
 [mavenbadge]:https://search.maven.org/search?q=g:%22com.puppycrawl.tools%22%20AND%20a:%22checkstyle%22
 [mavenbadge img]:https://img.shields.io/maven-central/v/com.puppycrawl.tools/checkstyle.svg?label=Maven%20Central
 
-[gitter_mem]:https://gitter.im/checkstyle
-[gitter_mem img]:https://img.shields.io/badge/gitter-JOIN%20CHAT-blue.svg
-
-[gitter_con]:https://gitter.im/checkstyle/checkstyle
-[gitter_con img]:https://badges.gitter.im/Join%20Chat.svg
+[matrix_con]:https://app.element.io/#/room/#checkstyle_checkstyle:gitter.im
+[matrix_con img]:https://matrix.to/img/matrix-badge.svg
 
 [stackoverflow]:https://stackoverflow.com/questions/tagged/checkstyle
 [stackoverflow img]:https://img.shields.io/badge/stackoverflow-CHECKSTYLE-blue.svg
@@ -161,12 +155,6 @@ are in the file named "LICENSE.apache20" in this directory.
 [liberapay]:https://liberapay.com/checkstyle/
 [liberapay img]:https://liberapay.com/assets/widgets/donate.svg
 
-[bountysource]:https://www.bountysource.com/teams/checkstyle/issues
-[bountysource img]:https://api.bountysource.com/badge/team?team_id=3568&style=bounties_posted
-
-[salt.bountysource]:https://salt.bountysource.com/teams/checkstyle
-[salt.bountysource img]:https://img.shields.io/bountysource/team/checkstyle/activity.svg?label=salt.bountysource
-
 [backers.opencollective]:https://opencollective.com/checkstyle/
 [backers.opencollective img]:https://opencollective.com/checkstyle/backers/badge.svg
 
diff --git a/appveyor.yml b/appveyor.yml
index ef00cdd8c29..2083d0a9bed 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,21 +11,21 @@ branches:
 install:
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\maven\apache-maven-3.8.6" )) {
+      if (!(Test-Path -Path "C:\maven\apache-maven-3.8.8" )) {
         (new-object System.Net.WebClient).DownloadFile(
-          'https://downloads.apache.org/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip',
+          'https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.zip',
           'C:\maven-bin.zip'
         )
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
       }
-  - cmd: SET M2_HOME=C:\maven\apache-maven-3.8.6
+  - cmd: SET M2_HOME=C:\maven\apache-maven-3.8.8
   - cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: git config core.autocrlf
   - cmd: mvn --version
   - cmd: java -version
 
 cache:
-  - C:\maven\apache-maven-3.8.6
+  - C:\maven\apache-maven-3.8.8
   - C:\Users\appveyor\.m2
 
 matrix:
@@ -70,6 +70,7 @@ build_script:
       } else {
         Write-Host "build is skipped ..."
       }
+  - ps: ./.ci/validation.cmd git_diff
   - ps: echo "Size of caches (bytes):"
-  - ps: Get-ChildItem -Recurse 'C:\maven\apache-maven-3.8.6' | Measure-Object -Property Length -Sum
+  - ps: Get-ChildItem -Recurse 'C:\maven\apache-maven-3.8.8' | Measure-Object -Property Length -Sum
   - ps: Get-ChildItem -Recurse 'C:\Users\appveyor\.m2' | Measure-Object -Property Length -Sum
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f7ed1fce390..25e9aa10d6b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -80,6 +80,11 @@ strategy:
       image: 'ubuntu-20.04'
       cmd: "./.ci/validation.sh test-ru"
 
+    # unit tests in Albanian locale (openjdk11)
+    'test-al':
+      image: 'ubuntu-20.04'
+      cmd: "./.ci/validation.sh test-al"
+
     # OpenJDK11 verify
     'OpenJDK11 verify':
       image: 'ubuntu-20.04'
@@ -160,6 +165,7 @@ steps:
 
   - bash: |
       set -e
+      mvn --version
       echo "ON_CRON_ONLY:"$ON_CRON_ONLY
       echo "BUILD_REASON:"$BUILD_REASON
       echo "cmd: "$(cmd)
diff --git a/config/archunit-store/slices-should-be-free-of-cycles-suppressions b/config/archunit-store/slices-should-be-free-of-cycles-suppressions
deleted file mode 100644
index ba3cc3e48a9..00000000000
--- a/config/archunit-store/slices-should-be-free-of-cycles-suppressions
+++ /dev/null
@@ -1,1494 +0,0 @@
-Cycle detected: Slice api -> \
-                Slice utils -> \
-                Slice api\
-  1. Dependencies of Slice api\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.matchesFileExtension(java.io.File, [Ljava.lang.String;)> in (AbstractFileSetCheck.java:97)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.util.List)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.setFileExtensions([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (AbstractFileSetCheck.java:177)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.lang.String)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractFileSetCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.api.FileContents.lineIsBlank(int)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (FileContents.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:245)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:275)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.Set)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.findFirstAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> has generic parameter type <java.util.function.Predicate<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.findFirstAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.findFirstAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AnnotationUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getNextSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getNextSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getPrevSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getPrevSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnAnnotationDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnAnnotationField(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnClass(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnCompactConstructor(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnConstructor(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnum(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnInterface(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnMember(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPackage(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainToken(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnRecord(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnType(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (BlockCommentPosition.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ChainedPropertyUtil.getResolvedProperties(java.util.Properties)> throws type <com.puppycrawl.tools.checkstyle.api.CheckstyleException> in (ChainedPropertyUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.extractQualifiedName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getFirstNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getFirstNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getShortNameOfAnonInnerClass(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getSurroundingAccessModifier(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isBeforeInSource(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isNonVoidMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isReceiverParameter(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.getFilepathOrClasspathUri(java.lang.String)> throws type <com.puppycrawl.tools.checkstyle.api.CheckstyleException> in (CommonUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.getResourceFromClassPath(java.lang.String)> throws type <com.puppycrawl.tools.checkstyle.api.CheckstyleException> in (CommonUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.getUriByFilename(java.lang.String)> throws type <com.puppycrawl.tools.checkstyle.api.CheckstyleException> in (CommonUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTagName(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isCorrectJavadocPosition(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isJavadocComment(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ParserUtil.createBlockCommentNode(java.lang.String)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ParserUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ParserUtil.createBlockCommentNode(org.antlr.v4.runtime.CommonToken)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ParserUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.Scope> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.Scope> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.Scope> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.Scope> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.Scope> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isClassFieldDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInClassBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInCodeBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInEnumBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceOrAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInRecordBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInScope(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInScope(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isOuterMostType(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ScopeUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.areOnSameLine(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.findFirstTokenByPredicate(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> has generic parameter type <java.util.function.Predicate<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.findFirstTokenByPredicate(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> has generic return type <java.util.Optional<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.findFirstTokenByPredicate(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> has generic parameter type <java.util.function.Consumer<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.isOfType(com.puppycrawl.tools.checkstyle.api.DetailAST, [I)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.isRootNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (TokenUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> throws type <com.puppycrawl.tools.checkstyle.api.CheckstyleException> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (ScopeUtil.java:47)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (ScopeUtil.java:48)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:49)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PUBLIC> in (ScopeUtil.java:51)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PROTECTED> in (ScopeUtil.java:54)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDeclaredScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PRIVATE> in (ScopeUtil.java:57)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.utils.TokenUtil.<clinit>()> references class object <com.puppycrawl.tools.checkstyle.api.TokenTypes> in (TokenUtil.java:60)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ScopeUtil.java:73)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.<clinit>()> references class object <com.puppycrawl.tools.checkstyle.api.JavadocTokenTypes> in (JavadocUtil.java:79)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPackage(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (BlockCommentPosition.java:85)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPackage(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:88)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScopeFromMods(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:88)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPackage(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (BlockCommentPosition.java:89)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:92)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPackage(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:92)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:95)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:96)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ChainedPropertyUtil.getResolvedProperties(java.util.Properties)> calls constructor <com.puppycrawl.tools.checkstyle.api.CheckstyleException.<init>(java.lang.String)> in (ChainedPropertyUtil.java:98)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:98)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:99)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:102)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getText()> in (JavadocUtil.java:102)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (CheckUtil.java:103)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:107)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getText()> in (JavadocUtil.java:107)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:107)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isEqualsMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount()> in (CheckUtil.java:108)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isCheckstyleTreeWalkerCheck(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (ModuleReflectionUtil.java:108)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PUBLIC> in (ScopeUtil.java:108)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:110)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PRIVATE> in (ScopeUtil.java:111)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.api.LineColumn.getColumn()> in (JavadocUtil.java:114)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PACKAGE> in (ScopeUtil.java:114)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PUBLIC> in (ScopeUtil.java:118)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.api.LineColumn.getLine()> in (JavadocUtil.java:119)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getStartLineNo()> in (JavadocUtil.java:119)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileSetModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck> in (ModuleReflectionUtil.java:119)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getDefaultScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PACKAGE> in (ScopeUtil.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.Filter> in (ModuleReflectionUtil.java:130)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:132)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:134)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:136)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:137)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:137)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AnnotationUtil.java:138)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (AnnotationUtil.java:138)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (ScopeUtil.java:140)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AnnotationUtil.java:141)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isFileFilterModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.BeforeExecutionFileFilter> in (ModuleReflectionUtil.java:141)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.ANONINNER> in (ScopeUtil.java:145)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (XpathUtil.java:145)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isAuditListener(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.AuditListener> in (ModuleReflectionUtil.java:152)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathUtil.java:157)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil.isRootModule(java.lang.Class)> references class object <com.puppycrawl.tools.checkstyle.api.RootModule> in (ModuleReflectionUtil.java:163)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (XpathUtil.java:167)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathUtil.java:168)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:171)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:172)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocUtil.java:173)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:174)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocUtil.java:174)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AnnotationUtil.java:175)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:175)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnField(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:175)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AnnotationUtil.java:176)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:177)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotationHolder(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocUtil.java:185)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocUtil.java:186)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> calls constructor <com.puppycrawl.tools.checkstyle.api.CheckstyleException.<init>(java.lang.String, java.lang.Throwable)> in (XpathUtil.java:198)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocUtil.java:202)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:205)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getFirstNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (CheckUtil.java:207)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:207)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:208)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:210)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:211)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:212)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInBlockOf(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:212)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getFirstNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:213)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:214)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.hasChildren()> in (BlockCommentPosition.java:214)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:218)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:219)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnEnumConstant(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:219)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (JavadocUtil.java:220)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (JavadocUtil.java:221)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AnnotationUtil.java:224)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.findFirstTokenByPredicate(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (TokenUtil.java:224)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.findFirstTokenByPredicate(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (TokenUtil.java:224)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (AnnotationUtil.java:226)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AnnotationUtil.java:226)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.getAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (AnnotationUtil.java:226)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isBeforeInSource(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (CheckUtil.java:227)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isBeforeInSource(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getColumnNo()> in (CheckUtil.java:229)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (JavadocUtil.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getIndex()> in (JavadocUtil.java:236)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (JavadocUtil.java:237)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:240)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInEnumBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (TokenUtil.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (TokenUtil.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInEnumBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:243)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (TokenUtil.java:243)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:245)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:247)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (CheckUtil.java:247)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInEnumBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:247)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainToken(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:248)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainToken(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:248)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.findFirstAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (AnnotationUtil.java:249)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainToken(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.hasChildren()> in (BlockCommentPosition.java:249)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:249)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.findFirstAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (AnnotationUtil.java:250)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainToken(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:250)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.findFirstAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AnnotationUtil.java:251)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:251)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:253)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (CheckUtil.java:253)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocUtil.java:254)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:255)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.areOnSameLine(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (TokenUtil.java:258)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:261)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:261)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:262)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:262)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getIndex()> in (JavadocUtil.java:268)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:270)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (JavadocUtil.java:270)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (JavadocUtil.java:271)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:274)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:274)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInCodeBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:274)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:275)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:275)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:276)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnTokenWithAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:276)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInCodeBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:276)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:278)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:280)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:283)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:288)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:290)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:291)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:293)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:294)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isOuterMostType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:294)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:295)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:295)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isOuterMostType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:296)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (BlockCommentPosition.java:297)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.hasChildren()> in (BlockCommentPosition.java:297)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isOuterMostType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:297)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (BlockCommentPosition.java:298)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.isOnPlainClassMember(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:298)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:302)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount()> in (CheckUtil.java:303)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:304)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:305)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (CheckUtil.java:305)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.isOfType(com.puppycrawl.tools.checkstyle.api.DetailAST, [I)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (TokenUtil.java:305)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:308)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getNextSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:309)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount(int)> in (CheckUtil.java:309)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getNextSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:310)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getNextSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (BlockCommentPosition.java:311)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:316)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.isRootNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (TokenUtil.java:316)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTagName(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocUtil.java:317)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:317)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount()> in (CheckUtil.java:318)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:318)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (CheckUtil.java:319)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTagName(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocUtil.java:319)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (CheckUtil.java:320)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:320)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTagName(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocUtil.java:322)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getPrevSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (BlockCommentPosition.java:323)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:323)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount()> in (ScopeUtil.java:324)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getPrevSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:325)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getPrevSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (BlockCommentPosition.java:326)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition.getPrevSiblingSkipComments(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (BlockCommentPosition.java:327)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:328)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ScopeUtil.java:329)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:330)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:339)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount()> in (CheckUtil.java:340)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:341)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:342)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (CheckUtil.java:342)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:345)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount(int)> in (CheckUtil.java:346)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isClassFieldDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ScopeUtil.java:349)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:352)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getChildCount()> in (CheckUtil.java:354)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (CheckUtil.java:355)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:356)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isCorrectJavadocPosition(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (JavadocUtil.java:356)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isCorrectJavadocPosition(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocUtil.java:358)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isCorrectJavadocPosition(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (JavadocUtil.java:363)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isCorrectJavadocPosition(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocUtil.java:365)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isCorrectJavadocPosition(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (JavadocUtil.java:366)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isNonVoidMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:371)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isNonVoidMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:372)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isNonVoidMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:373)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isReceiverParameter(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:387)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isReceiverParameter(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:388)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (CheckUtil.java:400)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:405)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (CheckUtil.java:431)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (CheckUtil.java:432)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:433)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getSurroundingAccessModifier(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CheckUtil.java:457)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getSurroundingAccessModifier(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CheckUtil.java:458)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.getResourceFromClassPath(java.lang.String)> calls constructor <com.puppycrawl.tools.checkstyle.api.CheckstyleException.<init>(java.lang.String)> in (CommonUtil.java:462)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.getResourceFromClassPath(java.lang.String)> calls constructor <com.puppycrawl.tools.checkstyle.api.CheckstyleException.<init>(java.lang.String, java.lang.Throwable)> in (CommonUtil.java:470)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.extractQualifiedName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (CheckUtil.java:619)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.extractQualifiedName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (CheckUtil.java:619)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getShortNameOfAnonInnerClass(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CheckUtil.java:636)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getShortNameOfAnonInnerClass(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (CheckUtil.java:638)
-Cycle detected: Slice api -> \
-                Slice utils -> \
-                Slice checks.javadoc -> \
-                Slice api\
-  1. Dependencies of Slice api\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.matchesFileExtension(java.io.File, [Ljava.lang.String;)> in (AbstractFileSetCheck.java:97)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.util.List)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.setFileExtensions([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (AbstractFileSetCheck.java:177)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.lang.String)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractFileSetCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.api.FileContents.lineIsBlank(int)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (FileContents.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:245)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:275)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> has return type <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.isValidName(java.lang.String)> in (JavadocUtil.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTag.<init>(int, int, java.lang.String, java.lang.String)> in (JavadocUtil.java:123)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocTag.<init>(int, int, java.lang.String)> in (JavadocUtil.java:126)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags.<init>(java.util.Collection, java.util.Collection)> in (JavadocUtil.java:130)\
-  3. Dependencies of Slice checks.javadoc\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (AbstractJavadocCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocPositionCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (InvalidJavadocPositionCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (JavadocContentLocationCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (JavadocMethodCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl> implements interface <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocNodeImpl.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck> in (JavadocPackageCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (JavadocStyleCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (JavadocTypeCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (JavadocVariableCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (MissingJavadocMethodCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (MissingJavadocPackageCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (MissingJavadocTypeCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (WriteTagCheck.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$ExceptionInfo.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$ClassInfo)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$Token.<init>(com.puppycrawl.tools.checkstyle.api.FullIdent)> has parameter of type <com.puppycrawl.tools.checkstyle.api.FullIdent> in (JavadocMethodCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck$FileContext.blockCommentAst> has type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractJavadocCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.TREE_CACHE> has generic type <java.lang.ThreadLocal<java.util.Map<com.puppycrawl.tools.checkstyle.api.LineColumn, com.puppycrawl.tools.checkstyle.JavadocDetailNodeParser$ParseStatus>>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.LineColumn> in (AbstractJavadocCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$ExceptionInfo.ast> has type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl.children> depends on component type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocNodeImpl.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl.parent> has type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocNodeImpl.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.excludeScope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocStyleCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.scope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocStyleCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.excludeScope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocTypeCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.scope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocTypeCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.excludeScope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocVariableCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.scope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocVariableCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.excludeScope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocMethodCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.scope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocMethodCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.excludeScope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocTypeCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.scope> has type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocTypeCheck.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.tagSeverity> has type <com.puppycrawl.tools.checkstyle.api.SeverityLevel> in (WriteTagCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.beginJavadocTree(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.beginTree(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.finishJavadocTree(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.finishTree(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.getBlockCommentAst()> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.leaveJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.processTree(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.shouldBeProcessed(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.walk(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AbstractJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.checkOrderInTagSection(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AtclauseOrderCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AtclauseOrderCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (AtclauseOrderCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocPositionCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (InvalidJavadocPositionCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocBlockTagLocationCheck.isCommentOrInlineTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocBlockTagLocationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocBlockTagLocationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocBlockTagLocationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.isMultilineComment(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocContentLocationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocContentLocationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$ExceptionInfo.getAst()> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkParamTags(java.util.List, com.puppycrawl.tools.checkstyle.api.DetailAST, boolean)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getExceptionInfo(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getFirstClassNameNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getFirstClassNameNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getMethodTags(com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrows(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.hasShortCircuitTag(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.List)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.processAST(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.removeMatchingParam(java.lang.Iterable, java.lang.String)> has generic parameter type <java.lang.Iterable<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.searchMatchingTypeParameter(java.lang.Iterable, java.lang.String)> has generic parameter type <java.lang.Iterable<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.getNextNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocMissingLeadingAsteriskCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.getNextNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocMissingLeadingAsteriskCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.isLastLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocMissingLeadingAsteriskCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.isLeadingAsterisk(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocMissingLeadingAsteriskCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocMissingLeadingAsteriskCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl.getChildren()> depends on component type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocNodeImpl.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl.getParent()> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocNodeImpl.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl.setChildren([Lcom.puppycrawl.tools.checkstyle.api.DetailNode;)> depends on component type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocNodeImpl.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl.setParent(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocNodeImpl.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck.processFiltered(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> has parameter of type <com.puppycrawl.tools.checkstyle.api.FileText> in (JavadocPackageCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck.processFiltered(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> throws type <com.puppycrawl.tools.checkstyle.api.CheckstyleException> in (JavadocPackageCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkParagraphTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isImmediatelyFollowedByText(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocParagraphCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkFirstSentenceEnding(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkFirstSentenceEnding(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkHtmlTags(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkHtmlTags(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkJavadocIsNotEmpty(com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.setExcludeScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.setScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocStyleCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.api.DetailNode>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocTagContinuationIndentationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocTagContinuationIndentationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isInlineDescription(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocTagContinuationIndentationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isViolation(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocTagContinuationIndentationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (JavadocTagContinuationIndentationCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$1.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$10.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$11.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$12.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$13.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$14.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$15.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$16.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$17.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$18.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$19.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$2.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$3.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$4.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$5.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$6.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$7.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$8.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$9.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.checkComponentParamTag(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.Collection, java.lang.String)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.checkTag(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.Iterable, java.lang.String, java.util.regex.Pattern)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.checkTypeParamTag(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.Collection, java.lang.String)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock)> has parameter of type <com.puppycrawl.tools.checkstyle.api.TextBlock> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getRecordComponentNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.setExcludeScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.setScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.isIgnored(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocVariableCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.setExcludeScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocVariableCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.setScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (JavadocVariableCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocVariableCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (JavadocVariableCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.getMethodsNumberOfLine(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isContentsAllowMissingJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isMissingJavadocAllowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.matchesSkipRegex(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.setExcludeScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.setScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocPackageCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadocAboveAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocPackageCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.isJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocPackageCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocPackageCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.setExcludeScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.setScope(com.puppycrawl.tools.checkstyle.api.Scope)> has parameter of type <com.puppycrawl.tools.checkstyle.api.Scope> in (MissingJavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MissingJavadocTypeCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.hasOnlyEmptyText(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (NonEmptyAtclauseDescriptionCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.isEmptyTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (NonEmptyAtclauseDescriptionCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (NonEmptyAtclauseDescriptionCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.hasInsufficientConsecutiveNewlines(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isAnotherTagBefore(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isOnlyTagInWholeJavadoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.hasJavadocInlineTags(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SingleLineJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.hasJavadocTags(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SingleLineJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.isSingleLineJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (SingleLineJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.isTagIgnored(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SingleLineJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SingleLineJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.extractInlineTagContent(com.puppycrawl.tools.checkstyle.api.DetailNode, java.lang.StringBuilder)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getContentOfInlineCustomTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getFirstSentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> has generic return type <java.util.Optional<com.puppycrawl.tools.checkstyle.api.DetailNode>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> has return type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getStringInsideTag(java.lang.String, com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isDefinedFirst(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isInlineReturnTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isInlineTagPresent(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isInlineTagWithName(com.puppycrawl.tools.checkstyle.api.DetailNode, java.lang.String)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isSummaryTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isTextPresentInsideHtmlTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateInlineReturnTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateSummaryTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateUntaggedSummary(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailNode> in (SummaryJavadocCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.setTagSeverity(com.puppycrawl.tools.checkstyle.api.SeverityLevel)> has parameter of type <com.puppycrawl.tools.checkstyle.api.SeverityLevel> in (WriteTagCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (WriteTagCheck.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (AbstractJavadocCheck.java:50)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocPositionCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (InvalidJavadocPositionCheck.java:72)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$1.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:76)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (MissingJavadocPackageCheck.java:78)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$2.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:90)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$3.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:104)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.<init>()> in (JavadocPackageCheck.java:109)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$4.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:118)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:120)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck.processFiltered(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> calls constructor <com.puppycrawl.tools.checkstyle.api.CheckstyleException.<init>(java.lang.String, java.lang.Throwable)> in (JavadocPackageCheck.java:124)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (MissingJavadocPackageCheck.java:124)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (MissingJavadocPackageCheck.java:125)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:127)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:128)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$5.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:132)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getColumnNumber()> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadocAboveAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (MissingJavadocPackageCheck.java:136)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadocAboveAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> references method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (MissingJavadocPackageCheck.java:136)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadocAboveAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> references method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (MissingJavadocPackageCheck.java:137)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.hasJavadocAboveAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (MissingJavadocPackageCheck.java:142)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$6.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:145)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$6.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocTagInfo.java:148)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$6.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocTagInfo.java:149)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$6.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PRIVATE> in (JavadocTagInfo.java:150)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocMissingLeadingAsteriskCheck.java:151)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (JavadocContentLocationCheck.java:155)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocMissingLeadingAsteriskCheck.java:157)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (NonEmptyAtclauseDescriptionCheck.java:157)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (NonEmptyAtclauseDescriptionCheck.java:158)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (NonEmptyAtclauseDescriptionCheck.java:158)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.isJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (MissingJavadocPackageCheck.java:159)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$7.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:162)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:163)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:165)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:165)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.getNextNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (JavadocMissingLeadingAsteriskCheck.java:174)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$8.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:176)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (JavadocVariableCheck.java:177)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocTagContinuationIndentationCheck.java:179)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isAnotherTagBefore(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:179)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocTagContinuationIndentationCheck.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.hasOnlyEmptyText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (NonEmptyAtclauseDescriptionCheck.java:183)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.hasOnlyEmptyText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (NonEmptyAtclauseDescriptionCheck.java:184)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (MissingJavadocTypeCheck.java:185)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.hasOnlyEmptyText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (NonEmptyAtclauseDescriptionCheck.java:185)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (WriteTagCheck.java:186)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PRIVATE> in (JavadocVariableCheck.java:187)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.isLeadingAsterisk(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocMissingLeadingAsteriskCheck.java:189)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$9.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:190)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PUBLIC> in (MissingJavadocTypeCheck.java:194)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isViolation(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocTagContinuationIndentationCheck.java:198)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:200)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.isLastLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocMissingLeadingAsteriskCheck.java:201)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.isLastLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocMissingLeadingAsteriskCheck.java:202)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isViolation(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocTagContinuationIndentationCheck.java:202)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:203)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:204)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$10.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:204)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.isLastLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocMissingLeadingAsteriskCheck.java:208)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.api.SeverityLevel.INFO> in (WriteTagCheck.java:215)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:216)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocParagraphCheck.java:217)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocParagraphCheck.java:218)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$11.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:220)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$11.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocTagInfo.java:221)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$11.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocTagInfo.java:224)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$11.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:224)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isOnlyTagInWholeJavadoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:225)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocTagContinuationIndentationCheck.java:229)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkParagraphTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocParagraphCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.isMultilineComment(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLastChild()> in (JavadocContentLocationCheck.java:232)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkParagraphTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocParagraphCheck.java:232)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocBlockTagLocationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (JavadocBlockTagLocationCheck.java:233)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkParagraphTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocParagraphCheck.java:233)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocTagContinuationIndentationCheck.java:233)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocBlockTagLocationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocBlockTagLocationCheck.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkParagraphTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocParagraphCheck.java:236)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$12.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:236)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocBlockTagLocationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (JavadocBlockTagLocationCheck.java:238)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.checkOrderInTagSection(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (AtclauseOrderCheck.java:241)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.checkOrderInTagSection(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (AtclauseOrderCheck.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.checkOrderInTagSection(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (AtclauseOrderCheck.java:243)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.hasInsufficientConsecutiveNewlines(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:247)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.checkOrderInTagSection(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (AtclauseOrderCheck.java:248)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:248)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.hasInsufficientConsecutiveNewlines(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:248)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:249)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isInlineDescription(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (JavadocTagContinuationIndentationCheck.java:249)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.hasInsufficientConsecutiveNewlines(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:249)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$13.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:250)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.hasInsufficientConsecutiveNewlines(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:250)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocBlockTagLocationCheck.isCommentOrInlineTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocBlockTagLocationCheck.java:251)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isInlineDescription(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocTagContinuationIndentationCheck.java:251)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocBlockTagLocationCheck.isCommentOrInlineTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocBlockTagLocationCheck.java:252)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isInlineDescription(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (JavadocTagContinuationIndentationCheck.java:255)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (JavadocVariableCheck.java:256)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getJavadocBefore(int)> in (JavadocVariableCheck.java:256)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (MissingJavadocMethodCheck.java:264)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (MissingJavadocTypeCheck.java:264)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AtclauseOrderCheck.java:265)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (JavadocParagraphCheck.java:265)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:265)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$14.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:265)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getJavadocBefore(int)> in (MissingJavadocTypeCheck.java:265)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AtclauseOrderCheck.java:266)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:266)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$14.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocTagInfo.java:266)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocParagraphCheck.java:267)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$14.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocTagInfo.java:267)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AtclauseOrderCheck.java:268)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AtclauseOrderCheck.java:268)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AtclauseOrderCheck.java:270)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AtclauseOrderCheck.java:271)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AtclauseOrderCheck.java:271)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:271)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.isIgnored(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocVariableCheck.java:271)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.isIgnored(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocVariableCheck.java:271)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AtclauseOrderCheck.java:272)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.getParentType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AtclauseOrderCheck.java:272)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PUBLIC> in (MissingJavadocMethodCheck.java:276)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (MissingJavadocTypeCheck.java:282)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (MissingJavadocTypeCheck.java:283)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (MissingJavadocTypeCheck.java:285)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:286)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (WriteTagCheck.java:286)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocParagraphCheck.java:287)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$15.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:287)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocVariableCheck.java:287)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (MissingJavadocTypeCheck.java:287)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:288)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$15.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocTagInfo.java:288)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getJavadocBefore(int)> in (WriteTagCheck.java:288)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:289)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocVariableCheck.java:289)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:290)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocVariableCheck.java:290)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$15.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocTagInfo.java:291)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$15.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:291)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$15.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocTagInfo.java:292)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$15.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocTagInfo.java:292)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getText()> in (WriteTagCheck.java:293)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (JavadocStyleCheck.java:300)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$16.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:304)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SingleLineJavadocCheck.java:307)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (AbstractJavadocCheck.java:308)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls constructor <com.puppycrawl.tools.checkstyle.api.LineColumn.<init>(int, int)> in (AbstractJavadocCheck.java:309)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getColumnNo()> in (AbstractJavadocCheck.java:309)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:309)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$17.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:318)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.isSingleLineJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLastChild()> in (SingleLineJavadocCheck.java:318)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isImmediatelyFollowedByText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:325)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isImmediatelyFollowedByText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (JavadocParagraphCheck.java:326)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isImmediatelyFollowedByText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (JavadocParagraphCheck.java:327)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$18.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:332)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateUntaggedSummary(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:337)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.logTag(int, java.lang.String, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.SeverityLevel.getName()> in (WriteTagCheck.java:338)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PRIVATE> in (JavadocStyleCheck.java:340)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateUntaggedSummary(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:343)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$19.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocTagInfo.java:346)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateUntaggedSummary(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:347)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:359)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isDefinedFirst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:375)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isDefinedFirst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:377)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.walk(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getParent()> in (AbstractJavadocCheck.java:378)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (MissingJavadocMethodCheck.java:384)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getJavadocBefore(int)> in (MissingJavadocMethodCheck.java:384)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.shouldBeProcessed(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (AbstractJavadocCheck.java:395)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isTextPresentInsideHtmlTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:399)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.destroy()> calls method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.destroy()> in (AbstractJavadocCheck.java:400)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.getMethodsNumberOfLine(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLastChild()> in (MissingJavadocMethodCheck.java:400)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocStyleCheck.java:401)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (JavadocStyleCheck.java:401)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getJavadocBefore(int)> in (JavadocStyleCheck.java:401)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.getMethodsNumberOfLine(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLastChild()> in (MissingJavadocMethodCheck.java:401)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.getMethodsNumberOfLine(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (MissingJavadocMethodCheck.java:403)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isTextPresentInsideHtmlTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:404)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isTextPresentInsideHtmlTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:406)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.getMethodsNumberOfLine(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (MissingJavadocMethodCheck.java:407)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocStyleCheck.java:416)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocStyleCheck.java:423)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocStyleCheck.java:424)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocStyleCheck.java:426)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocStyleCheck.java:428)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isContentsAllowMissingJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (MissingJavadocMethodCheck.java:433)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isContentsAllowMissingJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (MissingJavadocMethodCheck.java:434)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (JavadocTypeCheck.java:435)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isContentsAllowMissingJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (MissingJavadocMethodCheck.java:435)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:440)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:443)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:445)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:448)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.matchesSkipRegex(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MissingJavadocMethodCheck.java:450)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:450)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.matchesSkipRegex(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (MissingJavadocMethodCheck.java:451)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getInlineTagNodeForAst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:452)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkFirstSentenceEnding(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getText()> in (JavadocStyleCheck.java:469)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.Scope)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (MissingJavadocMethodCheck.java:474)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkFirstSentenceEnding(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getStartLineNo()> in (JavadocStyleCheck.java:475)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.Scope)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (MissingJavadocMethodCheck.java:475)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkJavadocIsNotEmpty(com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getText()> in (JavadocStyleCheck.java:485)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.api.Scope.PRIVATE> in (JavadocTypeCheck.java:486)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isInlineTagWithName(com.puppycrawl.tools.checkstyle.api.DetailNode, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:487)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkJavadocIsNotEmpty(com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getStartLineNo()> in (JavadocStyleCheck.java:488)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isInlineTagWithName(com.puppycrawl.tools.checkstyle.api.DetailNode, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:492)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateSummaryTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:504)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateSummaryTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:510)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (JavadocMethodCheck.java:513)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateSummaryTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:513)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateInlineReturnTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:527)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.validateInlineReturnTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getLineNumber()> in (SummaryJavadocCheck.java:530)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getContentOfInlineCustomTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:541)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getContentOfInlineCustomTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:546)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.extractInlineTagContent(com.puppycrawl.tools.checkstyle.api.DetailNode, java.lang.StringBuilder)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:562)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.extractInlineTagContent(com.puppycrawl.tools.checkstyle.api.DetailNode, java.lang.StringBuilder)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:564)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.extractInlineTagContent(com.puppycrawl.tools.checkstyle.api.DetailNode, java.lang.StringBuilder)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:568)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkHtmlTags(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getStartLineNo()> in (JavadocStyleCheck.java:589)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkHtmlTags(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getText()> in (JavadocStyleCheck.java:591)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (JavadocTypeCheck.java:606)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getJavadocBefore(int)> in (JavadocTypeCheck.java:607)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:637)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:641)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:642)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:642)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:645)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:646)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocTypeCheck.java:649)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocTypeCheck.java:650)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocTypeCheck.java:652)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.Scope.isIn(com.puppycrawl.tools.checkstyle.api.Scope)> in (JavadocTypeCheck.java:654)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:662)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:663)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:664)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:665)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:669)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:672)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getStringInsideTag(java.lang.String, com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getType()> in (SummaryJavadocCheck.java:690)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getStringInsideTag(java.lang.String, com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:691)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:696)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:697)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:698)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:699)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getFirstSentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:707)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getFirstSentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getChildren()> in (SummaryJavadocCheck.java:709)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getFirstSentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.api.DetailNode.getText()> in (SummaryJavadocCheck.java:710)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.processAST(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (JavadocMethodCheck.java:715)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.processAST(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getJavadocBefore(int)> in (JavadocMethodCheck.java:715)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:750)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (JavadocMethodCheck.java:751)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:764)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (JavadocMethodCheck.java:771)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getRecordComponentNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocTypeCheck.java:807)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getRecordComponentNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocTypeCheck.java:813)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getMethodTags(com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getText()> in (JavadocMethodCheck.java:814)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getRecordComponentNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocTypeCheck.java:814)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getMethodTags(com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getStartLineNo()> in (JavadocMethodCheck.java:816)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getMethodTags(com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.api.TextBlock.getStartColNo()> in (JavadocMethodCheck.java:817)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocMethodCheck.java:915)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocMethodCheck.java:918)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:920)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocMethodCheck.java:921)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (JavadocMethodCheck.java:926)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrows(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocMethodCheck.java:940)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrows(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocMethodCheck.java:942)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrows(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:944)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrows(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:945)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrows(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (JavadocMethodCheck.java:948)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocMethodCheck.java:962)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocMethodCheck.java:968)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:969)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getThrowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocMethodCheck.java:970)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getExceptionInfo(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocMethodCheck.java:986)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getFirstClassNameNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:1000)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.getFirstClassNameNode(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocMethodCheck.java:1001)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (JavadocMethodCheck.java:1016)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:1018)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocMethodCheck.java:1019)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:1020)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:1021)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:1026)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:1027)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (JavadocMethodCheck.java:1030)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.isInIgnoreBlock(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (JavadocMethodCheck.java:1032)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (JavadocMethodCheck.java:1069)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.hasChildren()> in (JavadocMethodCheck.java:1073)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (JavadocMethodCheck.java:1074)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (JavadocMethodCheck.java:1078)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (JavadocMethodCheck.java:1079)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.findTokensInAstByType(com.puppycrawl.tools.checkstyle.api.DetailAST, int)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (JavadocMethodCheck.java:1083)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkParamTags(java.util.List, com.puppycrawl.tools.checkstyle.api.DetailAST, boolean)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocMethodCheck.java:1134)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkParamTags(java.util.List, com.puppycrawl.tools.checkstyle.api.DetailAST, boolean)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocMethodCheck.java:1140)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkParamTags(java.util.List, com.puppycrawl.tools.checkstyle.api.DetailAST, boolean)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocMethodCheck.java:1140)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.searchMatchingTypeParameter(java.lang.Iterable, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (JavadocMethodCheck.java:1162)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.searchMatchingTypeParameter(java.lang.Iterable, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocMethodCheck.java:1162)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.removeMatchingParam(java.lang.Iterable, java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (JavadocMethodCheck.java:1184)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$Token.<init>(com.puppycrawl.tools.checkstyle.api.FullIdent)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (JavadocMethodCheck.java:1393)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$Token.<init>(com.puppycrawl.tools.checkstyle.api.FullIdent)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getLineNo()> in (JavadocMethodCheck.java:1394)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck$Token.<init>(com.puppycrawl.tools.checkstyle.api.FullIdent)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getColumnNo()> in (JavadocMethodCheck.java:1395)
-Cycle detected: Slice api -> \
-                Slice utils -> \
-                Slice checks.javadoc -> \
-                Slice checks.naming -> \
-                Slice api\
-  1. Dependencies of Slice api\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.matchesFileExtension(java.io.File, [Ljava.lang.String;)> in (AbstractFileSetCheck.java:97)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.util.List)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.setFileExtensions([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (AbstractFileSetCheck.java:177)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.lang.String)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractFileSetCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.api.FileContents.lineIsBlank(int)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (FileContents.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:245)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:275)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> has return type <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.isValidName(java.lang.String)> in (JavadocUtil.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTag.<init>(int, int, java.lang.String, java.lang.String)> in (JavadocUtil.java:123)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocTag.<init>(int, int, java.lang.String)> in (JavadocUtil.java:126)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags.<init>(java.util.Collection, java.util.Collection)> in (JavadocUtil.java:130)\
-  3. Dependencies of Slice checks.javadoc\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.accessModifiers> depends on component type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.setAccessModifiers([Lcom.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;)> depends on component type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (JavadocMethodCheck.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PACKAGE> in (JavadocMethodCheck.java:585)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PRIVATE> in (JavadocMethodCheck.java:585)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PROTECTED> in (JavadocMethodCheck.java:585)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PUBLIC> in (JavadocMethodCheck.java:585)\
-  4. Dependencies of Slice checks.naming\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (AbstractClassNameCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (AbstractNameCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (PackageNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasIgnoredModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractAccessControlNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractAccessControlNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.shouldCheckInScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractAccessControlNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.isAbstract(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractClassNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitClassDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractClassNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractClassNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CatchParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ClassTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ConstantNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.IllegalIdentifierNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (IllegalIdentifierNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (InterfaceTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LambdaParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LambdaParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LocalFinalVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.isForLoopVariable(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LocalVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LocalVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MemberNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MethodNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MethodTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (PackageNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PatternVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (PatternVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordComponentNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (RecordComponentNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (RecordTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (StaticVariableNameCheck.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.<init>(java.lang.String)> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (AbstractNameCheck.java:51)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:74)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractNameCheck.java:77)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbstractNameCheck.java:78)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbstractNameCheck.java:81)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.shouldCheckInScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:86)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.shouldCheckInScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:88)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (RecordTypeParameterNameCheck.java:100)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (RecordTypeParameterNameCheck.java:101)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (PackageNameCheck.java:104)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (InterfaceTypeParameterNameCheck.java:105)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (InterfaceTypeParameterNameCheck.java:106)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:108)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (MethodTypeParameterNameCheck.java:110)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (MethodTypeParameterNameCheck.java:111)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:112)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (LambdaParameterNameCheck.java:118)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (LambdaParameterNameCheck.java:118)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LambdaParameterNameCheck.java:120)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LambdaParameterNameCheck.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ClassTypeParameterNameCheck.java:126)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ClassTypeParameterNameCheck.java:127)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLastChild()> in (PackageNameCheck.java:146)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (PackageNameCheck.java:146)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (PackageNameCheck.java:147)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (PackageNameCheck.java:148)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getDetailAst()> in (PackageNameCheck.java:149)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalFinalVariableNameCheck.java:151)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (PackageNameCheck.java:151)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (AbstractClassNameCheck.java:152)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (LocalFinalVariableNameCheck.java:152)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (StaticVariableNameCheck.java:152)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalFinalVariableNameCheck.java:153)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (StaticVariableNameCheck.java:153)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (StaticVariableNameCheck.java:154)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CatchParameterNameCheck.java:156)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CatchParameterNameCheck.java:156)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MemberNameCheck.java:170)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:171)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MemberNameCheck.java:171)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:173)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:174)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:181)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (ConstantNameCheck.java:182)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (ConstantNameCheck.java:183)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.IllegalIdentifierNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (IllegalIdentifierNameCheck.java:183)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalVariableNameCheck.java:215)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (LocalVariableNameCheck.java:215)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalVariableNameCheck.java:219)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalVariableNameCheck.java:220)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.isForLoopVariable(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (LocalVariableNameCheck.java:233)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.isForLoopVariable(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (LocalVariableNameCheck.java:233)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:236)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ParameterNameCheck.java:238)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MethodNameCheck.java:239)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:239)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ParameterNameCheck.java:239)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitClassDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractClassNameCheck.java:241)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitClassDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbstractClassNameCheck.java:241)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (MethodNameCheck.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MethodNameCheck.java:244)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (MethodNameCheck.java:252)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (MethodNameCheck.java:253)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.isAbstract(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractClassNameCheck.java:260)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.isAbstract(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractClassNameCheck.java:261)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:268)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (ParameterNameCheck.java:270)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ParameterNameCheck.java:274)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (ParameterNameCheck.java:275)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (AbbreviationAsWordInNameCheck.java:336)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:491)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbbreviationAsWordInNameCheck.java:492)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (AbbreviationAsWordInNameCheck.java:509)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:512)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:521)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasIgnoredModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:537)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasIgnoredModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:538)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AbbreviationAsWordInNameCheck.java:558)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AbbreviationAsWordInNameCheck.java:559)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:561)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:562)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:579)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbbreviationAsWordInNameCheck.java:581)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (AbbreviationAsWordInNameCheck.java:702)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (AbbreviationAsWordInNameCheck.java:705)
-Cycle detected: Slice api -> \
-                Slice utils -> \
-                Slice checks.javadoc.utils -> \
-                Slice api\
-  1. Dependencies of Slice api\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.matchesFileExtension(java.io.File, [Ljava.lang.String;)> in (AbstractFileSetCheck.java:97)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.util.List)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.setFileExtensions([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (AbstractFileSetCheck.java:177)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.lang.String)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractFileSetCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.api.FileContents.lineIsBlank(int)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (FileContents.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:245)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:275)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.BlockTagUtil.extractBlockTags([Ljava.lang.String;)> in (JavadocUtil.java:102)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.InlineTagUtil.extractInlineTags([Ljava.lang.String;)> in (JavadocUtil.java:107)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.getPosition()> in (JavadocUtil.java:114)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.getPosition()> in (JavadocUtil.java:119)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.getName()> in (JavadocUtil.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.getName()> in (JavadocUtil.java:123)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.getValue()> in (JavadocUtil.java:123)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.getName()> in (JavadocUtil.java:126)\
-  3. Dependencies of Slice checks.javadoc.utils\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.<init>(java.lang.String, java.lang.String, com.puppycrawl.tools.checkstyle.api.LineColumn)> has parameter of type <com.puppycrawl.tools.checkstyle.api.LineColumn> in (TagInfo.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.position> has type <com.puppycrawl.tools.checkstyle.api.LineColumn> in (TagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.InlineTagUtil.getLineColumnOfIndex(java.lang.String, int)> has return type <com.puppycrawl.tools.checkstyle.api.LineColumn> in (InlineTagUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.TagInfo.getPosition()> has return type <com.puppycrawl.tools.checkstyle.api.LineColumn> in (TagInfo.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.BlockTagUtil.extractBlockTags([Ljava.lang.String;)> calls constructor <com.puppycrawl.tools.checkstyle.api.LineColumn.<init>(int, int)> in (BlockTagUtil.java:89)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.utils.InlineTagUtil.getLineColumnOfIndex(java.lang.String, int)> calls constructor <com.puppycrawl.tools.checkstyle.api.LineColumn.<init>(int, int)> in (InlineTagUtil.java:128)
-Cycle detected: Slice api -> \
-                Slice utils -> \
-                Slice checks.naming -> \
-                Slice api\
-  1. Dependencies of Slice api\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.matchesFileExtension(java.io.File, [Ljava.lang.String;)> in (AbstractFileSetCheck.java:97)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.util.List)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.setFileExtensions([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (AbstractFileSetCheck.java:177)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.lang.String)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractFileSetCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.api.FileContents.lineIsBlank(int)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (FileContents.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:245)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:275)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getSurroundingAccessModifier(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PACKAGE> in (CheckUtil.java:404)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PRIVATE> in (CheckUtil.java:406)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PUBLIC> in (CheckUtil.java:409)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PACKAGE> in (CheckUtil.java:430)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PUBLIC> in (CheckUtil.java:435)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PROTECTED> in (CheckUtil.java:438)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PRIVATE> in (CheckUtil.java:441)\
-  3. Dependencies of Slice checks.naming\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (AbstractClassNameCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (AbstractNameCheck.java:0)\
-    - Class <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck> extends class <com.puppycrawl.tools.checkstyle.api.AbstractCheck> in (PackageNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasIgnoredModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbbreviationAsWordInNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractAccessControlNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractAccessControlNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.shouldCheckInScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractAccessControlNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.isAbstract(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractClassNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitClassDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractClassNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractClassNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (AbstractNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (CatchParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ClassTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ConstantNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.IllegalIdentifierNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (IllegalIdentifierNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (InterfaceTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LambdaParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LambdaParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LocalFinalVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.isForLoopVariable(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LocalVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (LocalVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MemberNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MethodNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (MethodTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (PackageNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PatternVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (PatternVariableNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordComponentNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (RecordComponentNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (RecordTypeParameterNameCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (StaticVariableNameCheck.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.<init>(java.lang.String)> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (AbstractNameCheck.java:51)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:74)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractNameCheck.java:77)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbstractNameCheck.java:78)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbstractNameCheck.java:81)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.shouldCheckInScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:86)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.shouldCheckInScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:88)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (RecordTypeParameterNameCheck.java:100)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.RecordTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (RecordTypeParameterNameCheck.java:101)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (PackageNameCheck.java:104)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (InterfaceTypeParameterNameCheck.java:105)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (InterfaceTypeParameterNameCheck.java:106)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:108)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (MethodTypeParameterNameCheck.java:110)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (MethodTypeParameterNameCheck.java:111)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractAccessControlNameCheck.java:112)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (LambdaParameterNameCheck.java:118)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (LambdaParameterNameCheck.java:118)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LambdaParameterNameCheck.java:120)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LambdaParameterNameCheck.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ClassTypeParameterNameCheck.java:126)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ClassTypeParameterNameCheck.java:127)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLastChild()> in (PackageNameCheck.java:146)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (PackageNameCheck.java:146)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.createFullIdent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (PackageNameCheck.java:147)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (PackageNameCheck.java:148)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getDetailAst()> in (PackageNameCheck.java:149)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalFinalVariableNameCheck.java:151)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FullIdent.getText()> in (PackageNameCheck.java:151)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (AbstractClassNameCheck.java:152)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (LocalFinalVariableNameCheck.java:152)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (StaticVariableNameCheck.java:152)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalFinalVariableNameCheck.java:153)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (StaticVariableNameCheck.java:153)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (StaticVariableNameCheck.java:154)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (CatchParameterNameCheck.java:156)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (CatchParameterNameCheck.java:156)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MemberNameCheck.java:170)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:171)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MemberNameCheck.java:171)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:173)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:174)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ConstantNameCheck.java:181)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (ConstantNameCheck.java:182)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (ConstantNameCheck.java:183)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.IllegalIdentifierNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (IllegalIdentifierNameCheck.java:183)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalVariableNameCheck.java:215)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (LocalVariableNameCheck.java:215)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalVariableNameCheck.java:219)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (LocalVariableNameCheck.java:220)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.isForLoopVariable(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (LocalVariableNameCheck.java:233)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.isForLoopVariable(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (LocalVariableNameCheck.java:233)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:236)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ParameterNameCheck.java:238)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MethodNameCheck.java:239)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:239)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ParameterNameCheck.java:239)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitClassDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractClassNameCheck.java:241)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.visitClassDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbstractClassNameCheck.java:241)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (MethodNameCheck.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (MethodNameCheck.java:244)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (MethodNameCheck.java:252)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (MethodNameCheck.java:253)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.isAbstract(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractClassNameCheck.java:260)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.isAbstract(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbstractClassNameCheck.java:261)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (ParameterNameCheck.java:268)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (ParameterNameCheck.java:270)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (ParameterNameCheck.java:274)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.isOverriddenMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (ParameterNameCheck.java:275)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.<init>()> calls constructor <com.puppycrawl.tools.checkstyle.api.AbstractCheck.<init>()> in (AbbreviationAsWordInNameCheck.java:336)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:491)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbbreviationAsWordInNameCheck.java:492)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (AbbreviationAsWordInNameCheck.java:509)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:512)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:521)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasIgnoredModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:537)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasIgnoredModifiers(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:538)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AbbreviationAsWordInNameCheck.java:558)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (AbbreviationAsWordInNameCheck.java:559)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:561)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isInterfaceDeclaration(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (AbbreviationAsWordInNameCheck.java:562)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.findFirstToken(int)> in (AbbreviationAsWordInNameCheck.java:579)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getText()> in (AbbreviationAsWordInNameCheck.java:581)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (AbbreviationAsWordInNameCheck.java:702)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getChildren(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (AbbreviationAsWordInNameCheck.java:705)
-Cycle detected: Slice api -> \
-                Slice utils -> \
-                Slice xpath -> \
-                Slice api\
-  1. Dependencies of Slice api\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.process(java.io.File, com.puppycrawl.tools.checkstyle.api.FileText)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.matchesFileExtension(java.io.File, [Ljava.lang.String;)> in (AbstractFileSetCheck.java:97)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.util.List)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:133)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.setFileExtensions([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (AbstractFileSetCheck.java:177)\
-    - Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.lang.String)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_STRING_ARRAY> in (FileText.java:180)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractFileSetCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.api.FileContents.lineIsBlank(int)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (FileContents.java:234)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(int, int, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:245)\
-    - Method <com.puppycrawl.tools.checkstyle.api.AbstractCheck.log(com.puppycrawl.tools.checkstyle.api.DetailAST, java.lang.String, [Ljava.lang.Object;)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (AbstractCheck.java:275)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.xpath.AbstractNode>> with type argument depending on <com.puppycrawl.tools.checkstyle.xpath.AbstractNode> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.xpath.AbstractNode> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getXpathItems(java.lang.String, com.puppycrawl.tools.checkstyle.xpath.AbstractNode)> has parameter of type <com.puppycrawl.tools.checkstyle.xpath.AbstractNode> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.xpath.AbstractNode.getDepth()> in (XpathUtil.java:139)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls constructor <com.puppycrawl.tools.checkstyle.xpath.ElementNode.<init>(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> in (XpathUtil.java:143)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> calls constructor <com.puppycrawl.tools.checkstyle.xpath.RootNode.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (XpathUtil.java:187)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> calls method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getUnderlyingNode()> in (XpathUtil.java:191)\
-  3. Dependencies of Slice xpath\
-    - Constructor <com.puppycrawl.tools.checkstyle.xpath.ElementNode.<init>(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ElementNode.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.xpath.RootNode.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (RootNode.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int, com.puppycrawl.tools.checkstyle.api.FileText, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int, com.puppycrawl.tools.checkstyle.api.FileText, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.FileText> in (XpathQueryGenerator.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int, int, com.puppycrawl.tools.checkstyle.api.FileText, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST, int, int, int, com.puppycrawl.tools.checkstyle.api.FileText, int)> has parameter of type <com.puppycrawl.tools.checkstyle.api.FileText> in (XpathQueryGenerator.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.xpath.ElementNode.detailAst> has type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ElementNode.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.xpath.RootNode.detailAst> has type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (RootNode.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.fileText> has type <com.puppycrawl.tools.checkstyle.api.FileText> in (XpathQueryGenerator.java:0)\
-    - Field <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.rootAst> has type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getUnderlyingNode()> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (ElementNode.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.RootNode.getUnderlyingNode()> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (RootNode.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.expandedTabColumn(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttributeRecursively(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttributeRecursively(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findPositionAmongSiblings(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.generateXpathQuery(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getMatchingAstElements()> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.api.DetailAST>> with type argument depending on <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getXpathQuery(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.hasAtLeastOneSiblingWithSameTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.isMatchingByLineAndColumnAndTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.isXpathQueryForNodeIsAccurateEnough(com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.api.DetailAST> in (XpathQueryGenerator.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.createChildren()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (ElementNode.java:59)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.hasChildNodes()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.hasChildren()> in (ElementNode.java:69)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.RootNode.getLineNumber()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (RootNode.java:73)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getLocalPart()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ElementNode.java:79)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.RootNode.getColumnNumber()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getColumnNo()> in (RootNode.java:83)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getLineNumber()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (ElementNode.java:89)\
-    - Constructor <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.<init>(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent, int)> calls method <com.puppycrawl.tools.checkstyle.api.FileContents.getText()> in (XpathQueryGenerator.java:99)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getColumnNumber()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getColumnNo()> in (ElementNode.java:99)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getTokenType()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (ElementNode.java:109)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttributeRecursively(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (XpathQueryGenerator.java:169)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttributeRecursively(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (XpathQueryGenerator.java:170)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findPositionAmongSiblings(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathQueryGenerator.java:208)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findPositionAmongSiblings(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (XpathQueryGenerator.java:211)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getMatchingAstElements()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getFirstChild()> in (XpathQueryGenerator.java:240)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getMatchingAstElements()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (XpathQueryGenerator.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getMatchingAstElements()> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (XpathQueryGenerator.java:243)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getXpathQuery(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathQueryGenerator.java:264)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getXpathQuery(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getParent()> in (XpathQueryGenerator.java:280)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.hasAtLeastOneSiblingWithSameTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (XpathQueryGenerator.java:293)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.hasAtLeastOneSiblingWithSameTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathQueryGenerator.java:295)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.hasAtLeastOneSiblingWithSameTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getPreviousSibling()> in (XpathQueryGenerator.java:299)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.hasAtLeastOneSiblingWithSameTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (XpathQueryGenerator.java:301)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.hasAtLeastOneSiblingWithSameTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathQueryGenerator.java:303)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.hasAtLeastOneSiblingWithSameTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getNextSibling()> in (XpathQueryGenerator.java:307)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.expandedTabColumn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.FileText.get(int)> in (XpathQueryGenerator.java:319)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.expandedTabColumn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getColumnNo()> in (XpathQueryGenerator.java:320)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.isMatchingByLineAndColumnAndTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getLineNo()> in (XpathQueryGenerator.java:331)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.isMatchingByLineAndColumnAndTokenType(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.api.DetailAST.getType()> in (XpathQueryGenerator.java:333)
-Cycle detected: Slice checks.javadoc -> \
-                Slice checks.naming -> \
-                Slice utils -> \
-                Slice checks.javadoc\
-  1. Dependencies of Slice checks.javadoc\
-    - Field <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.accessModifiers> depends on component type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (JavadocMethodCheck.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.setAccessModifiers([Lcom.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;)> depends on component type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (JavadocMethodCheck.java:0)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PACKAGE> in (JavadocMethodCheck.java:585)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PRIVATE> in (JavadocMethodCheck.java:585)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PROTECTED> in (JavadocMethodCheck.java:585)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<init>()> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PUBLIC> in (JavadocMethodCheck.java:585)\
-  2. Dependencies of Slice checks.naming\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.<init>(java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (AbstractNameCheck.java:52)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AbstractAccessControlNameCheck.java:109)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AbstractAccessControlNameCheck.java:110)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> in (LambdaParameterNameCheck.java:122)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (LocalFinalVariableNameCheck.java:145)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (LocalFinalVariableNameCheck.java:154)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceOrAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (StaticVariableNameCheck.java:159)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (TypeNameCheck.java:171)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceOrAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MemberNameCheck.java:173)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MemberNameCheck.java:174)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ConstantNameCheck.java:175)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ConstantNameCheck.java:176)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInCodeBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ConstantNameCheck.java:178)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.IllegalIdentifierNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (IllegalIdentifierNameCheck.java:178)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (LocalVariableNameCheck.java:221)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MethodNameCheck.java:232)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isReceiverParameter(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ParameterNameCheck.java:240)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ParameterNameCheck.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (AbbreviationAsWordInNameCheck.java:485)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isReceiverParameter(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AbbreviationAsWordInNameCheck.java:525)\
-  3. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> has return type <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.isValidName(java.lang.String)> in (JavadocUtil.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTag.<init>(int, int, java.lang.String, java.lang.String)> in (JavadocUtil.java:123)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocTag.<init>(int, int, java.lang.String)> in (JavadocUtil.java:126)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags.<init>(java.util.Collection, java.util.Collection)> in (JavadocUtil.java:130)
-Cycle detected: Slice checks.javadoc -> \
-                Slice utils -> \
-                Slice checks.javadoc\
-  1. Dependencies of Slice checks.javadoc\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$1.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.isTypeDeclaration(int)> in (JavadocTagInfo.java:78)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$2.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:92)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocPositionCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getBlockCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (InvalidJavadocPositionCheck.java:104)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocPositionCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isJavadocComment(java.lang.String)> in (InvalidJavadocPositionCheck.java:106)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$3.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:106)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocPositionCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isCorrectJavadocPosition(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (InvalidJavadocPositionCheck.java:107)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isPackageInfo(java.lang.String)> in (MissingJavadocPackageCheck.java:108)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$4.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:120)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingWhitespaceAfterAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocMissingWhitespaceAfterAsteriskCheck.java:124)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.getRequiredJavadocTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (AbstractJavadocCheck.java:144)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$6.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:150)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.isOfType(int, [I)> in (JavadocMissingLeadingAsteriskCheck.java:151)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck.isJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isJavadocComment(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MissingJavadocPackageCheck.java:159)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$7.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:164)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.getNextNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocMissingLeadingAsteriskCheck.java:168)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.getNextNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocMissingLeadingAsteriskCheck.java:170)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.isEmptyTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> in (NonEmptyAtclauseDescriptionCheck.java:170)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.getNextNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocMissingLeadingAsteriskCheck.java:175)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.<init>()> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.asBitSet([I)> in (AtclauseOrderCheck.java:176)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isAnotherTagBefore(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:177)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocTagContinuationIndentationCheck.java:178)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$8.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:178)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl.toString()> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTokenName(int)> in (JavadocNodeImpl.java:179)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.setJavadocTokens([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTokenId(java.lang.String)> in (AbstractJavadocCheck.java:181)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isAnotherTagBefore(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:183)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.hasOnlyEmptyText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (NonEmptyAtclauseDescriptionCheck.java:185)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$9.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:192)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.init()> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTokenName(int)> in (AbstractJavadocCheck.java:199)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.setTarget([Ljava.lang.String;)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.asBitSet([Ljava.lang.String;)> in (AtclauseOrderCheck.java:199)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isViolation(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (JavadocTagContinuationIndentationCheck.java:200)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isViolation(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocTagContinuationIndentationCheck.java:201)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.isLastLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (JavadocMissingLeadingAsteriskCheck.java:202)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.visitJavadocToken(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:204)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isJavadocComment(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocContentLocationCheck.java:207)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocCommentContent(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocContentLocationCheck.java:208)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.isViolation(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (JavadocTagContinuationIndentationCheck.java:212)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.checkEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (JavadocParagraphCheck.java:217)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isOnlyTagInWholeJavadoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:223)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.setTag(java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (WriteTagCheck.java:225)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.isOnlyTagInWholeJavadoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:226)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocTagContinuationIndentationCheck.java:227)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocTagContinuationIndentationCheck.java:228)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocTagContinuationIndentationCheck.java:230)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.isMultilineComment(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.areOnSameLine(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocContentLocationCheck.java:232)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck.getAllNewlineNodes(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocTagContinuationIndentationCheck.java:236)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$12.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:238)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.checkOrderInTagSection(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (AtclauseOrderCheck.java:243)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.hasInsufficientConsecutiveNewlines(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:244)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:247)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestNode(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:250)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$13.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:253)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.RequireEmptyLineBeforeBlockTagGroupCheck.hasInsufficientConsecutiveNewlines(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (RequireEmptyLineBeforeBlockTagGroupCheck.java:253)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (MissingJavadocTypeCheck.java:255)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:263)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.asBitSet([I)> in (SummaryJavadocCheck.java:265)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (JavadocParagraphCheck.java:267)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:268)\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.<init>()> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (SummaryJavadocCheck.java:273)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.WriteTagCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (WriteTagCheck.java:278)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MissingJavadocTypeCheck.java:279)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MissingJavadocTypeCheck.java:280)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:284)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInCodeBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocVariableCheck.java:284)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocVariableCheck.java:285)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocVariableCheck.java:286)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (JavadocParagraphCheck.java:287)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.Set)> in (MissingJavadocTypeCheck.java:288)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isFirstParagraph(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:294)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.isJavadocComment(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AbstractJavadocCheck.java:304)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:306)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$16.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:306)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.getNearestEmptyLine(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:308)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.isSingleLineJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.areOnSameLine(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> in (SingleLineJavadocCheck.java:319)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isImmediatelyFollowedByText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (JavadocParagraphCheck.java:324)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck.isImmediatelyFollowedByText(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (JavadocParagraphCheck.java:327)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$18.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTagInfo.java:334)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.hasJavadocTags(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> in (SingleLineJavadocCheck.java:335)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$19.isValidOn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.isTypeDeclaration(int)> in (JavadocTagInfo.java:348)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.hasJavadocInlineTags(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.findFirstToken(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> in (SingleLineJavadocCheck.java:350)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.asBitSet([I)> in (JavadocTagInfo.java:354)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.hasJavadocInlineTags(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode, int)> in (SingleLineJavadocCheck.java:357)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (MissingJavadocMethodCheck.java:359)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.asBitSet([I)> in (JavadocTagInfo.java:367)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.walk(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (AbstractJavadocCheck.java:370)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SingleLineJavadocCheck.isTagIgnored(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getTagName(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (SingleLineJavadocCheck.java:370)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.walk(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (AbstractJavadocCheck.java:376)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MissingJavadocMethodCheck.java:381)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isDefinedFirst(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getPreviousSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (SummaryJavadocCheck.java:385)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (JavadocStyleCheck.java:388)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isTextPresentInsideHtmlTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (SummaryJavadocCheck.java:398)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isTextPresentInsideHtmlTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getFirstChild(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (SummaryJavadocCheck.java:400)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.isTextPresentInsideHtmlTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (SummaryJavadocCheck.java:415)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isPackageInfo(java.lang.String)> in (JavadocStyleCheck.java:417)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInCodeBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocStyleCheck.java:419)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocStyleCheck.java:420)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isMissingJavadocAllowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isGetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MissingJavadocMethodCheck.java:420)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isMissingJavadocAllowed(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isSetterMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MissingJavadocMethodCheck.java:420)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocStyleCheck.java:421)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.isContentsAllowMissingJavadoc(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.Set)> in (MissingJavadocMethodCheck.java:437)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.Scope)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MissingJavadocMethodCheck.java:469)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getContentOfInlineCustomTag(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (SummaryJavadocCheck.java:548)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (JavadocMethodCheck.java:558)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (JavadocMethodCheck.java:562)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (JavadocMethodCheck.java:567)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (JavadocMethodCheck.java:576)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (JavadocMethodCheck.java:579)\
-    - Static Initializer <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.<clinit>()> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (JavadocMethodCheck.java:582)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (JavadocTypeCheck.java:597)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isOuterMostType(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTypeCheck.java:610)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTypeCheck.java:619)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.checkHtmlTags(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameterNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocStyleCheck.java:633)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTypeCheck.java:646)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.startsWithInheritDoc(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (SummaryJavadocCheck.java:646)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.getSurroundingScope(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocTypeCheck.java:647)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.Set)> in (JavadocTypeCheck.java:655)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> in (JavadocTypeCheck.java:665)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock)> gets field <com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType.BLOCK> in (JavadocTypeCheck.java:665)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getSummarySentence(com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.isBlank(java.lang.String)> in (SummaryJavadocCheck.java:670)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.getStringInsideTag(java.lang.String, com.puppycrawl.tools.checkstyle.api.DetailNode)> calls method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getNextSibling(com.puppycrawl.tools.checkstyle.api.DetailNode)> in (SummaryJavadocCheck.java:693)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getSurroundingAccessModifier(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocMethodCheck.java:731)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.shouldCheck(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocMethodCheck.java:733)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.containsAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.Set)> in (JavadocMethodCheck.java:761)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkComment(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.TextBlock)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isNonVoidMethod(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocMethodCheck.java:770)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.getRecordComponentNames(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> in (JavadocTypeCheck.java:811)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkParamTags(java.util.List, com.puppycrawl.tools.checkstyle.api.DetailAST, boolean)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getTypeParameters(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (JavadocMethodCheck.java:1101)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkParamTags(java.util.List, com.puppycrawl.tools.checkstyle.api.DetailAST, boolean)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.endsWithChar(java.lang.String, char)> in (JavadocMethodCheck.java:1117)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.checkParamTags(java.util.List, com.puppycrawl.tools.checkstyle.api.DetailAST, boolean)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.startsWithChar(java.lang.String, char)> in (JavadocMethodCheck.java:1117)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> has return type <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags> in (JavadocUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls method <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.isValidName(java.lang.String)> in (JavadocUtil.java:121)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTag.<init>(int, int, java.lang.String, java.lang.String)> in (JavadocUtil.java:123)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocTag.<init>(int, int, java.lang.String)> in (JavadocUtil.java:126)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.JavadocUtil.getJavadocTags(com.puppycrawl.tools.checkstyle.api.TextBlock, com.puppycrawl.tools.checkstyle.utils.JavadocUtil$JavadocTagType)> calls constructor <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTags.<init>(java.util.Collection, java.util.Collection)> in (JavadocUtil.java:130)
-Cycle detected: Slice checks.naming -> \
-                Slice utils -> \
-                Slice checks.naming\
-  1. Dependencies of Slice checks.naming\
-    - Constructor <com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.<init>(java.lang.String)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.createPattern(java.lang.String)> in (AbstractNameCheck.java:52)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AbstractAccessControlNameCheck.java:109)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbstractAccessControlNameCheck.isPublic(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AbstractAccessControlNameCheck.java:110)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LambdaParameterNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.forEachChild(com.puppycrawl.tools.checkstyle.api.DetailAST, int, java.util.function.Consumer)> in (LambdaParameterNameCheck.java:122)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (LocalFinalVariableNameCheck.java:145)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (LocalFinalVariableNameCheck.java:154)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceOrAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (StaticVariableNameCheck.java:159)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (TypeNameCheck.java:171)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceOrAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MemberNameCheck.java:173)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MemberNameCheck.java:174)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInAnnotationBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ConstantNameCheck.java:175)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInInterfaceBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ConstantNameCheck.java:176)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isInCodeBlock(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ConstantNameCheck.java:178)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.IllegalIdentifierNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (IllegalIdentifierNameCheck.java:178)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.ScopeUtil.isLocalVariableDef(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (LocalVariableNameCheck.java:221)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.visitToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.AnnotationUtil.hasOverrideAnnotation(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (MethodNameCheck.java:232)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isReceiverParameter(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ParameterNameCheck.java:240)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.mustCheckName(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ParameterNameCheck.java:242)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.getRequiredTokens()> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil.EMPTY_INT_ARRAY> in (AbbreviationAsWordInNameCheck.java:485)\
-    - Method <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck.isIgnoreSituation(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.isReceiverParameter(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (AbbreviationAsWordInNameCheck.java:525)\
-  2. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getSurroundingAccessModifier(com.puppycrawl.tools.checkstyle.api.DetailAST)> has return type <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption> in (CheckUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PACKAGE> in (CheckUtil.java:404)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PRIVATE> in (CheckUtil.java:406)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersToken(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PUBLIC> in (CheckUtil.java:409)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PACKAGE> in (CheckUtil.java:430)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PUBLIC> in (CheckUtil.java:435)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PROTECTED> in (CheckUtil.java:438)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.CheckUtil.getAccessModifierFromModifiersTokenDirectly(com.puppycrawl.tools.checkstyle.api.DetailAST)> gets field <com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption.PRIVATE> in (CheckUtil.java:441)
-Cycle detected: Slice utils -> \
-                Slice xpath -> \
-                Slice utils\
-  1. Dependencies of Slice utils\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> has generic return type <java.util.List<com.puppycrawl.tools.checkstyle.xpath.AbstractNode>> with type argument depending on <com.puppycrawl.tools.checkstyle.xpath.AbstractNode> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> has parameter of type <com.puppycrawl.tools.checkstyle.xpath.AbstractNode> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getXpathItems(java.lang.String, com.puppycrawl.tools.checkstyle.xpath.AbstractNode)> has parameter of type <com.puppycrawl.tools.checkstyle.xpath.AbstractNode> in (XpathUtil.java:0)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.xpath.AbstractNode.getDepth()> in (XpathUtil.java:139)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls constructor <com.puppycrawl.tools.checkstyle.xpath.ElementNode.<init>(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST, int, int)> in (XpathUtil.java:143)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> calls constructor <com.puppycrawl.tools.checkstyle.xpath.RootNode.<init>(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (XpathUtil.java:187)\
-    - Method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.printXpathBranch(java.lang.String, java.io.File)> calls method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getUnderlyingNode()> in (XpathUtil.java:191)\
-  2. Dependencies of Slice xpath\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.RootNode.createChildren()> calls method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> in (RootNode.java:53)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.createChildren()> calls method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.createChildren(com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.xpath.AbstractNode, com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ElementNode.java:59)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.getLocalPart()> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.getTokenName(int)> in (ElementNode.java:79)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.createAttributeNode()> calls method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ElementNode.java:126)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.ElementNode.createAttributeNode()> calls method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (ElementNode.java:128)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.findFirstTokenByPredicate(com.puppycrawl.tools.checkstyle.api.DetailAST, java.util.function.Predicate)> in (XpathQueryGenerator.java:156)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.findChildWithTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> references method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (XpathQueryGenerator.java:156)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.isXpathQueryForNodeIsAccurateEnough(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (XpathQueryGenerator.java:224)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getXpathQuery(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.TokenUtil.getTokenName(int)> in (XpathQueryGenerator.java:264)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getXpathQuery(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.supportsTextAttribute(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (XpathQueryGenerator.java:265)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.getXpathQuery(com.puppycrawl.tools.checkstyle.api.DetailAST, com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.XpathUtil.getTextAttributeValue(com.puppycrawl.tools.checkstyle.api.DetailAST)> in (XpathQueryGenerator.java:267)\
-    - Method <com.puppycrawl.tools.checkstyle.xpath.XpathQueryGenerator.expandedTabColumn(com.puppycrawl.tools.checkstyle.api.DetailAST)> calls method <com.puppycrawl.tools.checkstyle.utils.CommonUtil.lengthExpandedTabs(java.lang.String, int, int)> in (XpathQueryGenerator.java:319)
\ No newline at end of file
diff --git a/config/archunit-store/stored.rules b/config/archunit-store/stored.rules
deleted file mode 100644
index 02437d1a854..00000000000
--- a/config/archunit-store/stored.rules
+++ /dev/null
@@ -1 +0,0 @@
-slices\ matching\ 'com.puppycrawl.tools.checkstyle.(**)'\ should\ be\ free\ of\ cycles=slices-should-be-free-of-cycles-suppressions
diff --git a/config/benchmark-config.xml b/config/benchmark-config.xml
new file mode 100644
index 00000000000..eaf42a71e7e
--- /dev/null
+++ b/config/benchmark-config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+  "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <!-- Filters -->
+
+  <property name="severity" value="ignore"/>
+  <module name="TreeWalker">
+    <module name="NoCodeInFileCheck">
+    </module>
+  </module>
+</module>
diff --git a/config/checker-framework-suppressions/checker-index-suppressions.xml b/config/checker-framework-suppressions/checker-index-suppressions.xml
index c4130019ade..78c29ff7e83 100644
--- a/config/checker-framework-suppressions/checker-index-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-index-suppressions.xml
@@ -3,7 +3,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>baseIndentation = baseIndentation.substring(0, baseIndentation.length() - 2);</lineContent>
     <details>
       found   : int
@@ -12,10 +12,10 @@
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java</fileName>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter capacity of StringBuilder.</message>
-    <lineContent>final StringBuilder sb = new StringBuilder(bufLen);</lineContent>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
+    <lineContent>return getBranchTokenTypes().get(tokenType);</lineContent>
     <details>
       found   : int
       required: @NonNegative int
@@ -25,8 +25,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
-    <lineContent>return getBranchTokenTypes().get(tokenType);</lineContent>
+    <message>incompatible argument for parameter bitIndex of BitSet.set.</message>
+    <lineContent>branchTokenTypes.set(type);</lineContent>
     <details>
       found   : int
       required: @NonNegative int
@@ -34,12 +34,23 @@
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java</fileName>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of set.</message>
-    <lineContent>branchTokenTypes.set(type);</lineContent>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
+    <lineContent>.substring(quoteLength, tokenTextLength - quoteLength);</lineContent>
     <details>
-      found   : int
+      found   : @LTEqLengthOf(&quot;com.puppycrawl.tools.checkstyle.JavaAstVisitor.QUOTE&quot;) int
+      required: @LTEqLengthOf(&quot;ctx.getText()&quot;) int
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
+    <lineContent>.substring(quoteLength, tokenTextLength - quoteLength);</lineContent>
+    <details>
+      found   : @GTENegativeOne int
       required: @NonNegative int
     </details>
   </checkerFrameworkError>
@@ -47,7 +58,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return className.substring(0, className.length() - contextLength);</lineContent>
     <details>
       found   : int
@@ -59,22 +70,21 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java</fileName>
     <specifier>array.access.unsafe.high</specifier>
     <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
-    <lineContent>final String ruleName = recognizer.getRuleNames()[ruleIndex];</lineContent>
+    <lineContent>children[i] = child;</lineContent>
     <details>
       found   : int
-      required: @IndexFor(&quot;recognizer.getRuleNames()&quot;) or @LTLengthOf(&quot;recognizer.getRuleNames()&quot;) -- an integer less than recognizer.getRuleNames()&apos;s length
+      required: @IndexFor(&quot;children&quot;) or @LTLengthOf(&quot;children&quot;) -- an integer less than children&apos;s length
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java</fileName>
-    <specifier>array.access.unsafe.high.range</specifier>
+    <specifier>array.access.unsafe.high</specifier>
     <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
-    <lineContent>children[i] = child;</lineContent>
+    <lineContent>final String ruleName = recognizer.getRuleNames()[ruleIndex];</lineContent>
     <details>
-      index type found: @IntRange(from=-2147483648) int
-      array type found: DetailNode []
-      required        : index of type @IndexFor(&quot;children&quot;) or @LTLengthOf(&quot;children&quot;), or array of type @MinLen(-9223372036854775808)
+      found   : int
+      required: @IndexFor(&quot;recognizer.getRuleNames()&quot;) or @LTLengthOf(&quot;recognizer.getRuleNames()&quot;) -- an integer less than recognizer.getRuleNames()&apos;s length
     </details>
   </checkerFrameworkError>
 
@@ -114,7 +124,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>ent.substring(prefixLength, ent.length() - 1), radix);</lineContent>
     <details>
       found   : int
@@ -125,7 +135,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (ent.charAt(0) == &apos;&amp;&apos; &amp;&amp; ent.endsWith(&quot;;&quot;)) {</lineContent>
     <details>
       found   : @UpperBoundLiteral(0) int
@@ -136,7 +146,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (ent.charAt(1) == &apos;#&apos;) {</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -147,7 +157,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (ent.charAt(2) == &apos;x&apos;) {</lineContent>
     <details>
       found   : @UpperBoundLiteral(2) int
@@ -202,7 +212,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>final String[] txt = {line.substring(startColNo)};</lineContent>
     <details>
       found   : int
@@ -213,7 +223,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>returnValue[0] = line(startLineNo - 1).substring(startColNo);</lineContent>
     <details>
       found   : int
@@ -224,7 +234,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>returnValue[0] = line(startLineNo - 1).substring(startColNo,</lineContent>
     <details>
       found   : int
@@ -235,7 +245,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>final String[] txt = {line.substring(startColNo)};</lineContent>
     <details>
       found   : int
@@ -246,7 +256,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>returnValue[0] = line(startLineNo - 1).substring(startColNo);</lineContent>
     <details>
       found   : int
@@ -257,7 +267,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>returnValue[0] = line(startLineNo - 1).substring(startColNo,</lineContent>
     <details>
       found   : int
@@ -268,7 +278,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>endColNo + 1);</lineContent>
     <details>
       found   : int
@@ -279,7 +289,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>endColNo + 1);</lineContent>
     <details>
       found   : int
@@ -290,7 +300,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>endColNo + 1);</lineContent>
     <details>
       found   : int
@@ -301,7 +311,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>endColNo + 1);</lineContent>
     <details>
       found   : int
@@ -375,6 +385,17 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java</fileName>
+    <specifier>array.access.unsafe.high</specifier>
+    <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
+    <lineContent>lineBreakPositions[lineNo] = matcher.end();</lineContent>
+    <details>
+      found   : int
+      required: @IndexFor(&quot;lineBreakPositions&quot;) or @LTLengthOf(&quot;lineBreakPositions&quot;) -- an integer less than lineBreakPositions&apos;s length
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java</fileName>
     <specifier>array.access.unsafe.high</specifier>
@@ -397,18 +418,6 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java</fileName>
-    <specifier>array.access.unsafe.high.range</specifier>
-    <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
-    <lineContent>lineBreakPositions[lineNo] = matcher.end();</lineContent>
-    <details>
-      index type found: @IntRange(from=-2147483648) int
-      array type found: int []
-      required        : index of type @IndexFor(&quot;lineBreakPositions&quot;) or @LTLengthOf(&quot;lineBreakPositions&quot;), or array of type @MinLen(-9223372036854775808)
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java</fileName>
     <specifier>array.access.unsafe.low</specifier>
@@ -445,7 +454,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>comment.getEndColNo() + 1, codePoints.length));</lineContent>
     <details>
       found   : int
@@ -456,7 +465,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>comment.getEndColNo() + 1, codePoints.length));</lineContent>
     <details>
       found   : int
@@ -522,7 +531,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>&amp;&amp; primitiveDataTypes.get(parameterType.getType())) {</lineContent>
     <details>
       found   : int
@@ -533,7 +542,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter pos of seek.</message>
+    <message>incompatible argument for parameter pos of RandomAccessFile.seek.</message>
     <lineContent>file.seek(file.length() - len);</lineContent>
     <details>
       found   : long
@@ -555,7 +564,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>expr = quotedText.substring(1, quotedText.length() - 1);</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -566,7 +575,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>expr = quotedText.substring(1, quotedText.length() - 1);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -577,7 +586,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return sourceNameLower.substring(startIndex, endIndex);</lineContent>
     <details>
       found   : @LTEqLengthOf(&quot;sourceName&quot;) int
@@ -588,7 +597,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return sourceNameLower.substring(startIndex, endIndex);</lineContent>
     <details>
       found   : int
@@ -599,7 +608,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>lastChild.getColumnNo() + 2, lineCodePoints.length);</lineContent>
     <details>
       found   : int
@@ -610,7 +619,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>lastChild.getColumnNo() + 2, lineCodePoints.length);</lineContent>
     <details>
       found   : int
@@ -621,7 +630,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>final String removePattern = regexp.substring(&quot;^.+&quot;.length());</lineContent>
     <details>
       found   : @LTEqLengthOf(&quot;&quot;^.+&quot;&quot;) int
@@ -632,7 +641,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>.substring(0, fileNameWithPath.lastIndexOf(File.separator));</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -643,7 +652,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>if (TYPES_HASH_SET.get(type)) {</lineContent>
     <details>
       found   : int
@@ -665,7 +674,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>return warning.substring(1, warning.length() - 1);</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -676,7 +685,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return warning.substring(1, warning.length() - 1);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -687,7 +696,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>slistColNo + 1, codePointsFirstLine.length);</lineContent>
     <details>
       found   : int
@@ -698,7 +707,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>slistColNo + 1, rcurlyColNo);</lineContent>
     <details>
       found   : int
@@ -709,7 +718,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>slistColNo + 1, codePointsFirstLine.length);</lineContent>
     <details>
       found   : int
@@ -720,7 +729,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>slistColNo + 1, rcurlyColNo);</lineContent>
     <details>
       found   : int
@@ -731,7 +740,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>|| braceLine.charAt(brace.getColumnNo() + 1) != &apos;}&apos;) {</lineContent>
     <details>
       found   : int
@@ -742,7 +751,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>|| braceLine.charAt(brace.getColumnNo() + 1) != &apos;}&apos;) {</lineContent>
     <details>
       found   : int
@@ -753,7 +762,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>token -&gt; !IGNORED_TYPES.get(token.getType());</lineContent>
     <details>
       found   : int
@@ -764,7 +773,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return ASSIGN_OPERATOR_TYPES.get(parentType);</lineContent>
     <details>
       found   : int
@@ -775,7 +784,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return LOOP_TYPES.get(ast);</lineContent>
     <details>
       found   : int
@@ -786,7 +795,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>setterName = name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1);</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -797,7 +806,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>setterName = name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1);</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -808,7 +817,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (name.length() == 1 || !Character.isUpperCase(name.charAt(1))) {</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -819,7 +828,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; illegal.charAt(pkgNameLen) == &apos;.&apos;</lineContent>
     <details>
       found   : int
@@ -830,7 +839,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; illegal.charAt(pkgNameLen) == &apos;.&apos;</lineContent>
     <details>
       found   : int
@@ -841,7 +850,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>if (memberModifiers.get(modifier.getType())) {</lineContent>
     <details>
       found   : int
@@ -852,7 +861,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return COMPARISON_TYPES.get(astType);</lineContent>
     <details>
       found   : int
@@ -863,7 +872,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>while (skipTokens.get(result.getType())) {</lineContent>
     <details>
       found   : int
@@ -874,7 +883,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>if (!constantWaiverParentToken.get(type)) {</lineContent>
     <details>
       found   : int
@@ -885,7 +894,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return MUTATION_OPERATIONS.get(iteratingExpressionAST.getType());</lineContent>
     <details>
       found   : int
@@ -896,7 +905,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>if (ignoreOccurrenceContext.get(type)) {</lineContent>
     <details>
       found   : int
@@ -907,7 +916,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of set.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.set.</message>
     <lineContent>ignoreOccurrenceContext.set(type);</lineContent>
     <details>
       found   : int
@@ -918,7 +927,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return fileName.substring(0, lastSeparatorPos);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -929,7 +938,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return ASSIGN_TOKENS.get(tokenType);</lineContent>
     <details>
       found   : int
@@ -940,7 +949,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return COMPOUND_ASSIGN_TOKENS.get(tokenType);</lineContent>
     <details>
       found   : int
@@ -951,7 +960,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DECLARATION_TOKENS.get(parentType);</lineContent>
     <details>
       found   : int
@@ -962,7 +971,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>&amp;&amp; CLASS_MEMBER_TOKENS.get(nextSibling.getType())) {</lineContent>
     <details>
       found   : int
@@ -973,7 +982,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return ignoreLines.get(lineNo);</lineContent>
     <details>
       found   : int
@@ -984,7 +993,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return multiLines.get(lineNo + 1);</lineContent>
     <details>
       found   : int
@@ -995,7 +1004,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>excludeMinusDotStar.length() + 1);</lineContent>
     <details>
       found   : @LTLengthOf(value={&quot;exclude.substring(0, exclude.length() - 2)&quot;, &quot;excludeMinusDotStar&quot;}, offset={&quot;-2&quot;, &quot;-2&quot;}) int
@@ -1006,7 +1015,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>ruleStr.indexOf(&apos;)&apos;));</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -1029,22 +1038,21 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java</fileName>
     <specifier>array.access.unsafe.high</specifier>
     <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
-    <lineContent>if (CommonUtil.isBlank(lines[i - 1])) {</lineContent>
+    <lineContent>final String import2Token = import2Tokens[i];</lineContent>
     <details>
       found   : int
-      required: @IndexFor(&quot;lines&quot;) or @LTLengthOf(&quot;lines&quot;) -- an integer less than lines&apos;s length
+      required: @IndexFor(&quot;import2Tokens&quot;) or @LTLengthOf(&quot;import2Tokens&quot;) -- an integer less than import2Tokens&apos;s length
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java</fileName>
-    <specifier>array.access.unsafe.high.range</specifier>
+    <specifier>array.access.unsafe.high</specifier>
     <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
-    <lineContent>final String import2Token = import2Tokens[i];</lineContent>
+    <lineContent>if (CommonUtil.isBlank(lines[i - 1])) {</lineContent>
     <details>
-      index type found: @IntRange(from=-2147483648) int
-      array type found: String @ArrayLenRange(from=1) []
-      required        : index of type @IndexFor(&quot;import2Tokens&quot;) or @LTLengthOf(&quot;import2Tokens&quot;), or array of type @MinLen(-9223372036854775808)
+      found   : int
+      required: @IndexFor(&quot;lines&quot;) or @LTLengthOf(&quot;lines&quot;) -- an integer less than lines&apos;s length
     </details>
   </checkerFrameworkError>
 
@@ -1062,7 +1070,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return qualifiedImportName.substring(0, lastDotIndex);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -1073,7 +1081,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; (pkg.length() == length || pkg.charAt(length) == &apos;.&apos;);</lineContent>
     <details>
       found   : @LTEqLengthOf(&quot;this.fullPackageName&quot;) int
@@ -1084,7 +1092,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>final String front = importName.substring(0, index);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -1095,7 +1103,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>while (Character.isWhitespace(line.charAt(index))) {</lineContent>
     <details>
       found   : int
@@ -1106,7 +1114,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; Character.isWhitespace(line.charAt(realColumnNo))) {</lineContent>
     <details>
       found   : int
@@ -1139,7 +1147,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; Character.isWhitespace(line.charAt(realColumnNo))) {</lineContent>
     <details>
       found   : int
@@ -1227,20 +1235,19 @@
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java</fileName>
-    <specifier>array.access.unsafe.high.range</specifier>
+    <specifier>array.access.unsafe.high</specifier>
     <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
     <lineContent>types[index] = val;</lineContent>
     <details>
-      index type found: @IntRange(from=-2147483648) int
-      array type found: int []
-      required        : index of type @IndexFor(&quot;types&quot;) or @LTLengthOf(&quot;types&quot;), or array of type @MinLen(-9223372036854775808)
+      found   : int
+      required: @IndexFor(&quot;types&quot;) or @LTLengthOf(&quot;types&quot;) -- an integer less than types&apos;s length
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return levels.get(indent);</lineContent>
     <details>
       found   : int
@@ -1251,7 +1258,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of set.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.set.</message>
     <lineContent>levels.set(i + offset);</lineContent>
     <details>
       found   : int
@@ -1262,7 +1269,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of set.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.set.</message>
     <lineContent>levels.set(indent);</lineContent>
     <details>
       found   : int
@@ -1273,7 +1280,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of set.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.set.</message>
     <lineContent>result.levels.set(addition);</lineContent>
     <details>
       found   : int
@@ -1284,7 +1291,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>while (Character.isWhitespace(line.charAt(index))) {</lineContent>
     <details>
       found   : int
@@ -1295,7 +1302,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return PARENT_TOKEN_TYPES.get(parentType);</lineContent>
     <details>
       found   : int
@@ -1306,7 +1313,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>if (target.get(parentType)) {</lineContent>
     <details>
       found   : int
@@ -1317,7 +1324,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>return text.substring(startOfText, endOfText);</lineContent>
     <details>
       found   : int
@@ -1328,7 +1335,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>return text.substring(startOfText, endOfText);</lineContent>
     <details>
       found   : int
@@ -1339,7 +1346,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return text.substring(startOfText, endOfText);</lineContent>
     <details>
       found   : int
@@ -1350,7 +1357,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>return position != text.length() - 1 &amp;&amp; text.charAt(position + 1) == &apos;/&apos;;</lineContent>
     <details>
       found   : int
@@ -1361,7 +1368,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>return position != text.length() - 1 &amp;&amp; text.charAt(position + 1) == &apos;/&apos;;</lineContent>
     <details>
       found   : int
@@ -1394,7 +1401,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; !Character.isWhitespace(text.charAt(lastAsteriskPosition + 1))) {</lineContent>
     <details>
       found   : int
@@ -1405,7 +1412,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; !Character.isWhitespace(text.charAt(lastAsteriskPosition + 1))) {</lineContent>
     <details>
       found   : int
@@ -1416,7 +1423,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>builder.append(line.substring(textStart));</lineContent>
     <details>
       found   : int
@@ -1427,7 +1434,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>builder.append(line.substring(textStart));</lineContent>
     <details>
       found   : int
@@ -1438,19 +1445,19 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
-    <lineContent>if (line.charAt(textStart) == &apos;@&apos;) {</lineContent>
+    <message>incompatible argument for parameter index of AbstractStringBuilder.charAt.</message>
+    <lineContent>if (Character.isWhitespace(builder.charAt(index))) {</lineContent>
     <details>
       found   : int
-      required: @LTLengthOf(&quot;line&quot;) int
+      required: @NonNegative int
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
-    <lineContent>if (Character.isWhitespace(builder.charAt(index))) {</lineContent>
+    <message>incompatible argument for parameter index of AbstractStringBuilder.charAt.</message>
+    <lineContent>while (builder.charAt(index - 1) == &apos;*&apos;) {</lineContent>
     <details>
       found   : int
       required: @NonNegative int
@@ -1460,19 +1467,19 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (line.charAt(textStart) == &apos;@&apos;) {</lineContent>
     <details>
       found   : int
-      required: @NonNegative int
+      required: @LTLengthOf(&quot;line&quot;) int
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
-    <lineContent>while (builder.charAt(index - 1) == &apos;*&apos;) {</lineContent>
+    <message>incompatible argument for parameter index of String.charAt.</message>
+    <lineContent>if (line.charAt(textStart) == &apos;@&apos;) {</lineContent>
     <details>
       found   : int
       required: @NonNegative int
@@ -1482,7 +1489,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of deleteCharAt.</message>
+    <message>incompatible argument for parameter index of StringBuilder.deleteCharAt.</message>
     <lineContent>builder.deleteCharAt(index - 1);</lineContent>
     <details>
       found   : int
@@ -1493,7 +1500,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of deleteCharAt.</message>
+    <message>incompatible argument for parameter index of StringBuilder.deleteCharAt.</message>
     <lineContent>builder.deleteCharAt(index);</lineContent>
     <details>
       found   : int
@@ -1526,7 +1533,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>else if (!CommonUtil.isBlank(text.substring(1, offset + 1))) {</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -1537,7 +1544,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>else if (!CommonUtil.isBlank(text.substring(1, offset + 1))) {</lineContent>
     <details>
       found   : int
@@ -1548,7 +1555,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1559,7 +1566,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1570,7 +1577,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1581,7 +1588,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1592,7 +1599,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1603,7 +1610,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1614,7 +1621,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1625,7 +1632,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES.get(astType)</lineContent>
     <details>
       found   : int
@@ -1636,7 +1643,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return DEF_TOKEN_TYPES_DEPRECATED.get(astType)</lineContent>
     <details>
       found   : int
@@ -1658,7 +1665,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>&amp;&amp; ALLOWED_TYPES.get(child.getType())) {</lineContent>
     <details>
       found   : int
@@ -1666,28 +1673,6 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter end of append.</message>
-    <lineContent>result.append(text, 0, text.indexOf(periodSuffix) + 1);</lineContent>
-    <details>
-      found   : @LTLengthOf(value=&quot;text&quot;, offset=&quot;-2&quot;) int
-      required: @LTEqLengthOf(&quot;text&quot;) int
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java</fileName>
-    <specifier>array.access.unsafe.high</specifier>
-    <message>Potentially unsafe array access: the index could be larger than the array&apos;s bound</message>
-    <lineContent>final DetailNode child = children[i];</lineContent>
-    <details>
-      found   : int
-      required: @IndexFor(&quot;children&quot;) or @LTLengthOf(&quot;children&quot;) -- an integer less than children&apos;s length
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java</fileName>
     <specifier>array.access.unsafe.high.constant</specifier>
@@ -1790,8 +1775,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
-    <lineContent>text = text.substring(column).trim();</lineContent>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
+    <lineContent>text = text.substring(column);</lineContent>
     <details>
       found   : int
       required: @NonNegative int
@@ -1801,7 +1786,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>tagId = text.substring(0, position);</lineContent>
     <details>
       found   : int
@@ -1812,7 +1797,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>.substring(0, toPoint.getColumnNo() + 1).endsWith(&quot;--&gt;&quot;)) {</lineContent>
     <details>
       found   : int
@@ -1823,7 +1808,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>.substring(0, toPoint.getColumnNo() + 1).endsWith(&quot;--&gt;&quot;)) {</lineContent>
     <details>
       found   : int
@@ -1834,7 +1819,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; text[curr.getLineNo()].charAt(curr.getColumnNo()) != character) {</lineContent>
     <details>
       found   : int
@@ -1845,7 +1830,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>.charAt(endTag.getColumnNo() - 1) == &apos;/&apos;;</lineContent>
     <details>
       found   : int
@@ -1856,7 +1841,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>&amp;&amp; text[curr.getLineNo()].charAt(curr.getColumnNo()) != character) {</lineContent>
     <details>
       found   : int
@@ -1867,7 +1852,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>.charAt(endTag.getColumnNo() - 1) == &apos;/&apos;;</lineContent>
     <details>
       found   : int
@@ -1878,7 +1863,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (text.charAt(column) == &apos;/&apos;) {</lineContent>
     <details>
       found   : int
@@ -1889,7 +1874,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>|| Character.isJavaIdentifierStart(text.charAt(column))</lineContent>
     <details>
       found   : int
@@ -1900,7 +1885,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>|| text.charAt(column) == &apos;/&apos;;</lineContent>
     <details>
       found   : int
@@ -2076,7 +2061,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>final String content = commentValue.substring(contentStart);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -2087,7 +2072,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>final String content = commentValue.substring(contentStart);</lineContent>
     <details>
       found   : int
@@ -2098,7 +2083,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>final String remainder = line.substring(tagMatcher.end(1));</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -2109,7 +2094,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>final String remainder = line.substring(tagMatcher.end(1));</lineContent>
     <details>
       found   : int
@@ -2120,7 +2105,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of subSequence.</message>
+    <message>incompatible argument for parameter endIndex of String.subSequence.</message>
     <lineContent>final String precedingText = source.subSequence(0, index).toString();</lineContent>
     <details>
       found   : int
@@ -2131,7 +2116,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of subSequence.</message>
+    <message>incompatible argument for parameter endIndex of String.subSequence.</message>
     <lineContent>final String precedingText = source.subSequence(0, index).toString();</lineContent>
     <details>
       found   : int
@@ -2142,7 +2127,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>classNameWithPackage.substring(0, lastDotIndex);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -2153,7 +2138,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>result = str.substring(beginIndex);</lineContent>
     <details>
       found   : int
@@ -2164,7 +2149,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>result = str.substring(beginIndex, endIndex);</lineContent>
     <details>
       found   : int
@@ -2175,7 +2160,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>result = str.substring(beginIndex);</lineContent>
     <details>
       found   : int
@@ -2186,7 +2171,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>result = str.substring(beginIndex, endIndex);</lineContent>
     <details>
       found   : int
@@ -2197,7 +2182,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>result = str.substring(beginIndex, endIndex);</lineContent>
     <details>
       found   : int
@@ -2208,7 +2193,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>result = str.substring(beginIndex, endIndex);</lineContent>
     <details>
       found   : int
@@ -2219,7 +2204,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter start of find.</message>
+    <message>incompatible argument for parameter start of Matcher.find.</message>
     <lineContent>final boolean foundMatch = matcher.find(startPosition);</lineContent>
     <details>
       found   : int
@@ -2230,7 +2215,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of set.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.set.</message>
     <lineContent>usedLines.set(lineIndex);</lineContent>
     <details>
       found   : int
@@ -2241,7 +2226,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter fromIndex of set.</message>
+    <message>incompatible argument for parameter fromIndex of BitSet.set.</message>
     <lineContent>usedLines.set(lineIndex, endLineIndex + 1);</lineContent>
     <details>
       found   : int
@@ -2252,7 +2237,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter toIndex of set.</message>
+    <message>incompatible argument for parameter toIndex of BitSet.set.</message>
     <lineContent>usedLines.set(lineIndex, endLineIndex + 1);</lineContent>
     <details>
       found   : int
@@ -2362,7 +2347,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return acceptableTokens.get(ast.getType());</lineContent>
     <details>
       found   : int
@@ -2373,7 +2358,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>Arrays.copyOfRange(currentLine, colNo + text.length(), currentLine.length)</lineContent>
     <details>
       found   : @LTLengthOf(value={&quot;ast.getText()&quot;, &quot;text&quot;}, offset={&quot;-colNo - 1&quot;, &quot;-colNo - 1&quot;}) int
@@ -2384,7 +2369,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
+    <message>incompatible argument for parameter from of Arrays.copyOfRange.</message>
     <lineContent>Arrays.copyOfRange(currentLine, colNo + text.length(), currentLine.length)</lineContent>
     <details>
       found   : int
@@ -2557,7 +2542,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>result.addLast(fileName.substring(0, fileName.length() - JAVA_FILE_EXTENSION.length()));</lineContent>
     <details>
       found   : int
@@ -2568,7 +2553,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return fileName.substring(0, fileName.length() - JAVA_FILE_EXTENSION.length());</lineContent>
     <details>
       found   : int
@@ -2579,7 +2564,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter initialCapacity of ArrayList.</message>
+    <message>incompatible argument for parameter initialCapacity of ArrayList constructor.</message>
     <lineContent>final List&lt;ModulePropertyDetails&gt; result = new ArrayList&lt;&gt;(propertyListLength);</lineContent>
     <details>
       found   : int
@@ -2590,7 +2575,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter initialCapacity of ArrayList.</message>
+    <message>incompatible argument for parameter initialCapacity of ArrayList constructor.</message>
     <lineContent>final List&lt;String&gt; listContent = new ArrayList&lt;&gt;(nodeListLength);</lineContent>
     <details>
       found   : int
@@ -2601,10 +2586,10 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>+ moduleFilePath.substring(indexOfCheckstyle + 1) + xmlExtension;</lineContent>
     <details>
-      found   : @LTLengthOf(value={&quot;checkstyleString&quot;, &quot;moduleFilePath&quot;, &quot;moduleFilePath&quot;}, offset={&quot;-moduleFilePath.indexOf(checkstyleString) - 2&quot;, &quot;-12&quot;, &quot;-checkstyleString.length() - 2&quot;}) int
+      found   : @LTLengthOf(value={&quot;checkstyleString&quot;, &quot;moduleFilePath&quot;, &quot;moduleFilePath&quot;}, offset={&quot;-moduleFilePath.indexOf(checkstyleString) - 2&quot;, &quot;-11&quot;, &quot;-checkstyleString.length() - 1&quot;}) int
       required: @LTEqLengthOf(&quot;moduleFilePath&quot;) int
     </details>
   </checkerFrameworkError>
@@ -2612,18 +2597,84 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>+ moduleFilePath.substring(0, indexOfCheckstyle) + &quot;/meta/&quot;</lineContent>
     <details>
-      found   : @LTLengthOf(value={&quot;checkstyleString&quot;, &quot;moduleFilePath&quot;, &quot;moduleFilePath&quot;}, offset={&quot;-moduleFilePath.indexOf(checkstyleString) - 1&quot;, &quot;-11&quot;, &quot;-checkstyleString.length() - 1&quot;}) int
+      found   : @LTLengthOf(value={&quot;checkstyleString&quot;, &quot;moduleFilePath&quot;, &quot;moduleFilePath&quot;}, offset={&quot;-moduleFilePath.indexOf(checkstyleString) - 1&quot;, &quot;-10&quot;, &quot;-checkstyleString.length()&quot;}) int
       required: @LTEqLengthOf(&quot;moduleFilePath&quot;) int
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
+    <lineContent>return Introspector.decapitalize(setterName.substring(&quot;set&quot;.length()));</lineContent>
+    <details>
+      found   : @LTEqLengthOf(&quot;&quot;set&quot;&quot;) int
+      required: @LTEqLengthOf(&quot;setterName&quot;) int
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
+    <lineContent>description = firstLetterCapitalized + descriptionString.substring(1);</lineContent>
+    <details>
+      found   : @UpperBoundLiteral(1) int
+      required: @LTEqLengthOf(&quot;descriptionString&quot;) int
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
+    <lineContent>href = href.substring(1, href.length() - 1);</lineContent>
+    <details>
+      found   : @UpperBoundLiteral(1) int
+      required: @LTEqLengthOf(&quot;href&quot;) int
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
+    <lineContent>href = href.substring(1, href.length() - 1);</lineContent>
+    <details>
+      found   : @GTENegativeOne int
+      required: @NonNegative int
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
+    <lineContent>final String firstLetterCapitalized = descriptionString.substring(0, 1)</lineContent>
+    <details>
+      found   : @UpperBoundLiteral(1) int
+      required: @LTEqLengthOf(&quot;descriptionString&quot;) int
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>array.access.unsafe.high.constant</specifier>
+    <message>Potentially unsafe array access: the constant index 0 could be larger than the array&apos;s bound</message>
+    <lineContent>final Class&lt;?&gt; parameterClass = (Class&lt;?&gt;) type.getActualTypeArguments()[0];</lineContent>
+    <details>
+      found   : Type []
+      required: @MinLen(1) -- an array guaranteed to have at least 1 elements
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>return variableExpression.substring(propertyStartIndex, propertyEndIndex);</lineContent>
     <details>
       found   : @GTENegativeOne int
@@ -2634,7 +2685,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>returnString = line.substring(indent, lastNonWhitespace);</lineContent>
     <details>
       found   : int
@@ -2645,7 +2696,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>returnString = line.substring(indent, lastNonWhitespace);</lineContent>
     <details>
       found   : int
@@ -2656,7 +2707,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>returnString = line.substring(indent, lastNonWhitespace);</lineContent>
     <details>
       found   : int
@@ -2667,7 +2718,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>final boolean negative = txt.charAt(0) == &apos;-&apos;;</lineContent>
     <details>
       found   : @UpperBoundLiteral(0) int
@@ -2678,7 +2729,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseInt.</message>
+    <message>incompatible argument for parameter radix of Integer.parseInt.</message>
     <lineContent>result = Integer.parseInt(txt, radix);</lineContent>
     <details>
       found   : int
@@ -2689,7 +2740,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseInt.</message>
+    <message>incompatible argument for parameter radix of Integer.parseInt.</message>
     <lineContent>result = Integer.parseInt(txt, radix);</lineContent>
     <details>
       found   : int
@@ -2700,8 +2751,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseLong.</message>
-    <lineContent>result = Long.parseLong(txt, radix);</lineContent>
+    <message>incompatible argument for parameter radix of Integer.parseUnsignedInt.</message>
+    <lineContent>result = Integer.parseUnsignedInt(txt, radix);</lineContent>
     <details>
       found   : int
       required: @IntRange(from=2, to=36) int
@@ -2711,8 +2762,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseLong.</message>
-    <lineContent>result = Long.parseLong(txt, radix);</lineContent>
+    <message>incompatible argument for parameter radix of Integer.parseUnsignedInt.</message>
+    <lineContent>result = Integer.parseUnsignedInt(txt, radix);</lineContent>
     <details>
       found   : int
       required: @Positive int
@@ -2722,8 +2773,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseUnsignedInt.</message>
-    <lineContent>result = Integer.parseUnsignedInt(txt, radix);</lineContent>
+    <message>incompatible argument for parameter radix of Long.parseLong.</message>
+    <lineContent>result = Long.parseLong(txt, radix);</lineContent>
     <details>
       found   : int
       required: @IntRange(from=2, to=36) int
@@ -2733,8 +2784,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseUnsignedInt.</message>
-    <lineContent>result = Integer.parseUnsignedInt(txt, radix);</lineContent>
+    <message>incompatible argument for parameter radix of Long.parseLong.</message>
+    <lineContent>result = Long.parseLong(txt, radix);</lineContent>
     <details>
       found   : int
       required: @Positive int
@@ -2744,7 +2795,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseUnsignedLong.</message>
+    <message>incompatible argument for parameter radix of Long.parseUnsignedLong.</message>
     <lineContent>result = Long.parseUnsignedLong(txt, radix);</lineContent>
     <details>
       found   : int
@@ -2755,7 +2806,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseUnsignedLong.</message>
+    <message>incompatible argument for parameter radix of Long.parseUnsignedLong.</message>
     <lineContent>result = Long.parseUnsignedLong(txt, radix);</lineContent>
     <details>
       found   : int
@@ -2763,21 +2814,10 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter from of copyOfRange.</message>
-    <lineContent>return Arrays.copyOfRange(codePoints, startIndex, codePoints.length);</lineContent>
-    <details>
-      found   : int
-      required: @LTEqLengthOf(&quot;codePoints&quot;) int
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>.substring(lastIndexOfClasspathProtocol));</lineContent>
     <details>
       found   : @LTEqLengthOf(&quot;com.puppycrawl.tools.checkstyle.utils.CommonUtil.CLASSPATH_URL_PROTOCOL&quot;) int
@@ -2788,7 +2828,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (filename.charAt(0) == &apos;/&apos;) {</lineContent>
     <details>
       found   : @UpperBoundLiteral(0) int
@@ -2799,7 +2839,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>isIdentifier = Character.isJavaIdentifierStart(str.charAt(0));</lineContent>
     <details>
       found   : @UpperBoundLiteral(0) int
@@ -2810,7 +2850,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of charAt.</message>
+    <message>incompatible argument for parameter index of String.charAt.</message>
     <lineContent>if (!Character.isWhitespace(line.charAt(i))) {</lineContent>
     <details>
       found   : int
@@ -2821,7 +2861,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter index of codePointAt.</message>
+    <message>incompatible argument for parameter index of String.codePointAt.</message>
     <lineContent>if (inputString.codePointAt(idx) == &apos;\t&apos;) {</lineContent>
     <details>
       found   : int
@@ -2865,7 +2905,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>return commentContent.getText().substring(1);</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -2966,10 +3006,21 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter newLength of Arrays.copyOf.</message>
+    <lineContent>return Arrays.copyOf(array, length);</lineContent>
+    <details>
+      found   : int
+      required: @NonNegative int
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter beginIndex of substring.</message>
+    <message>incompatible argument for parameter beginIndex of String.substring.</message>
     <lineContent>text = text.substring(1, text.length() - 1);</lineContent>
     <details>
       found   : @UpperBoundLiteral(1) int
@@ -2980,7 +3031,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter bitIndex of get.</message>
+    <message>incompatible argument for parameter bitIndex of BitSet.get.</message>
     <lineContent>return TOKEN_TYPES_WITH_TEXT_ATTRIBUTE.get(ast.getType());</lineContent>
     <details>
       found   : int
@@ -2991,7 +3042,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter endIndex of substring.</message>
+    <message>incompatible argument for parameter endIndex of String.substring.</message>
     <lineContent>text = text.substring(1, text.length() - 1);</lineContent>
     <details>
       found   : @GTENegativeOne int
diff --git a/config/checker-framework-suppressions/checker-lock-tainting-suppressions.xml b/config/checker-framework-suppressions/checker-lock-tainting-suppressions.xml
index 25509e2971a..e732b8b1223 100644
--- a/config/checker-framework-suppressions/checker-lock-tainting-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-lock-tainting-suppressions.xml
@@ -89,7 +89,7 @@
     <details>
       found   : @GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy String&gt;
       required: @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy String&gt;
-      Consequence: method in @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy String&gt;
+      Consequence: method in @GuardedBy Entry&lt;K extends @GuardedBy Object, V extends @GuardedBy Object&gt;
       @GuardedBy String getKey(@GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy String&gt; this)
       is not a valid method reference for method in @GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy String&gt;, @GuardedBy String&gt;
       @GuardedBy String apply(@GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy String&gt;, @GuardedBy String&gt; this, @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy String&gt; p0)
@@ -100,7 +100,7 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java</fileName>
     <specifier>methodref.receiver.bound</specifier>
     <message>Incompatible receiver type</message>
-    <lineContent>.collect(Collectors.toMap(Function.identity(), properties::getProperty));</lineContent>
+    <lineContent>Collectors.toUnmodifiableMap(Function.identity(), properties::getProperty));</lineContent>
     <details>
       found   : @GuardedBy Properties
       required: @GuardSatisfied Properties
@@ -115,14 +115,14 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java</fileName>
     <specifier>methodref.receiver</specifier>
     <message>Incompatible receiver type</message>
-    <lineContent>.thenComparing(AbstractCheck::hashCode));</lineContent>
+    <lineContent>.thenComparingInt(AbstractCheck::hashCode));</lineContent>
     <details>
       found   : @GuardSatisfied Object
       required: @GuardedBy AbstractCheck
       Consequence: method in @GuardedBy AbstractCheck
       @GuardedBy int hashCode(@GuardSatisfied Object this)
-      is not a valid method reference for method in @GuardedBy Function&lt;@GuardedBy AbstractCheck, @GuardedBy Integer&gt;
-      @GuardedBy Integer apply(@GuardedBy Function&lt;@GuardedBy AbstractCheck, @GuardedBy Integer&gt; this, @GuardedBy AbstractCheck p0)
+      is not a valid method reference for method in @GuardedBy ToIntFunction&lt;@GuardedBy AbstractCheck&gt;
+      @GuardedBy int applyAsInt(@GuardedBy ToIntFunction&lt;@GuardedBy AbstractCheck&gt; this, @GuardedBy AbstractCheck p0)
     </details>
   </checkerFrameworkError>
 
@@ -145,14 +145,14 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
     <specifier>method.guarantee.violated</specifier>
     <message>@Pure method resolveEntity calls method getClassLoader with a weaker @ReleasesNoLocks side effect guarantee</message>
-    <lineContent>getClass().getClassLoader();</lineContent>
+    <lineContent>final ClassLoader loader = getClass().getClassLoader();</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
     <specifier>method.guarantee.violated</specifier>
     <message>@Pure method resolveEntity calls method getResourceAsStream with a weaker @ReleasesNoLocks side effect guarantee</message>
-    <lineContent>loader.getResourceAsStream(dtdResourceName);</lineContent>
+    <lineContent>final InputStream dtdIs = loader.getResourceAsStream(dtdResourceName);</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -439,16 +439,21 @@
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java</fileName>
-    <specifier>methodref.param</specifier>
-    <message>Incompatible parameter type for obj</message>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.iterate</message>
     <lineContent>Stream.iterate(startNode.getLastChild(), Objects::nonNull,</lineContent>
     <details>
-      found   : @GuardSatisfied Object
-      required: @GuardedBy DetailAST
-      Consequence: method in @GuardedBy Objects
-      @GuardedBy boolean nonNull(@GuardSatisfied Object p0)
-      is not a valid method reference for method in @GuardedBy Predicate&lt;@GuardedBy DetailAST&gt;
-      @GuardedBy boolean test(@GuardedBy Predicate&lt;@GuardedBy DetailAST&gt; this, @GuardedBy DetailAST p0)
+      unsatisfiable constraint: @GuardedBy DetailAST &lt;: @GuardSatisfied Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheck.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Optional.map</message>
+    <lineContent>.map(children::indexOf);</lineContent>
+    <details>
+      unsatisfiable constraint: @GuardedBy DetailAST &lt;: @GuardSatisfied Object
     </details>
   </checkerFrameworkError>
 
@@ -505,7 +510,7 @@
     <details>
       found   : @GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy ClassDesc&gt;
       required: @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy ClassDesc&gt;
-      Consequence: method in @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy ClassDesc&gt;
+      Consequence: method in @GuardedBy Entry&lt;K extends @GuardedBy Object, V extends @GuardedBy Object&gt;
       @GuardedBy ClassDesc getValue(@GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy ClassDesc&gt; this)
       is not a valid method reference for method in @GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy ClassDesc&gt;, @GuardedBy ClassDesc&gt;
       @GuardedBy ClassDesc apply(@GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy ClassDesc&gt;, @GuardedBy ClassDesc&gt; this, @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy ClassDesc&gt; p0)
@@ -541,6 +546,16 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.collect</message>
+    <lineContent>.collect(Collectors.joining(&quot;, &quot;)),</lineContent>
+    <details>
+      unsatisfiable constraint: @GuardedBy String &lt;: @GuardSatisfied Object
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java</fileName>
     <specifier>override.receiver</specifier>
@@ -630,21 +645,6 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java</fileName>
-    <specifier>methodref.receiver.bound</specifier>
-    <message>Incompatible receiver type</message>
-    <lineContent>.forEach(excludeClassesRegexps::add);</lineContent>
-    <details>
-      found   : @GuardedBy List&lt;@GuardedBy Pattern&gt;
-      required: @GuardSatisfied List&lt;@GuardedBy Pattern&gt;
-      Consequence: method
-      @GuardedBy List&lt;@GuardedBy Pattern&gt;
-      is not a valid method reference for method in @GuardedBy List&lt;@GuardedBy Pattern&gt;
-      @GuardedBy boolean add(@GuardSatisfied List&lt;@GuardedBy Pattern&gt; this, @GuardedBy Pattern p0)
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.java</fileName>
     <specifier>method.guarantee.violated</specifier>
@@ -669,16 +669,11 @@
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java</fileName>
-    <specifier>methodref.param</specifier>
-    <message>Incompatible parameter type for obj</message>
-    <lineContent>node.getLastChild(), Objects::nonNull, DetailAST::getPreviousSibling</lineContent>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.iterate</message>
+    <lineContent>Stream.iterate(</lineContent>
     <details>
-      found   : @GuardSatisfied Object
-      required: @GuardedBy DetailAST
-      Consequence: method in @GuardedBy Objects
-      @GuardedBy boolean nonNull(@GuardSatisfied Object p0)
-      is not a valid method reference for method in @GuardedBy Predicate&lt;@GuardedBy DetailAST&gt;
-      @GuardedBy boolean test(@GuardedBy Predicate&lt;@GuardedBy DetailAST&gt; this, @GuardedBy DetailAST p0)
+      unsatisfiable constraint: @GuardedBy DetailAST &lt;: @GuardSatisfied Object
     </details>
   </checkerFrameworkError>
 
@@ -839,6 +834,69 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>&amp;&amp; Objects.equals(getPatternSafely(checkRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>&amp;&amp; Objects.equals(getPatternSafely(messageRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(suppressElement.checkRegexp))</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(suppressElement.fileRegexp))</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(suppressElement.messageRegexp))</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>return Objects.equals(getPatternSafely(fileRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method hashCode calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(messageRegexp), moduleId, linesCsv, columnsCsv);</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method hashCode calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>return Objects.hash(getPatternSafely(fileRegexp), getPatternSafely(checkRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method hashCode calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>return Objects.hash(getPatternSafely(fileRegexp), getPatternSafely(checkRegexp),</lineContent>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>override.param</specifier>
@@ -1109,6 +1167,69 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>&amp;&amp; Objects.equals(getPatternSafely(checkRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>&amp;&amp; Objects.equals(getPatternSafely(messageRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(xpathFilter.checkRegexp))</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(xpathFilter.fileRegexp))</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(xpathFilter.messageRegexp))</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method equals calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>return Objects.equals(getPatternSafely(fileRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method hashCode calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>getPatternSafely(messageRegexp), moduleId, xpathQuery);</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method hashCode calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>return Objects.hash(getPatternSafely(fileRegexp), getPatternSafely(checkRegexp),</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
+    <specifier>method.guarantee.violated</specifier>
+    <message>@Pure method hashCode calls method getPatternSafely with a weaker @ReleasesNoLocks side effect guarantee</message>
+    <lineContent>return Objects.hash(getPatternSafely(fileRegexp), getPatternSafely(checkRegexp),</lineContent>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
     <specifier>override.param</specifier>
@@ -1170,17 +1291,32 @@
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
-    <specifier>methodref.receiver</specifier>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java</fileName>
+    <specifier>override.receiver</specifier>
     <message>Incompatible receiver type</message>
-    <lineContent>.collect(BitSet::new, BitSet::set, BitSet::or);</lineContent>
+    <lineContent>public void println() {</lineContent>
+    <details>
+      found   : @GuardedBy CustomPrintWriter
+      required: @GuardSatisfied PrintWriter
+      Consequence: method in @GuardedBy CustomPrintWriter
+      void println(@GuardedBy CustomPrintWriter this)
+      cannot override method in @GuardedBy PrintWriter
+      void println(@GuardSatisfied PrintWriter this)
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java</fileName>
+    <specifier>override.receiver</specifier>
+    <message>Incompatible receiver type</message>
+    <lineContent>public void write(String line, int offset, int length) {</lineContent>
     <details>
-      found   : @GuardSatisfied BitSet
-      required: @GuardedBy BitSet
-      Consequence: method in @GuardedBy BitSet
-      void or(@GuardSatisfied BitSet this, @GuardedBy BitSet p0)
-      is not a valid method reference for method in @GuardedBy BiConsumer&lt;@GuardedBy BitSet, @GuardedBy BitSet&gt;
-      void accept(@GuardedBy BiConsumer&lt;@GuardedBy BitSet, @GuardedBy BitSet&gt; this, @GuardedBy BitSet p0, @GuardedBy BitSet p1)
+      found   : @GuardedBy CustomPrintWriter
+      required: @GuardSatisfied PrintWriter
+      Consequence: method in @GuardedBy CustomPrintWriter
+      void write(@GuardedBy CustomPrintWriter this, @GuardedBy String p0, @GuardedBy int p1, @GuardedBy int p2)
+      cannot override method in @GuardedBy PrintWriter
+      void write(@GuardSatisfied PrintWriter this, @GuardedBy String p0, @GuardedBy int p1, @GuardedBy int p2)
     </details>
   </checkerFrameworkError>
 
@@ -1188,14 +1324,14 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
     <specifier>methodref.receiver</specifier>
     <message>Incompatible receiver type</message>
-    <lineContent>.collect(BitSet::new, BitSet::set, BitSet::or);</lineContent>
+    <lineContent>.collect(Collectors.toUnmodifiableMap(Map.Entry::getValue, Map.Entry::getKey));</lineContent>
     <details>
-      found   : @GuardSatisfied BitSet
-      required: @GuardedBy BitSet
-      Consequence: method in @GuardedBy BitSet
-      void or(@GuardSatisfied BitSet this, @GuardedBy BitSet p0)
-      is not a valid method reference for method in @GuardedBy BiConsumer&lt;@GuardedBy BitSet, @GuardedBy BitSet&gt;
-      void accept(@GuardedBy BiConsumer&lt;@GuardedBy BitSet, @GuardedBy BitSet&gt; this, @GuardedBy BitSet p0, @GuardedBy BitSet p1)
+      found   : @GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;
+      required: @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;
+      Consequence: method in @GuardedBy Entry&lt;K extends @GuardedBy Object, V extends @GuardedBy Object&gt;
+      @GuardedBy Integer getValue(@GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy Integer&gt; this)
+      is not a valid method reference for method in @GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;, @GuardedBy Integer&gt;
+      @GuardedBy Integer apply(@GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;, @GuardedBy Integer&gt; this, @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt; p0)
     </details>
   </checkerFrameworkError>
 
@@ -1203,29 +1339,44 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
     <specifier>methodref.receiver</specifier>
     <message>Incompatible receiver type</message>
+    <lineContent>.collect(Collectors.toUnmodifiableMap(Map.Entry::getValue, Map.Entry::getKey));</lineContent>
+    <details>
+      found   : @GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;
+      required: @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;
+      Consequence: method in @GuardedBy Entry&lt;K extends @GuardedBy Object, V extends @GuardedBy Object&gt;
+      @GuardedBy String getKey(@GuardSatisfied Entry&lt;@GuardedBy String, @GuardedBy Integer&gt; this)
+      is not a valid method reference for method in @GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;, @GuardedBy String&gt;
+      @GuardedBy String apply(@GuardedBy Function&lt;@GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt;, @GuardedBy String&gt; this, @GuardedBy Entry&lt;@GuardedBy String, @GuardedBy Integer&gt; p0)
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for IntStream.collect</message>
     <lineContent>.collect(BitSet::new, BitSet::set, BitSet::or);</lineContent>
     <details>
-      found   : @GuardSatisfied BitSet
-      required: @GuardedBy BitSet
-      Consequence: method in @GuardedBy BitSet
-      void set(@GuardSatisfied BitSet this, @GuardedBy int p0)
-      is not a valid method reference for method in @GuardedBy ObjIntConsumer&lt;@GuardedBy BitSet&gt;
-      void accept(@GuardedBy ObjIntConsumer&lt;@GuardedBy BitSet&gt; this, @GuardedBy BitSet p0, @GuardedBy int p1)
+      unsatisfiable constraint: @GuardedBy BitSet &lt;: @GuardSatisfied BitSet
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
-    <specifier>methodref.receiver</specifier>
-    <message>Incompatible receiver type</message>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for IntStream.collect</message>
     <lineContent>.collect(BitSet::new, BitSet::set, BitSet::or);</lineContent>
     <details>
-      found   : @GuardSatisfied BitSet
-      required: @GuardedBy BitSet
-      Consequence: method in @GuardedBy BitSet
-      void set(@GuardSatisfied BitSet this, @GuardedBy int p0)
-      is not a valid method reference for method in @GuardedBy ObjIntConsumer&lt;@GuardedBy BitSet&gt;
-      void accept(@GuardedBy ObjIntConsumer&lt;@GuardedBy BitSet&gt; this, @GuardedBy BitSet p0, @GuardedBy int p1)
+      unsatisfiable constraint: @GuardedBy BitSet &lt;: @GuardSatisfied BitSet
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.collect</message>
+    <lineContent>.collect(Collectors.toUnmodifiableMap(</lineContent>
+    <details>
+      unsatisfiable constraint: @GuardedBy Field &lt;: @GuardSatisfied Field
     </details>
   </checkerFrameworkError>
 </suppressedErrors>
diff --git a/config/checker-framework-suppressions/checker-methods-resource-fenum-suppressions.xml b/config/checker-framework-suppressions/checker-methods-resource-fenum-suppressions.xml
index 72a758cbf19..ada00f50579 100644
--- a/config/checker-framework-suppressions/checker-methods-resource-fenum-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-methods-resource-fenum-suppressions.xml
@@ -3,22 +3,22 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Main.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on out or any of its aliases.</message>
-    <lineContent>final OutputStream out = getOutputStream(outputLocation);</lineContent>
+    <message>@MustCall method close may not have been invoked on getOutputStream(options.outputPath) or any of its aliases.</message>
+    <lineContent>listener = new XpathFileGeneratorAuditListener(getOutputStream(options.outputPath),</lineContent>
     <details>
       The type of object is: java.io.OutputStream.
-      Reason for going out of scope: possible exceptional exit due to format.createListener(out, closeOutputStreamOption) with exception type java.io.IOException
+      Reason for going out of scope: regular method exit
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Main.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>listener = new XpathFileGeneratorAuditListener(getOutputStream(options.outputPath),</lineContent>
+    <message>@MustCall method close may not have been invoked on out or any of its aliases.</message>
+    <lineContent>final OutputStream out = getOutputStream(outputLocation);</lineContent>
     <details>
       The type of object is: java.io.OutputStream.
-      Reason for going out of scope: regular method exit
+      Reason for going out of scope: possible exceptional exit due to format.createListener(out, closeOutputStreamOption) with exception type java.io.IOException
     </details>
   </checkerFrameworkError>
 
@@ -37,7 +37,7 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
     <specifier>required.method.not.called</specifier>
     <message>@MustCall method close may not have been invoked on dtdIs or any of its aliases.</message>
-    <lineContent>final InputStream dtdIs =</lineContent>
+    <lineContent>final InputStream dtdIs = loader.getResourceAsStream(dtdResourceName);</lineContent>
     <details>
       The type of object is: java.io.InputStream.
       Reason for going out of scope: regular method exit
@@ -47,19 +47,19 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on debug or any of its aliases.</message>
-    <lineContent>final OutputStream debug = new LogOutputStream(this, Project.MSG_DEBUG);</lineContent>
+    <message>@MustCall method close may not have been invoked on Files.newOutputStream(toFile.toPath()) or any of its aliases.</message>
+    <lineContent>sarifLogger = new SarifLogger(Files.newOutputStream(toFile.toPath()),</lineContent>
     <details>
       The type of object is: java.io.OutputStream.
-      Reason for going out of scope: regular method exit
+      Reason for going out of scope: possible exceptional exit due to new SarifLogger(Files.newOutputStream(toFile.toPath()), OutputStreamOptions.CLOSE) with exception type java.io.IOException
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on err or any of its aliases.</message>
-    <lineContent>final OutputStream err = new LogOutputStream(this, Project.MSG_ERR);</lineContent>
+    <message>@MustCall method close may not have been invoked on Files.newOutputStream(toFile.toPath()) or any of its aliases.</message>
+    <lineContent>xmlLogger = new XMLLogger(Files.newOutputStream(toFile.toPath()),</lineContent>
     <details>
       The type of object is: java.io.OutputStream.
       Reason for going out of scope: regular method exit
@@ -69,8 +69,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on infoStream or any of its aliases.</message>
-    <lineContent>final OutputStream infoStream = Files.newOutputStream(toFile.toPath());</lineContent>
+    <message>@MustCall method close may not have been invoked on debug or any of its aliases.</message>
+    <lineContent>final OutputStream debug = new LogOutputStream(this, Project.MSG_DEBUG);</lineContent>
     <details>
       The type of object is: java.io.OutputStream.
       Reason for going out of scope: regular method exit
@@ -80,19 +80,19 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>sarifLogger = new SarifLogger(Files.newOutputStream(toFile.toPath()),</lineContent>
+    <message>@MustCall method close may not have been invoked on err or any of its aliases.</message>
+    <lineContent>final OutputStream err = new LogOutputStream(this, Project.MSG_ERR);</lineContent>
     <details>
       The type of object is: java.io.OutputStream.
-      Reason for going out of scope: possible exceptional exit due to new SarifLogger(Files.newOutputStream(toFile.toPath()), OutputStreamOptions.CLOSE) with exception type java.io.IOException
+      Reason for going out of scope: regular method exit
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>xmlLogger = new XMLLogger(Files.newOutputStream(toFile.toPath()),</lineContent>
+    <message>@MustCall method close may not have been invoked on infoStream or any of its aliases.</message>
+    <lineContent>final OutputStream infoStream = Files.newOutputStream(toFile.toPath());</lineContent>
     <details>
       The type of object is: java.io.OutputStream.
       Reason for going out of scope: regular method exit
@@ -102,19 +102,19 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>sarifLogger = new SarifLogger(new LogOutputStream(task, Project.MSG_INFO),</lineContent>
+    <message>@MustCall method close may not have been invoked on new LogOutputStream(task, Project.MSG_DEBUG) or any of its aliases.</message>
+    <lineContent>new LogOutputStream(task, Project.MSG_DEBUG),</lineContent>
     <details>
       The type of object is: org.apache.tools.ant.taskdefs.LogOutputStream.
-      Reason for going out of scope: possible exceptional exit due to new SarifLogger(new LogOutputStream(task, Project.MSG_INFO), OutputStreamOptions.CLOSE) with exception type java.io.IOException
+      Reason for going out of scope: regular method exit
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>new LogOutputStream(task, Project.MSG_DEBUG),</lineContent>
+    <message>@MustCall method close may not have been invoked on new LogOutputStream(task, Project.MSG_ERR) or any of its aliases.</message>
+    <lineContent>new LogOutputStream(task, Project.MSG_ERR),</lineContent>
     <details>
       The type of object is: org.apache.tools.ant.taskdefs.LogOutputStream.
       Reason for going out of scope: regular method exit
@@ -124,18 +124,18 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>new LogOutputStream(task, Project.MSG_ERR),</lineContent>
+    <message>@MustCall method close may not have been invoked on new LogOutputStream(task, Project.MSG_INFO) or any of its aliases.</message>
+    <lineContent>sarifLogger = new SarifLogger(new LogOutputStream(task, Project.MSG_INFO),</lineContent>
     <details>
       The type of object is: org.apache.tools.ant.taskdefs.LogOutputStream.
-      Reason for going out of scope: regular method exit
+      Reason for going out of scope: possible exceptional exit due to new SarifLogger(new LogOutputStream(task, Project.MSG_INFO), OutputStreamOptions.CLOSE) with exception type java.io.IOException
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on new LogOutputStream(task, Project.MSG_INFO) or any of its aliases.</message>
     <lineContent>xmlLogger = new XMLLogger(new LogOutputStream(task, Project.MSG_INFO),</lineContent>
     <details>
       The type of object is: org.apache.tools.ant.taskdefs.LogOutputStream.
@@ -154,21 +154,10 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java</fileName>
-    <specifier>return</specifier>
-    <message>incompatible types in return.</message>
-    <lineContent>return resultHandler;</lineContent>
-    <details>
-      type of expression: @MustCallUnknown AbstractExpressionHandler
-      method return type: @MustCall AbstractExpressionHandler
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter horizontalAlignment of JLabel.</message>
+    <message>incompatible argument for parameter horizontalAlignment of JLabel constructor.</message>
     <lineContent>final JLabel modesLabel = new JLabel(&quot;Modes:&quot;, SwingConstants.RIGHT);</lineContent>
     <details>
       found   : @SwingHorizontalOrientation int
@@ -179,14 +168,70 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on XmlMetaReader.class.getResourceAsStream(&quot;/&quot; + fileName) or any of its aliases.</message>
     <lineContent>moduleDetails = read(XmlMetaReader.class.getResourceAsStream(&quot;/&quot; + fileName),</lineContent>
     <details>
       The type of object is: java.io.InputStream.
+      Reason for going out of scope: possible exceptional exit due to throw new IllegalStateException(&quot;Problem to read all modules including third party if any. Problem detected at file: &quot; + fileName, ex); with exception type java.lang.IllegalStateException
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>methodref.param</specifier>
+    <message>Incompatible parameter type for obj</message>
+    <lineContent>.mapToInt(int.class::cast);</lineContent>
+    <details>
+      found   : @FenumUnqualified Object
+      required: capture extends @FenumTop Object
+      Consequence: method in @FenumUnqualified Class&lt;@FenumUnqualified Integer&gt;
+      @FenumUnqualified Integer cast(@FenumUnqualified Class&lt;@FenumUnqualified Integer&gt; this, @FenumUnqualified Object p0)
+      is not a valid method reference for method in @FenumUnqualified ToIntFunction&lt;capture extends @FenumTop Object&gt;
+      @FenumUnqualified int applyAsInt(@FenumUnqualified ToIntFunction&lt;capture extends @FenumTop Object&gt; this, capture extends @FenumTop Object p0)
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.map</message>
+    <lineContent>.map(Pattern.class::cast)</lineContent>
+    <details>
+      unsatisfiable constraint: capture extends @FenumTop Object &lt;: @FenumUnqualified Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.map</message>
+    <lineContent>.map(String.class::cast)</lineContent>
+    <details>
+      unsatisfiable constraint: capture extends @FenumTop Object &lt;: @FenumUnqualified Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java</fileName>
+    <specifier>required.method.not.called</specifier>
+    <message>@MustCall method close may not have been invoked on new CustomPrintWriter(writer) or any of its aliases.</message>
+    <lineContent>super(new CustomPrintWriter(writer));</lineContent>
+    <details>
+      The type of object is: com.puppycrawl.tools.checkstyle.site.XdocsTemplateSink.CustomPrintWriter.
       Reason for going out of scope: regular method exit
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.map</message>
+    <lineContent>.map(elementType::cast)</lineContent>
+    <details>
+      unsatisfiable constraint: S extends @FenumTop Object &lt;: @FenumUnqualified Object
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.java</fileName>
     <specifier>required.method.not.called</specifier>
@@ -201,7 +246,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on SingleNodeIterator.makeIterator(start) or any of its aliases.</message>
     <lineContent>descendantEnum = SingleNodeIterator.makeIterator(start);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
@@ -212,7 +257,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on queue.poll().iterateAxis(AxisInfo.CHILD) or any of its aliases.</message>
     <lineContent>descendantEnum = queue.poll().iterateAxis(AxisInfo.CHILD);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
@@ -223,7 +268,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on start.iterateAxis(AxisInfo.CHILD) or any of its aliases.</message>
     <lineContent>descendantEnum = start.iterateAxis(AxisInfo.CHILD);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
@@ -234,8 +279,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>ancestorEnum = start.iterateAxis(AxisInfo.ANCESTOR);</lineContent>
+    <message>@MustCall method close may not have been invoked on parent.iterateAxis(AxisInfo.FOLLOWING_SIBLING) or any of its aliases.</message>
+    <lineContent>siblingEnum = parent.iterateAxis(AxisInfo.FOLLOWING_SIBLING);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
       Reason for going out of scope: regular method exit
@@ -245,7 +290,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on result.iterateAxis(AxisInfo.DESCENDANT) or any of its aliases.</message>
     <lineContent>descendantEnum = result.iterateAxis(AxisInfo.DESCENDANT);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
@@ -256,8 +301,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>siblingEnum = parent.iterateAxis(AxisInfo.FOLLOWING_SIBLING);</lineContent>
+    <message>@MustCall method close may not have been invoked on start.iterateAxis(AxisInfo.ANCESTOR) or any of its aliases.</message>
+    <lineContent>ancestorEnum = start.iterateAxis(AxisInfo.ANCESTOR);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
       Reason for going out of scope: regular method exit
@@ -267,7 +312,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on start.iterateAxis(AxisInfo.FOLLOWING_SIBLING) or any of its aliases.</message>
     <lineContent>siblingEnum = start.iterateAxis(AxisInfo.FOLLOWING_SIBLING);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
@@ -278,7 +323,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on new ReverseDescendantIterator(result) or any of its aliases.</message>
     <lineContent>descendantEnum = new ReverseDescendantIterator(result);</lineContent>
     <details>
       The type of object is: com.puppycrawl.tools.checkstyle.xpath.iterators.ReverseDescendantIterator.
@@ -289,8 +334,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>ancestorEnum = start.iterateAxis(AxisInfo.ANCESTOR);</lineContent>
+    <message>@MustCall method close may not have been invoked on result.iterateAxis(AxisInfo.PRECEDING_SIBLING) or any of its aliases.</message>
+    <lineContent>previousSiblingEnum = result.iterateAxis(AxisInfo.PRECEDING_SIBLING);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
       Reason for going out of scope: regular method exit
@@ -300,8 +345,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
-    <lineContent>previousSiblingEnum = result.iterateAxis(AxisInfo.PRECEDING_SIBLING);</lineContent>
+    <message>@MustCall method close may not have been invoked on start.iterateAxis(AxisInfo.ANCESTOR) or any of its aliases.</message>
+    <lineContent>ancestorEnum = start.iterateAxis(AxisInfo.ANCESTOR);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
       Reason for going out of scope: regular method exit
@@ -311,7 +356,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on start.iterateAxis(AxisInfo.PRECEDING_SIBLING) or any of its aliases.</message>
     <lineContent>previousSiblingEnum = start.iterateAxis(AxisInfo.PRECEDING_SIBLING);</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
@@ -322,7 +367,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on queue.poll().iterateAxis(AxisInfo.CHILD) or any of its aliases.</message>
     <lineContent>pushToStack(queue.poll().iterateAxis(AxisInfo.CHILD));</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
@@ -333,7 +378,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.java</fileName>
     <specifier>required.method.not.called</specifier>
-    <message>@MustCall method close may not have been invoked on temp-var or any of its aliases.</message>
+    <message>@MustCall method close may not have been invoked on start.iterateAxis(AxisInfo.CHILD) or any of its aliases.</message>
     <lineContent>pushToStack(start.iterateAxis(AxisInfo.CHILD));</lineContent>
     <details>
       The type of object is: net.sf.saxon.tree.iter.AxisIterator.
diff --git a/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml b/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml
index d0fe1c5f16e..badd07a30ab 100644
--- a/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml
@@ -7,17 +7,6 @@
     <lineContent>private Configuration configuration;</lineContent>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.java</fileName>
-    <specifier>return</specifier>
-    <message>incompatible types in return.</message>
-    <lineContent>return result;</lineContent>
-    <details>
-      type of expression: @Initialized @Nullable URI
-      method return type: @Initialized @NonNull Object
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.java</fileName>
     <specifier>toarray.nullable.elements.not.newarray</specifier>
@@ -35,7 +24,18 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter args of Violation.</message>
+    <message>incompatible argument for parameter args of Checker.getLocalizedMessage.</message>
+    <lineContent>getLocalizedMessage(&quot;Checker.setupChildModule&quot;, name, ex.getMessage()), ex);</lineContent>
+    <details>
+      found   : @Initialized @Nullable String
+      required: @Initialized @NonNull Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter args of Violation constructor.</message>
     <lineContent>new String[] {ioe.getMessage()}, null, getClass(), null));</lineContent>
     <details>
       found   : @Initialized @Nullable String @Initialized @NonNull []
@@ -46,7 +46,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>new String[] {ioe.getMessage()}, null, getClass(), null));</lineContent>
     <details>
       found   : null (NullType)
@@ -57,7 +57,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>null, getClass(), null));</lineContent>
     <details>
       found   : null (NullType)
@@ -68,7 +68,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter moduleId of Violation.</message>
+    <message>incompatible argument for parameter moduleId of Violation constructor.</message>
     <lineContent>new String[] {ioe.getMessage()}, null, getClass(), null));</lineContent>
     <details>
       found   : null (NullType)
@@ -79,7 +79,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter moduleId of Violation.</message>
+    <message>incompatible argument for parameter moduleId of Violation constructor.</message>
     <lineContent>null, getClass(), null));</lineContent>
     <details>
       found   : null (NullType)
@@ -87,21 +87,10 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>fileExtensions = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull String @Initialized @NonNull []
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Checker.java</fileName>
     <specifier>initialization.fields.uninitialized</specifier>
-    <message>the constructor does not initialize fields: basedir, moduleFactory, moduleClassLoader, childContext, cacheFile</message>
+    <message>the constructor does not initialize fields: basedir, moduleFactory, moduleClassLoader, childContext, fileExtensions, cacheFile</message>
     <lineContent>public Checker() {</lineContent>
   </checkerFrameworkError>
 
@@ -119,7 +108,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of add.</message>
+    <message>incompatible argument for parameter arg0 of Collection.add.</message>
     <lineContent>fragments.add(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -323,7 +312,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter child of addChild.</message>
+    <message>incompatible argument for parameter child of DetailAstImpl.addChild.</message>
     <lineContent>bop.addChild(descendantList.poll());</lineContent>
     <details>
       found   : @Initialized @Nullable DetailAstImpl
@@ -348,42 +337,42 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>.orElseGet(() -&gt; createImaginary(TokenTypes.ELIST));</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>.orElseGet(() -&gt; createImaginary(TokenTypes.ELIST));</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>.orElseGet(() -&gt; createImaginary(TokenTypes.ELIST));</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>.orElseGet(() -&gt; createImaginary(TokenTypes.ELIST));</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>.orElseGet(() -&gt; createImaginary(TokenTypes.ELIST));</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>.orElseGet(() -&gt; createImaginary(TokenTypes.PARAMETERS));</lineContent>
   </checkerFrameworkError>
 
@@ -451,7 +440,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of createJavadocNode.</message>
+    <message>incompatible argument for parameter parent of JavadocDetailNodeParser.createJavadocNode.</message>
     <lineContent>final JavadocNodeImpl rootJavadocNode = createJavadocNode(parseTreeNode, null, -1);</lineContent>
     <details>
       found   : null (NullType)
@@ -566,7 +555,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter loader of getBundle.</message>
+    <message>incompatible argument for parameter loader of ResourceBundle.getBundle.</message>
     <lineContent>return ResourceBundle.getBundle(bundle, sLocale, sourceClass.getClassLoader(),</lineContent>
     <details>
       found   : @Initialized @Nullable ClassLoader
@@ -599,7 +588,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Main.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter moduleClassLoader of getRootModule.</message>
+    <message>incompatible argument for parameter moduleClassLoader of Main.getRootModule.</message>
     <lineContent>final RootModule rootModule = getRootModule(config.getName(), moduleClassLoader);</lineContent>
     <details>
       found   : @Initialized @Nullable ClassLoader
@@ -705,7 +694,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of contains.</message>
+    <message>incompatible argument for parameter arg0 of Set.contains.</message>
     <lineContent>if (packageNames.contains(null)) {</lineContent>
     <details>
       found   : null (NullType)
@@ -716,7 +705,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter args of LocalizedMessage.</message>
+    <message>incompatible argument for parameter args of LocalizedMessage constructor.</message>
     <lineContent>UNABLE_TO_INSTANTIATE_EXCEPTION_MESSAGE, name, attemptedNames);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -724,6 +713,17 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter other of Optional.orElse.</message>
+    <lineContent>.orElse(fullName);</lineContent>
+    <details>
+      found   : String
+      required: @KeyFor(&quot;com.puppycrawl.tools.checkstyle.PackageObjectFactory.NAME_TO_FULL_MODULE_NAME&quot;) String
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java</fileName>
     <specifier>initialization.fields.uninitialized</specifier>
@@ -740,16 +740,12 @@
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java</fileName>
-    <specifier>methodref.return</specifier>
-    <message>Incompatible return type</message>
-    <lineContent>Class::getCanonicalName,</lineContent>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return instance;</lineContent>
     <details>
-      found   : @Initialized @Nullable String
-      required: @Initialized @NonNull String
-      Consequence: method in @Initialized @NonNull Class&lt;/*INFERENCE FAILED for:*/ ? extends @Initialized @NonNull Object&gt;
-      @Initialized @Nullable String getCanonicalName(@Initialized @NonNull Class&lt;/*INFERENCE FAILED for:*/ ? extends @Initialized @NonNull Object&gt; this)
-      is not a valid method reference for method in @Initialized @NonNull Function&lt;/*INFERENCE FAILED for:*/ ? extends @Initialized @Nullable Object, @Initialized @NonNull String&gt;
-      @Initialized @NonNull String apply(@Initialized @NonNull Function&lt;/*INFERENCE FAILED for:*/ ? extends @Initialized @Nullable Object, @Initialized @NonNull String&gt; this, /*INFERENCE FAILED for:*/ ? extends @Initialized @Nullable Object p0)
+      type of expression: @Initialized @Nullable Object
+      method return type: @Initialized @NonNull Object
     </details>
   </checkerFrameworkError>
 
@@ -788,12 +784,11 @@
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java</fileName>
-    <specifier>return</specifier>
-    <message>incompatible types in return.</message>
-    <lineContent>return instance;</lineContent>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.collect</message>
+    <lineContent>.collect(Collectors.groupingBy(Class::getSimpleName,</lineContent>
     <details>
-      type of expression: @Initialized @Nullable Object
-      method return type: @Initialized @NonNull Object
+      unsatisfiable constraint: @Initialized @Nullable String &lt;: @Initialized @NonNull String
     </details>
   </checkerFrameworkError>
 
@@ -801,14 +796,14 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java</fileName>
     <specifier>methodref.return</specifier>
     <message>Incompatible return type</message>
-    <lineContent>.collect(Collectors.toMap(Function.identity(), properties::getProperty));</lineContent>
+    <lineContent>Collectors.toUnmodifiableMap(Function.identity(), properties::getProperty));</lineContent>
     <details>
       found   : @Initialized @Nullable String
       required: @Initialized @NonNull String
       Consequence: method in @Initialized @NonNull Properties
       @Initialized @Nullable String getProperty(@Initialized @NonNull Properties this, @Initialized @NonNull String p0)
-      is not a valid method reference for method in @Initialized @NonNull Function&lt;/*INFERENCE FAILED for:*/ ? extends @Initialized @Nullable Object, @Initialized @NonNull String&gt;
-      @Initialized @NonNull String apply(@Initialized @NonNull Function&lt;/*INFERENCE FAILED for:*/ ? extends @Initialized @Nullable Object, @Initialized @NonNull String&gt; this, /*INFERENCE FAILED for:*/ ? extends @Initialized @Nullable Object p0)
+      is not a valid method reference for method in @Initialized @NonNull Function&lt;@Initialized @NonNull String, @Initialized @NonNull String&gt;
+      @Initialized @NonNull String apply(@Initialized @NonNull Function&lt;@Initialized @NonNull String, @Initialized @NonNull String&gt; this, @Initialized @NonNull String p0)
     </details>
   </checkerFrameworkError>
 
@@ -858,7 +853,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter s of parseInt.</message>
+    <message>incompatible argument for parameter s of Integer.parseInt.</message>
     <lineContent>final int columnNumber = Integer.parseInt(matcher.group(2));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -869,7 +864,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter s of parseInt.</message>
+    <message>incompatible argument for parameter s of Integer.parseInt.</message>
     <lineContent>final int lineNumber = Integer.parseInt(matcher.group(1));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -909,7 +904,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter messages of writeFileMessages.</message>
+    <message>incompatible argument for parameter messages of XMLLogger.writeFileMessages.</message>
     <lineContent>writeFileMessages(fileName, messages);</lineContent>
     <details>
       found   : @Initialized @Nullable FileMessages
@@ -927,7 +922,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter byteStream of InputSource.</message>
+    <message>incompatible argument for parameter byteStream of InputSource constructor.</message>
     <lineContent>inputSource = new InputSource(dtdIs);</lineContent>
     <details>
       found   : @Initialized @Nullable InputStream
@@ -938,7 +933,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter handler of createXmlReader.</message>
+    <message>incompatible argument for parameter handler of XmlLoader.createXmlReader.</message>
     <lineContent>parser = createXmlReader(this);</lineContent>
     <details>
       found   : @UnderInitialization(org.xml.sax.helpers.DefaultHandler.class) @NonNull XmlLoader
@@ -950,24 +945,35 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
     <specifier>dereference.of.nullable</specifier>
     <message>dereference of possibly-null reference loader</message>
-    <lineContent>loader.getResourceAsStream(dtdResourceName);</lineContent>
+    <lineContent>final InputStream dtdIs = loader.getResourceAsStream(dtdResourceName);</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
     <specifier>override.param</specifier>
     <message>Incompatible parameter type for publicId.</message>
-    <lineContent>public InputSource resolveEntity(String publicId, String systemId)</lineContent>
+    <lineContent>public InputSource resolveEntity(String publicId, String systemId) {</lineContent>
     <details>
       found   : @Initialized @NonNull String
       required: @Initialized @Nullable String
       Consequence: method in @Initialized @NonNull XmlLoader
-      @Initialized @NonNull InputSource resolveEntity(@Initialized @NonNull XmlLoader this, @Initialized @NonNull String p0, @Initialized @NonNull String p1) throws @Initialized @NonNull SAXException@Initialized @NonNull IOException
+      @Initialized @NonNull InputSource resolveEntity(@Initialized @NonNull XmlLoader this, @Initialized @NonNull String p0, @Initialized @NonNull String p1)
       cannot override method in @Initialized @NonNull EntityResolver
       @Initialized @Nullable InputSource resolveEntity(@Initialized @NonNull EntityResolver this, @Initialized @Nullable String p0, @Initialized @NonNull String p1) throws @Initialized @NonNull SAXException@Initialized @NonNull IOException
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java</fileName>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return inputSource;</lineContent>
+    <details>
+      type of expression: @Initialized @Nullable InputSource
+      method return type: @Initialized @NonNull InputSource
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.java</fileName>
     <specifier>return</specifier>
@@ -982,7 +988,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter checkstyleVersion of realExecute.</message>
+    <message>incompatible argument for parameter checkstyleVersion of CheckstyleAntTask.realExecute.</message>
     <lineContent>realExecute(version);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -993,7 +999,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter moduleClassLoader of PackageObjectFactory.</message>
+    <message>incompatible argument for parameter moduleClassLoader of PackageObjectFactory constructor.</message>
     <lineContent>Checker.class.getPackage().getName() + &quot;.&quot;, moduleClassLoader);</lineContent>
     <details>
       found   : @Initialized @Nullable ClassLoader
@@ -1004,7 +1010,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter moduleClassLoader of setModuleClassLoader.</message>
+    <message>incompatible argument for parameter moduleClassLoader of RootModule.setModuleClassLoader.</message>
     <lineContent>rootModule.setModuleClassLoader(moduleClassLoader);</lineContent>
     <details>
       found   : @Initialized @Nullable ClassLoader
@@ -1085,7 +1091,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>getCustomMessages().get(key)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1096,7 +1102,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>getCustomMessages().get(key)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1107,7 +1113,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>getCustomMessages().get(key)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1136,7 +1142,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>getCustomMessages().get(key)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1147,7 +1153,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>getCustomMessages().get(key)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1197,7 +1203,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/AuditEvent.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter fileName of AuditEvent.</message>
+    <message>incompatible argument for parameter fileName of AuditEvent constructor.</message>
     <lineContent>this(source, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -1208,7 +1214,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/api/AuditEvent.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter violation of AuditEvent.</message>
+    <message>incompatible argument for parameter violation of AuditEvent constructor.</message>
     <lineContent>this(src, fileName, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -1374,7 +1380,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter args of log.</message>
+    <message>incompatible argument for parameter args of AbstractFileSetCheck.log.</message>
     <lineContent>log(1, MSG_IO_EXCEPTION_KEY, file.getPath(), ex.getLocalizedMessage());</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1476,7 +1482,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter args of Violation.</message>
+    <message>incompatible argument for parameter args of Violation constructor.</message>
     <lineContent>args,</lineContent>
     <details>
       found   : @Initialized @NonNull String @Initialized @Nullable []
@@ -1487,7 +1493,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter customMessage of Violation.</message>
+    <message>incompatible argument for parameter customMessage of Violation constructor.</message>
     <lineContent>getClass(), null);</lineContent>
     <details>
       found   : null (NullType)
@@ -1498,7 +1504,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter languageCode of getMissingFileName.</message>
+    <message>incompatible argument for parameter languageCode of TranslationCheck.getMissingFileName.</message>
     <lineContent>getMissingFileName(bundle, null)</lineContent>
     <details>
       found   : null (NullType)
@@ -1531,7 +1537,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter ast of createFullIdent.</message>
+    <message>incompatible argument for parameter ast of FullIdent.createFullIdent.</message>
     <lineContent>packageName = FullIdent.createFullIdent(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -1556,7 +1562,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter args of log.</message>
+    <message>incompatible argument for parameter args of AbstractFileSetCheck.log.</message>
     <lineContent>ex.getLocalizedMessage());</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1578,25 +1584,32 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>.orElse(modifiers);</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java</fileName>
-    <specifier>return</specifier>
-    <message>incompatible types in return.</message>
-    <lineContent>return brace;</lineContent>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElse(Boolean.TRUE);</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter lcurly of Details constructor.</message>
+    <lineContent>return new Details(lcurly.orElse(null), rcurly, nextToken.orElse(null), true);</lineContent>
     <details>
-      type of expression: @Initialized @Nullable DetailAST
-      method return type: @Initialized @NonNull DetailAST
+      found   : @Initialized @Nullable DetailAST
+      required: @Initialized @NonNull DetailAST
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter nextToken of Details.</message>
+    <message>incompatible argument for parameter nextToken of Details constructor.</message>
     <lineContent>return new Details(lcurly, rcurly, nextToken, true);</lineContent>
     <details>
       found   : @Initialized @Nullable DetailAST
@@ -1607,7 +1620,18 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter rcurly of Details.</message>
+    <message>incompatible argument for parameter nextToken of Details constructor.</message>
+    <lineContent>return new Details(lcurly.orElse(null), rcurly, nextToken.orElse(null), true);</lineContent>
+    <details>
+      found   : @Initialized @Nullable DetailAST
+      required: @Initialized @NonNull DetailAST
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter rcurly of Details constructor.</message>
     <lineContent>return new Details(lcurly, rcurly, getNextToken(ast), true);</lineContent>
     <details>
       found   : @Initialized @Nullable DetailAST
@@ -1618,7 +1642,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter rcurly of Details.</message>
+    <message>incompatible argument for parameter rcurly of Details constructor.</message>
     <lineContent>return new Details(lcurly, rcurly, nextToken, false);</lineContent>
     <details>
       found   : @Initialized @Nullable DetailAST
@@ -1629,7 +1653,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter rcurly of Details.</message>
+    <message>incompatible argument for parameter rcurly of Details constructor.</message>
     <lineContent>return new Details(lcurly, rcurly, nextToken, shouldCheckLastRcurly);</lineContent>
     <details>
       found   : @Initialized @Nullable DetailAST
@@ -1640,7 +1664,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter rcurly of Details.</message>
+    <message>incompatible argument for parameter rcurly of Details constructor.</message>
     <lineContent>return new Details(lcurly, rcurly, nextToken, true);</lineContent>
     <details>
       found   : @Initialized @Nullable DetailAST
@@ -1648,6 +1672,17 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter rcurly of Details constructor.</message>
+    <lineContent>return new Details(lcurly.orElse(null), rcurly, nextToken.orElse(null), true);</lineContent>
+    <details>
+      found   : @Initialized @Nullable DetailAST
+      required: @Initialized @NonNull DetailAST
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java</fileName>
     <specifier>return</specifier>
@@ -1662,7 +1697,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter state of processModifiersState.</message>
+    <message>incompatible argument for parameter state of DeclarationOrderCheck.processModifiersState.</message>
     <lineContent>final boolean isStateValid = processModifiersState(ast, state);</lineContent>
     <details>
       found   : @Initialized @Nullable ScopeState
@@ -1701,7 +1736,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of FieldFrame.</message>
+    <message>incompatible argument for parameter parent of FieldFrame constructor.</message>
     <lineContent>currentFrame = new FieldFrame(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -1746,25 +1781,17 @@
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter prevScopeUninitializedVariableData of updateAllUninitializedVariables.</message>
-    <lineContent>updateAllUninitializedVariables(prevScopeUninitializedVariableData);</lineContent>
-    <details>
-      found   : @Initialized @Nullable Deque&lt;@Initialized @NonNull DetailAST&gt;
-      required: @Initialized @NonNull Deque&lt;@Initialized @NonNull DetailAST&gt;
-    </details>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.isPresent();</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter prevScopeUninitializedVariableData of updateAllUninitializedVariables.</message>
-    <lineContent>updateAllUninitializedVariables(prevScopeUninitializedVariableData);</lineContent>
-    <details>
-      found   : @Initialized @Nullable Deque&lt;@Initialized @NonNull DetailAST&gt;
-      required: @Initialized @NonNull Deque&lt;@Initialized @NonNull DetailAST&gt;
-    </details>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElse(Boolean.FALSE);</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -1914,7 +1941,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter frameName of FieldFrame.</message>
+    <message>incompatible argument for parameter frameName of FieldFrame constructor.</message>
     <lineContent>final FieldFrame newFrame = new FieldFrame(frame, isStaticInnerType, frameName);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -1925,7 +1952,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter frameName of FieldFrame.</message>
+    <message>incompatible argument for parameter frameName of FieldFrame constructor.</message>
     <lineContent>frame = new FieldFrame(null, true, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -1936,7 +1963,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of FieldFrame.</message>
+    <message>incompatible argument for parameter parent of FieldFrame constructor.</message>
     <lineContent>frame = new FieldFrame(null, true, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -2087,7 +2114,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of push.</message>
+    <message>incompatible argument for parameter arg0 of Deque.push.</message>
     <lineContent>current.push(frames.get(ast));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2098,7 +2125,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of push.</message>
+    <message>incompatible argument for parameter arg0 of Deque.push.</message>
     <lineContent>current.push(frames.get(ast));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2109,7 +2136,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg1 of put.</message>
+    <message>incompatible argument for parameter arg1 of Map.put.</message>
     <lineContent>frames.put(ast, frameStack.poll());</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2120,7 +2147,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg1 of put.</message>
+    <message>incompatible argument for parameter arg1 of Map.put.</message>
     <lineContent>frames.put(ast, frameStack.poll());</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2131,7 +2158,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter frame of collectMethodDeclarations.</message>
+    <message>incompatible argument for parameter frame of RequireThisCheck.collectMethodDeclarations.</message>
     <lineContent>collectMethodDeclarations(frameStack, ast, frame);</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2142,7 +2169,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter frame of collectVariableDeclarations.</message>
+    <message>incompatible argument for parameter frame of RequireThisCheck.collectVariableDeclarations.</message>
     <lineContent>collectVariableDeclarations(ast, frame);</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2153,7 +2180,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter frame of findFrame.</message>
+    <message>incompatible argument for parameter frame of RequireThisCheck.findFrame.</message>
     <lineContent>frame = findFrame(frame, name, lookForMethod);</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2164,7 +2191,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter frame of findFrame.</message>
+    <message>incompatible argument for parameter frame of RequireThisCheck.findFrame.</message>
     <lineContent>return findFrame(current.peek(), name, lookForMethod);</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2175,7 +2202,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter ident of ClassFrame.</message>
+    <message>incompatible argument for parameter ident of ClassFrame constructor.</message>
     <lineContent>super(parent, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -2186,7 +2213,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of AnonymousClassFrame.</message>
+    <message>incompatible argument for parameter parent of AnonymousClassFrame constructor.</message>
     <lineContent>frameStack.addFirst(new AnonymousClassFrame(frame,</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2197,7 +2224,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of BlockFrame.</message>
+    <message>incompatible argument for parameter parent of BlockFrame constructor.</message>
     <lineContent>frameStack.addFirst(new BlockFrame(frame, ast));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2208,7 +2235,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of CatchFrame.</message>
+    <message>incompatible argument for parameter parent of CatchFrame constructor.</message>
     <lineContent>final AbstractFrame catchFrame = new CatchFrame(frame, ast);</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2219,7 +2246,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of ClassFrame.</message>
+    <message>incompatible argument for parameter parent of ClassFrame constructor.</message>
     <lineContent>frameStack.addFirst(new ClassFrame(frame, classFrameNameIdent));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2230,7 +2257,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of ConstructorFrame.</message>
+    <message>incompatible argument for parameter parent of ConstructorFrame constructor.</message>
     <lineContent>frameStack.addFirst(new ConstructorFrame(frame, ctorFrameNameIdent));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2241,7 +2268,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of ForFrame.</message>
+    <message>incompatible argument for parameter parent of ForFrame constructor.</message>
     <lineContent>final AbstractFrame forFrame = new ForFrame(frame, ast);</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2252,7 +2279,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of TryWithResourcesFrame.</message>
+    <message>incompatible argument for parameter parent of TryWithResourcesFrame constructor.</message>
     <lineContent>frameStack.addFirst(new TryWithResourcesFrame(frame, ast));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractFrame
@@ -2402,7 +2429,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg1 of put.</message>
+    <message>incompatible argument for parameter arg1 of Map.put.</message>
     <lineContent>anonInnerAstToTypeDeclDesc.put(literalNewAst, typeDeclarations.peek());</lineContent>
     <details>
       found   : @Initialized @Nullable TypeDeclDesc
@@ -2413,7 +2440,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter outerClassQualifiedName of getQualifiedTypeDeclarationName.</message>
+    <message>incompatible argument for parameter outerClassQualifiedName of CheckUtil.getQualifiedTypeDeclarationName.</message>
     <lineContent>.getQualifiedTypeDeclarationName(packageName, outerClassQualifiedName, className);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -2424,7 +2451,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter scope of VariableDesc.</message>
+    <message>incompatible argument for parameter scope of VariableDesc constructor.</message>
     <lineContent>this(name, null, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -2435,7 +2462,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter typeAst of VariableDesc.</message>
+    <message>incompatible argument for parameter typeAst of VariableDesc constructor.</message>
     <lineContent>this(name, null, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -2446,7 +2473,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter typeAst of VariableDesc.</message>
+    <message>incompatible argument for parameter typeAst of VariableDesc constructor.</message>
     <lineContent>this(name, null, scope);</lineContent>
     <details>
       found   : null (NullType)
@@ -2587,38 +2614,38 @@
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of SimpleEntry.</message>
-    <lineContent>return new SimpleEntry&lt;&gt;(variableUsageAst, dist);</lineContent>
-    <details>
-      found   : @Initialized @Nullable DetailAST
-      required: @Initialized @NonNull DetailAST
-    </details>
+    <specifier>not.interned</specifier>
+    <message>attempting to use a non-@Interned comparison operand</message>
+    <lineContent>if (curNode == parent) {</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of SimpleEntry.</message>
-    <lineContent>return new SimpleEntry&lt;&gt;(variableUsageAst, dist);</lineContent>
-    <details>
-      found   : @Initialized @Nullable DetailAST
-      required: @Initialized @NonNull DetailAST
-    </details>
+    <specifier>not.interned</specifier>
+    <message>attempting to use a non-@Interned comparison operand</message>
+    <lineContent>if (curNode == parent) {</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java</fileName>
-    <specifier>not.interned</specifier>
-    <message>attempting to use a non-@Interned comparison operand</message>
-    <lineContent>if (curNode == parent) {</lineContent>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return new SimpleEntry&lt;&gt;(variableUsageAst, dist);</lineContent>
+    <details>
+      type of expression: @Initialized @NonNull SimpleEntry&lt;@Initialized @Nullable DetailAST, @Initialized @NonNull Integer&gt;
+      method return type: @Initialized @NonNull Entry&lt;@Initialized @NonNull DetailAST, @Initialized @NonNull Integer&gt;
+    </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java</fileName>
-    <specifier>not.interned</specifier>
-    <message>attempting to use a non-@Interned comparison operand</message>
-    <lineContent>if (curNode == parent) {</lineContent>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return new SimpleEntry&lt;&gt;(variableUsageAst, dist);</lineContent>
+    <details>
+      type of expression: @Initialized @NonNull SimpleEntry&lt;@Initialized @Nullable DetailAST, @Initialized @NonNull Integer&gt;
+      method return type: @Initialized @NonNull Entry&lt;@Initialized @NonNull DetailAST, @Initialized @NonNull Integer&gt;
+    </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -2665,6 +2692,26 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for SimpleEntry constructor</message>
+    <lineContent>return new SimpleEntry&lt;&gt;(variableUsageAst, dist);</lineContent>
+    <details>
+      unsatisfiable constraint: @Initialized @Nullable DetailAST &lt;: @Initialized @NonNull DetailAST
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for SimpleEntry constructor</message>
+    <lineContent>return new SimpleEntry&lt;&gt;(variableUsageAst, dist);</lineContent>
+    <details>
+      unsatisfiable constraint: @Initialized @Nullable DetailAST &lt;: @Initialized @NonNull DetailAST
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java</fileName>
     <specifier>not.interned</specifier>
@@ -2696,7 +2743,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter outerClassQualifiedName of getQualifiedTypeDeclarationName.</message>
+    <message>incompatible argument for parameter outerClassQualifiedName of CheckUtil.getQualifiedTypeDeclarationName.</message>
     <lineContent>outerTypeDeclarationQualifiedName,</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -2760,7 +2807,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter typeDef of isPublic.</message>
+    <message>incompatible argument for parameter typeDef of OneTopLevelClassCheck.isPublic.</message>
     <lineContent>if (publicTypeFound &amp;&amp; !isPublic(firstType)) {</lineContent>
     <details>
       found   : @Initialized @Nullable DetailAST
@@ -2793,9 +2840,6 @@
     </details>
   </checkerFrameworkError>
 
-  <!-- This is not possible to fix because if we initialize this in constructor or in
-       field itself pitest will be failed. This is conflict with pitest but value of
-       pitest is above checker -->
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java</fileName>
     <specifier>initialization.field.uninitialized</specifier>
@@ -2813,7 +2857,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter previousImport of isAlphabeticalOrderBroken.</message>
+    <message>incompatible argument for parameter previousImport of CustomImportOrderCheck.isAlphabeticalOrderBroken.</message>
     <lineContent>if (isAlphabeticalOrderBroken(previousImportFromCurrentGroup, fullImportIdent)) {</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -2824,7 +2868,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter previousImport of validateExtraEmptyLine.</message>
+    <message>incompatible argument for parameter previousImport of CustomImportOrderCheck.validateExtraEmptyLine.</message>
     <lineContent>validateExtraEmptyLine(previousImportObjectFromCurrentGroup,</lineContent>
     <details>
       found   : @Initialized @Nullable ImportDetails
@@ -2835,7 +2879,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter previousImport of validateMissedEmptyLine.</message>
+    <message>incompatible argument for parameter previousImport of CustomImportOrderCheck.validateMissedEmptyLine.</message>
     <lineContent>validateMissedEmptyLine(previousImportObjectFromCurrentGroup,</lineContent>
     <details>
       found   : @Initialized @Nullable ImportDetails
@@ -2843,17 +2887,6 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>patternForExactMatch = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull Pattern
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.java</fileName>
     <specifier>return</specifier>
@@ -2932,7 +2965,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of FileImportControl.</message>
+    <message>incompatible argument for parameter parent of FileImportControl constructor.</message>
     <lineContent>final AbstractImportControl importControl = new FileImportControl(parentImportControl,</lineContent>
     <details>
       found   : @Initialized @Nullable PkgImportControl
@@ -2943,7 +2976,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of PkgImportControl.</message>
+    <message>incompatible argument for parameter parent of PkgImportControl constructor.</message>
     <lineContent>final AbstractImportControl importControl = new PkgImportControl(parentImportControl,</lineContent>
     <details>
       found   : @Initialized @Nullable PkgImportControl
@@ -2993,7 +3026,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of AbstractImportControl.</message>
+    <message>incompatible argument for parameter parent of AbstractImportControl constructor.</message>
     <lineContent>super(null, strategyOnMismatch);</lineContent>
     <details>
       found   : null (NullType)
@@ -3077,7 +3110,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of Frame.</message>
+    <message>incompatible argument for parameter parent of Frame constructor.</message>
     <lineContent>return new Frame(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -3088,7 +3121,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter type of topLevelType.</message>
+    <message>incompatible argument for parameter type of UnusedImportsCheck.topLevelType.</message>
     <lineContent>references.add(topLevelType(matcher.group(1)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -3254,11 +3287,11 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter constructor of invokeConstructor.</message>
+    <message>incompatible argument for parameter constructor of CommonUtil.invokeConstructor.</message>
     <lineContent>handlerCtor, indentCheck, ast, parent);</lineContent>
     <details>
       found   : @Initialized @Nullable Constructor&lt;capture extends @Initialized @Nullable Object&gt;
-      required: @Initialized @NonNull Constructor&lt;capture extends @Initialized @Nullable Object&gt;
+      required: @Initialized @NonNull Constructor&lt;@Initialized @Nullable Object&gt;
     </details>
   </checkerFrameworkError>
 
@@ -3691,21 +3724,10 @@
     </details>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java</fileName>
-    <specifier>type.argument</specifier>
-    <message>incompatible type argument for type parameter T extends Object of invokeConstructor.</message>
-    <lineContent>resultHandler = (AbstractExpressionHandler) CommonUtil.invokeConstructor(</lineContent>
-    <details>
-      found   : capture[ extends @UnknownKeyFor Object super @KeyForBottom Void]
-      required: [extends @UnknownKeyFor Object super @UnknownKeyFor NullType]
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter instance of LineWrappingHandler.</message>
+    <message>incompatible argument for parameter instance of LineWrappingHandler constructor.</message>
     <lineContent>private final LineWrappingHandler lineWrappingHandler = new LineWrappingHandler(this);</lineContent>
     <details>
       found   : @UnderInitialization(com.puppycrawl.tools.checkstyle.api.AbstractCheck.class) @NonNull IndentationCheck
@@ -3716,7 +3738,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of getHandler.</message>
+    <message>incompatible argument for parameter parent of HandlerFactory.getHandler.</message>
     <lineContent>handlers.peek());</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractExpressionHandler
@@ -3756,6 +3778,13 @@
     <lineContent>while (curNode != lastNode) {</lineContent>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElse(assign);</lineContent>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.java</fileName>
     <specifier>return</specifier>
@@ -3781,7 +3810,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter expr of AbstractExpressionHandler.</message>
+    <message>incompatible argument for parameter expr of AbstractExpressionHandler constructor.</message>
     <lineContent>super(indentCheck, null, null, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -3792,7 +3821,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parent of AbstractExpressionHandler.</message>
+    <message>incompatible argument for parameter parent of AbstractExpressionHandler constructor.</message>
     <lineContent>super(indentCheck, null, null, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -3803,7 +3832,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter typeName of AbstractExpressionHandler.</message>
+    <message>incompatible argument for parameter typeName of AbstractExpressionHandler constructor.</message>
     <lineContent>super(indentCheck, null, null, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -3876,7 +3905,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of contains.</message>
+    <message>incompatible argument for parameter arg0 of Set.contains.</message>
     <lineContent>if (tags.contains(tagName)) {</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -3905,7 +3934,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter firstArg of JavadocTag.</message>
+    <message>incompatible argument for parameter firstArg of JavadocTag constructor.</message>
     <lineContent>javadocArgMatcher.group(2)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -3916,7 +3945,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter firstArg of JavadocTag.</message>
+    <message>incompatible argument for parameter firstArg of JavadocTag constructor.</message>
     <lineContent>javadocArgMissingDescriptionMatcher.group(2)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -3927,7 +3956,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter tag of JavadocTag.</message>
+    <message>incompatible argument for parameter tag of JavadocTag constructor.</message>
     <lineContent>javadocArgMissingDescriptionMatcher.group(1),</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -3938,8 +3967,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter tag of JavadocTag.</message>
-    <lineContent>tags.add(new JavadocTag(currentLine, col, javadocArgMatcher.group(1),</lineContent>
+    <message>incompatible argument for parameter tag of JavadocTag constructor.</message>
+    <lineContent>tags.add(new JavadocTag(currentLine, 0, noargCurlyMatcher.group(1)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
       required: @Initialized @NonNull String
@@ -3949,8 +3978,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter tag of JavadocTag.</message>
-    <lineContent>tags.add(new JavadocTag(currentLine, col, javadocNoargMatcher.group(1)));</lineContent>
+    <message>incompatible argument for parameter tag of JavadocTag constructor.</message>
+    <lineContent>tags.add(new JavadocTag(currentLine, col, javadocArgMatcher.group(1),</lineContent>
     <details>
       found   : @Initialized @Nullable String
       required: @Initialized @NonNull String
@@ -3960,8 +3989,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter tag of JavadocTag.</message>
-    <lineContent>tags.add(new JavadocTag(currentLine, col, noargCurlyMatcher.group(1)));</lineContent>
+    <message>incompatible argument for parameter tag of JavadocTag constructor.</message>
+    <lineContent>tags.add(new JavadocTag(currentLine, col, javadocNoargMatcher.group(1)));</lineContent>
     <details>
       found   : @Initialized @Nullable String
       required: @Initialized @NonNull String
@@ -3971,7 +4000,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter tag of JavadocTag.</message>
+    <message>incompatible argument for parameter tag of JavadocTag constructor.</message>
     <lineContent>tags.add(new JavadocTag(tagLine, col, param1));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -4070,10 +4099,17 @@
     <lineContent>private String text;</lineContent>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElse(EMPTY_DETAIL_NODE_ARRAY);</lineContent>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of add.</message>
+    <message>incompatible argument for parameter arg0 of Set.add.</message>
     <lineContent>final boolean isDirChecked = !directoriesChecked.add(dir);</lineContent>
     <details>
       found   : @Initialized @Nullable File
@@ -4102,7 +4138,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter firstArg of JavadocTag.</message>
+    <message>incompatible argument for parameter firstArg of JavadocTag constructor.</message>
     <lineContent>this(line, column, tag, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -4190,7 +4226,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter javadocInlineTag of isInlineReturnTag.</message>
+    <message>incompatible argument for parameter javadocInlineTag of SummaryJavadocCheck.isInlineReturnTag.</message>
     <lineContent>else if (inlineTag.isPresent() &amp;&amp; isInlineReturnTag(inlineTagNode)) {</lineContent>
     <details>
       found   : @Initialized @Nullable DetailNode
@@ -4201,7 +4237,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter javadocInlineTag of isSummaryTag.</message>
+    <message>incompatible argument for parameter javadocInlineTag of SummaryJavadocCheck.isSummaryTag.</message>
     <lineContent>&amp;&amp; isSummaryTag(inlineTagNode)</lineContent>
     <details>
       found   : @Initialized @Nullable DetailNode
@@ -4255,7 +4291,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter name of TagInfo.</message>
+    <message>incompatible argument for parameter name of TagInfo constructor.</message>
     <lineContent>tags.add(new TagInfo(tagName, tagValue, position));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -4266,7 +4302,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter name of TagInfo.</message>
+    <message>incompatible argument for parameter name of TagInfo constructor.</message>
     <lineContent>tags.add(new TagInfo(tagName, tagValue, position));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -4277,7 +4313,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter source of removeLeadingJavaDoc.</message>
+    <message>incompatible argument for parameter source of InlineTagUtil.removeLeadingJavaDoc.</message>
     <lineContent>matchedTagValue = removeLeadingJavaDoc(matchedTagValue);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -4288,7 +4324,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter ast of ClassContext.</message>
+    <message>incompatible argument for parameter ast of ClassContext constructor.</message>
     <lineContent>classesContexts.push(new ClassContext(&quot;&quot;, null));</lineContent>
     <details>
       found   : null (NullType)
@@ -4356,6 +4392,13 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.ifPresent(modifiers -&gt; {</lineContent>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java</fileName>
     <specifier>return</specifier>
@@ -4399,14 +4442,21 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>message = Optional.ofNullable(message).orElse(&quot;&quot;);</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>pattern = Optional.ofNullable(format).map(this::createPattern).orElse(null);</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
     <lineContent>suppressor = Optional.ofNullable(suppressor).orElse(NeverSuppress.INSTANCE);</lineContent>
   </checkerFrameworkError>
 
@@ -4487,7 +4537,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter val of suppressor.</message>
+    <message>incompatible argument for parameter val of Builder.suppressor.</message>
     <lineContent>.suppressor(suppressor)</lineContent>
     <details>
       found   : @Initialized @Nullable MatchSuppressor
@@ -4505,7 +4555,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter ast of Context.</message>
+    <message>incompatible argument for parameter ast of Context constructor.</message>
     <lineContent>context = new Context(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -4723,7 +4773,7 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>assignment</specifier>
     <message>incompatible types in assignment.</message>
-    <lineContent>checkRegexp = null;</lineContent>
+    <lineContent>fileRegexp = null;</lineContent>
     <details>
       found   : null (NullType)
       required: @Initialized @NonNull Pattern
@@ -4734,7 +4784,7 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>assignment</specifier>
     <message>incompatible types in assignment.</message>
-    <lineContent>fileRegexp = null;</lineContent>
+    <lineContent>messageRegexp = null;</lineContent>
     <details>
       found   : null (NullType)
       required: @Initialized @NonNull Pattern
@@ -4745,10 +4795,10 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>assignment</specifier>
     <message>incompatible types in assignment.</message>
-    <lineContent>fileRegexp = null;</lineContent>
+    <lineContent>columnsCsv = null;</lineContent>
     <details>
       found   : null (NullType)
-      required: @Initialized @NonNull Pattern
+      required: @Initialized @NonNull String
     </details>
   </checkerFrameworkError>
 
@@ -4756,132 +4806,77 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>assignment</specifier>
     <message>incompatible types in assignment.</message>
-    <lineContent>messageRegexp = null;</lineContent>
+    <lineContent>linesCsv = null;</lineContent>
     <details>
       found   : null (NullType)
-      required: @Initialized @NonNull Pattern
+      required: @Initialized @NonNull String
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>messageRegexp = null;</lineContent>
+    <specifier>override.param</specifier>
+    <message>Incompatible parameter type for other.</message>
+    <lineContent>public boolean equals(Object other) {</lineContent>
     <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull Pattern
+      found   : @Initialized @NonNull Object
+      required: @Initialized @Nullable Object
+      Consequence: method in @Initialized @NonNull SuppressFilterElement
+      @Initialized @NonNull boolean equals(@Initialized @NonNull SuppressFilterElement this, @Initialized @NonNull Object p0)
+      cannot override method in @Initialized @NonNull Object
+      @Initialized @NonNull boolean equals(@Initialized @NonNull Object this, @Initialized @Nullable Object p0)
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>checkPattern = null;</lineContent>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return result;</lineContent>
     <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull String
+      type of expression: @Initialized @Nullable String
+      method return type: @Initialized @NonNull String
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>columnsCsv = null;</lineContent>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter text of SuppressWithNearbyCommentFilter.addTag.</message>
+    <lineContent>addTag(matcher.group(0), line);</lineContent>
     <details>
-      found   : null (NullType)
+      found   : @Initialized @Nullable String
       required: @Initialized @NonNull String
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
     <specifier>assignment</specifier>
     <message>incompatible types in assignment.</message>
-    <lineContent>filePattern = null;</lineContent>
+    <lineContent>tagIdRegexp = null;</lineContent>
     <details>
       found   : null (NullType)
-      required: @Initialized @NonNull String
+      required: @Initialized @NonNull Pattern
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
     <specifier>assignment</specifier>
     <message>incompatible types in assignment.</message>
-    <lineContent>linesCsv = null;</lineContent>
+    <lineContent>tagMessageRegexp = null;</lineContent>
     <details>
       found   : null (NullType)
-      required: @Initialized @NonNull String
+      required: @Initialized @NonNull Pattern
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>messagePattern = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull String
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
-    <specifier>override.param</specifier>
-    <message>Incompatible parameter type for other.</message>
-    <lineContent>public boolean equals(Object other) {</lineContent>
-    <details>
-      found   : @Initialized @NonNull Object
-      required: @Initialized @Nullable Object
-      Consequence: method in @Initialized @NonNull SuppressFilterElement
-      @Initialized @NonNull boolean equals(@Initialized @NonNull SuppressFilterElement this, @Initialized @NonNull Object p0)
-      cannot override method in @Initialized @NonNull Object
-      @Initialized @NonNull boolean equals(@Initialized @NonNull Object this, @Initialized @Nullable Object p0)
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter text of addTag.</message>
-    <lineContent>addTag(matcher.group(0), line);</lineContent>
-    <details>
-      found   : @Initialized @Nullable String
-      required: @Initialized @NonNull String
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>tagIdRegexp = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull Pattern
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>tagMessageRegexp = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull Pattern
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
-    <specifier>initialization.field.uninitialized</specifier>
-    <message>the default constructor does not initialize field idFormat</message>
-    <lineContent>private String idFormat;</lineContent>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
+    <specifier>initialization.field.uninitialized</specifier>
+    <message>the default constructor does not initialize field idFormat</message>
+    <lineContent>private String idFormat;</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -4934,7 +4929,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter text of Suppression.</message>
+    <message>incompatible argument for parameter text of Suppression constructor.</message>
     <lineContent>suppression = new Suppression(text, lineNo + 1, this);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -4988,7 +4983,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter text of Suppression.</message>
+    <message>incompatible argument for parameter text of Suppression constructor.</message>
     <lineContent>suppression = new Suppression(offCommentMatcher.group(0),</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -4999,7 +4994,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter text of Suppression.</message>
+    <message>incompatible argument for parameter text of Suppression constructor.</message>
     <lineContent>suppression = new Suppression(onCommentMatcher.group(0),</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -5083,7 +5078,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter text of addTag.</message>
+    <message>incompatible argument for parameter text of SuppressionCommentFilter.addTag.</message>
     <lineContent>addTag(offMatcher.group(0), line, column, TagType.OFF);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -5094,7 +5089,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter text of addTag.</message>
+    <message>incompatible argument for parameter text of SuppressionCommentFilter.addTag.</message>
     <lineContent>addTag(onMatcher.group(0), line, column, TagType.ON);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -5345,7 +5340,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter checks of XpathFilterElement.</message>
+    <message>incompatible argument for parameter checks of XpathFilterElement constructor.</message>
     <lineContent>Optional.ofNullable(checks).map(CommonUtil::createPattern).orElse(null),</lineContent>
     <details>
       found   : @Initialized @Nullable Pattern
@@ -5356,7 +5351,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter contextItem of createDynamicContext.</message>
+    <message>incompatible argument for parameter contextItem of XPathExpression.createDynamicContext.</message>
     <lineContent>xpathExpression.createDynamicContext(rootNode);</lineContent>
     <details>
       found   : @Initialized @Nullable RootNode
@@ -5367,7 +5362,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter files of XpathFilterElement.</message>
+    <message>incompatible argument for parameter files of XpathFilterElement constructor.</message>
     <lineContent>this(Optional.ofNullable(files).map(Pattern::compile).orElse(null),</lineContent>
     <details>
       found   : @Initialized @Nullable Pattern
@@ -5378,7 +5373,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter message of XpathFilterElement.</message>
+    <message>incompatible argument for parameter message of XpathFilterElement constructor.</message>
     <lineContent>Optional.ofNullable(message).map(Pattern::compile).orElse(null),</lineContent>
     <details>
       found   : @Initialized @Nullable Pattern
@@ -5390,91 +5385,67 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
     <specifier>assignment</specifier>
     <message>incompatible types in assignment.</message>
-    <lineContent>checkRegexp = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull Pattern
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>fileRegexp = null;</lineContent>
+    <lineContent>xpathExpression = null;</lineContent>
     <details>
       found   : null (NullType)
-      required: @Initialized @NonNull Pattern
+      required: @Initialized @NonNull XPathExpression
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>messageRegexp = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull Pattern
-    </details>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>Optional.ofNullable(checks).map(CommonUtil::createPattern).orElse(null),</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>checkPattern = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull String
-    </details>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>Optional.ofNullable(message).map(Pattern::compile).orElse(null),</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>filePattern = null;</lineContent>
-    <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull String
-    </details>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>this(Optional.ofNullable(files).map(Pattern::compile).orElse(null),</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>messagePattern = null;</lineContent>
+    <specifier>override.param</specifier>
+    <message>Incompatible parameter type for other.</message>
+    <lineContent>public boolean equals(Object other) {</lineContent>
     <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull String
+      found   : @Initialized @NonNull Object
+      required: @Initialized @Nullable Object
+      Consequence: method in @Initialized @NonNull XpathFilterElement
+      @Initialized @NonNull boolean equals(@Initialized @NonNull XpathFilterElement this, @Initialized @NonNull Object p0)
+      cannot override method in @Initialized @NonNull Object
+      @Initialized @NonNull boolean equals(@Initialized @NonNull Object this, @Initialized @Nullable Object p0)
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
-    <specifier>assignment</specifier>
-    <message>incompatible types in assignment.</message>
-    <lineContent>xpathExpression = null;</lineContent>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return result;</lineContent>
     <details>
-      found   : null (NullType)
-      required: @Initialized @NonNull XPathExpression
+      type of expression: @Initialized @Nullable String
+      method return type: @Initialized @NonNull String
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java</fileName>
-    <specifier>override.param</specifier>
-    <message>Incompatible parameter type for other.</message>
-    <lineContent>public boolean equals(Object other) {</lineContent>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.collect</message>
+    <lineContent>.collect(Collectors.toUnmodifiableList());</lineContent>
     <details>
-      found   : @Initialized @NonNull Object
-      required: @Initialized @Nullable Object
-      Consequence: method in @Initialized @NonNull XpathFilterElement
-      @Initialized @NonNull boolean equals(@Initialized @NonNull XpathFilterElement this, @Initialized @NonNull Object p0)
-      cannot override method in @Initialized @NonNull Object
-      @Initialized @NonNull boolean equals(@Initialized @NonNull Object this, @Initialized @Nullable Object p0)
+      unsatisfiable constraint: @Initialized @PolyNull AbstractNode &lt;: @Initialized @NonNull AbstractNode
     </details>
   </checkerFrameworkError>
 
@@ -5514,7 +5485,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of getImage.</message>
+    <message>incompatible argument for parameter arg0 of Toolkit.getImage.</message>
     <lineContent>setIconImage(Toolkit.getDefaultToolkit().getImage(MainFrame.class.getResource(ICON)));</lineContent>
     <details>
       found   : @Initialized @Nullable URL
@@ -5525,7 +5496,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter event of actionPerformed.</message>
+    <message>incompatible argument for parameter event of ReloadAction.actionPerformed.</message>
     <lineContent>reloadAction.actionPerformed(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -5536,7 +5507,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter sourceFile of openFile.</message>
+    <message>incompatible argument for parameter sourceFile of MainFrame.openFile.</message>
     <lineContent>openFile(file);</lineContent>
     <details>
       found   : @Initialized @Nullable File
@@ -5565,7 +5536,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter parseTree of ParseTreeTableModel.</message>
+    <message>incompatible argument for parameter parseTree of ParseTreeTableModel constructor.</message>
     <lineContent>parseTreeTableModel = new ParseTreeTableModel(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -5594,7 +5565,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter childIndices of fireTreeStructureChanged.</message>
+    <message>incompatible argument for parameter childIndices of ParseTreeTableModel.fireTreeStructureChanged.</message>
     <lineContent>fireTreeStructureChanged(this, path, null, (Object[]) null);</lineContent>
     <details>
       found   : null (NullType)
@@ -5605,7 +5576,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter children of fireTreeStructureChanged.</message>
+    <message>incompatible argument for parameter children of ParseTreeTableModel.fireTreeStructureChanged.</message>
     <lineContent>fireTreeStructureChanged(this, path, null, (Object[]) null);</lineContent>
     <details>
       found   : @Initialized @NonNull Object @FBCBottom @Nullable []
@@ -5656,7 +5627,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter font of getFontMetrics.</message>
+    <message>incompatible argument for parameter font of JComponent.getFontMetrics.</message>
     <lineContent>final FontMetrics fontMetrics = getFontMetrics(getFont());</lineContent>
     <details>
       found   : @Initialized @Nullable Font
@@ -5667,7 +5638,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter jTreeTable of ListToTreeSelectionModelWrapper.</message>
+    <message>incompatible argument for parameter jTreeTable of ListToTreeSelectionModelWrapper constructor.</message>
     <lineContent>ListToTreeSelectionModelWrapper(this);</lineContent>
     <details>
       found   : @UnderInitialization(javax.swing.JTable.class) @NonNull TreeTable
@@ -5678,7 +5649,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter selectionModel of setSelectionModel.</message>
+    <message>incompatible argument for parameter selectionModel of JTree.setSelectionModel.</message>
     <lineContent>tree.setSelectionModel(selectionWrapper);</lineContent>
     <details>
       found   : @UnderInitialization(com.puppycrawl.tools.checkstyle.gui.ListToTreeSelectionModelWrapper.class) @NonNull ListToTreeSelectionModelWrapper
@@ -5689,7 +5660,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter treeTable of TreeTableCellRenderer.</message>
+    <message>incompatible argument for parameter treeTable of TreeTableCellRenderer constructor.</message>
     <lineContent>tree = new TreeTableCellRenderer(this, treeTableModel);</lineContent>
     <details>
       found   : @UnderInitialization(javax.swing.JTable.class) @NonNull TreeTable
@@ -5880,10 +5851,20 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.map</message>
+    <lineContent>.map(ElementNode::getUnderlyingNode)</lineContent>
+    <details>
+      unsatisfiable constraint: @Initialized @PolyNull ElementNode &lt;: @Initialized @NonNull ElementNode
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of add.</message>
+    <message>incompatible argument for parameter arg0 of Set.add.</message>
     <lineContent>tokens.add(matcher.group(0));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -5894,7 +5875,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter nodeTag of getTextFromTag.</message>
+    <message>incompatible argument for parameter nodeTag of JavadocMetadataScraper.getTextFromTag.</message>
     <lineContent>return getTextFromTag(tagNode);</lineContent>
     <details>
       found   : @Initialized @Nullable DetailNode
@@ -5918,24 +5899,9 @@
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java</fileName>
-    <specifier>method.invocation</specifier>
-    <message>call to &lt;X&gt;orElseThrow(java.util.function.Supplier&lt;? extends X&gt;) not allowed on the given receiver.</message>
-    <lineContent>.orElseThrow(() -&gt; {</lineContent>
-    <details>
-      found   : @MaybePresent Optional&lt;/*INFERENCE FAILED for:*/ ? extends Object&gt;
-      required: @Present Optional&lt;/*INFERENCE FAILED for:*/ ? extends Object&gt;
-    </details>
-  </checkerFrameworkError>
-
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java</fileName>
-    <specifier>method.invocation</specifier>
-    <message>call to &lt;X&gt;orElseThrow(java.util.function.Supplier&lt;? extends X&gt;) not allowed on the given receiver.</message>
-    <lineContent>.orElseThrow(() -&gt; {</lineContent>
-    <details>
-      found   : @MaybePresent Optional&lt;/*INFERENCE FAILED for:*/ ? extends Object&gt;
-      required: @Present Optional&lt;/*INFERENCE FAILED for:*/ ? extends Object&gt;
-    </details>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>return Optional.ofNullable(nodeTag).map(JavadocMetadataScraper::getText).orElse(&quot;&quot;);</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -5952,7 +5918,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter moduleClassLoader of setModuleClassLoader.</message>
+    <message>incompatible argument for parameter moduleClassLoader of Checker.setModuleClassLoader.</message>
     <lineContent>checker.setModuleClassLoader(Checker.class.getClassLoader());</lineContent>
     <details>
       found   : @Initialized @Nullable ClassLoader
@@ -6033,8 +5999,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter description of setDescription.</message>
-    <lineContent>.get(0).getFirstChild().getNodeValue());</lineContent>
+    <message>incompatible argument for parameter description of ModuleDetails.setDescription.</message>
+    <lineContent>.getFirstChild().getNodeValue());</lineContent>
     <details>
       found   : @Initialized @Nullable String
       required: @Initialized @NonNull String
@@ -6044,8 +6010,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter description of setDescription.</message>
-    <lineContent>.getFirstChild().getNodeValue());</lineContent>
+    <message>incompatible argument for parameter description of ModulePropertyDetails.setDescription.</message>
+    <lineContent>.get(0).getFirstChild().getNodeValue());</lineContent>
     <details>
       found   : @Initialized @Nullable String
       required: @Initialized @NonNull String
@@ -6055,7 +6021,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter element of getAttributeValue.</message>
+    <message>incompatible argument for parameter element of XmlMetaReader.getAttributeValue.</message>
     <lineContent>listContent.add(getAttributeValue((Element) nodeList.item(j), attribute));</lineContent>
     <details>
       found   : @Initialized @Nullable Element
@@ -6066,7 +6032,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter element of getAttributeValue.</message>
+    <message>incompatible argument for parameter element of XmlMetaReader.getAttributeValue.</message>
     <lineContent>propertyDetails.setName(getAttributeValue(prop, XML_TAG_NAME));</lineContent>
     <details>
       found   : @Initialized @Nullable Element
@@ -6077,7 +6043,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter moduleMetadataStream of read.</message>
+    <message>incompatible argument for parameter moduleMetadataStream of XmlMetaReader.read.</message>
     <lineContent>moduleDetails = read(XmlMetaReader.class.getResourceAsStream(&quot;/&quot; + fileName),</lineContent>
     <details>
       found   : @Initialized @Nullable InputStream
@@ -6161,20 +6127,42 @@
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.java</fileName>
-    <specifier>return</specifier>
-    <message>incompatible types in return.</message>
-    <lineContent>.orElse(null);</lineContent>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/PropertiesMacro.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter justification of XdocSink.tableRows.</message>
+    <lineContent>sink.tableRows(null, false);</lineContent>
     <details>
-      type of expression: @Initialized @Nullable Path
-      method return type: @Initialized @NonNull Path
+      found   : null (NullType)
+      required: @Initialized @NonNull int @Initialized @NonNull []
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/PropertiesMacro.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter moduleJavadoc of PropertiesMacro.writePropertyRow.</message>
+    <lineContent>writePropertyRow(sink, property, propertyJavadoc, instance, currentModuleJavadoc);</lineContent>
+    <details>
+      found   : @Initialized @Nullable DetailNode
+      required: @Initialized @NonNull DetailNode
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/PropertiesMacro.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter propertyJavadoc of PropertiesMacro.writePropertyRow.</message>
+    <lineContent>writePropertyRow(sink, property, propertyJavadoc, instance, currentModuleJavadoc);</lineContent>
+    <details>
+      found   : @Initialized @Nullable DetailNode
+      required: @Initialized @NonNull DetailNode
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter classLoader of getPackageNames.</message>
+    <message>incompatible argument for parameter classLoader of PackageNamesLoader.getPackageNames.</message>
     <lineContent>final Set&lt;String&gt; packageNames = PackageNamesLoader.getPackageNames(cl);</lineContent>
     <details>
       found   : @Initialized @Nullable ClassLoader
@@ -6182,11 +6170,144 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter message of MacroExecutionException constructor.</message>
+    <lineContent>throw new MacroExecutionException(exc.getMessage(), exc);</lineContent>
+    <details>
+      found   : @Initialized @Nullable String
+      required: @Initialized @NonNull String
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter moduleClassLoader of Checker.setModuleClassLoader.</message>
+    <lineContent>checker.setModuleClassLoader(Checker.class.getClassLoader());</lineContent>
+    <details>
+      found   : @Initialized @Nullable ClassLoader
+      required: @Initialized @NonNull ClassLoader
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
     <specifier>dereference.of.nullable</specifier>
-    <message>dereference of possibly-null reference field.get(instance)</message>
-    <lineContent>return field.get(instance).toString();</lineContent>
+    <message>dereference of possibly-null reference currentClass</message>
+    <lineContent>result = currentClass.getDeclaredField(propertyName);</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElse(null);</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElseGet(fieldClass::getSimpleName);</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>methodref.return</specifier>
+    <message>Incompatible return type</message>
+    <lineContent>.mapToInt(int.class::cast);</lineContent>
+    <details>
+      found   : @Initialized @Nullable Integer
+      required: @Initialized @NonNull int
+      Consequence: method in @Initialized @NonNull Class&lt;@Initialized @NonNull Integer&gt;
+      @Initialized @Nullable Integer cast(@Initialized @NonNull Class&lt;@Initialized @NonNull Integer&gt; this, @Initialized @Nullable Object p0)
+      is not a valid method reference for method in @Initialized @NonNull ToIntFunction&lt;capture extends @Initialized @Nullable Object&gt;
+      @Initialized @NonNull int applyAsInt(@Initialized @NonNull ToIntFunction&lt;capture extends @Initialized @Nullable Object&gt; this, capture extends @Initialized @Nullable Object p0)
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return result;</lineContent>
+    <details>
+      type of expression: @Initialized @Nullable Class&lt;capture extends @Initialized @Nullable Object&gt;
+      method return type: @Initialized @NonNull Class&lt;? extends @Initialized @Nullable Object&gt;
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return javadocTagWithSince;</lineContent>
+    <details>
+      type of expression: @Initialized @Nullable DetailNode
+      method return type: @Initialized @NonNull DetailNode
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return result;</lineContent>
+    <details>
+      type of expression: @Initialized @Nullable Field
+      method return type: @Initialized @NonNull Field
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return field.get(instance);</lineContent>
+    <details>
+      type of expression: @Initialized @Nullable Object
+      method return type: @Initialized @NonNull Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>.orElse(null);</lineContent>
+    <details>
+      type of expression: @Initialized @Nullable Path
+      method return type: @Initialized @NonNull Path
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.map</message>
+    <lineContent>.map(Pattern.class::cast)</lineContent>
+    <details>
+      unsatisfiable constraint: capture extends @Initialized @Nullable Object &lt;: @Initialized @PolyNull Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.map</message>
+    <lineContent>.map(String.class::cast)</lineContent>
+    <details>
+      unsatisfiable constraint: capture extends @Initialized @Nullable Object &lt;: @Initialized @PolyNull Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
+    <specifier>unnecessary.equals</specifier>
+    <message>use of .equals can be safely replaced by ==/!=</message>
+    <lineContent>while (!Object.class.equals(currentClass)) {</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -6196,13 +6317,10 @@
     <lineContent>+ clss.getPackage().getName().replace(&quot;.&quot;, &quot;%2F&quot;)</lineContent>
   </checkerFrameworkError>
 
-  <!-- First parameter is namespace of the attribute and documentation states that null should
-       be passed whenever namespaces are not enabled
-       https://github.com/sonatype/plexus-utils/blob/master/src/main/java/org/codehaus/plexus/util/xml/pull/XmlPullParser.java#L895 -->
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of getAttributeValue.</message>
+    <message>incompatible argument for parameter arg0 of XmlPullParser.getAttributeValue.</message>
     <lineContent>.getAttributeValue(null, Attribute.NAME.toString());</lineContent>
     <details>
       found   : null (NullType)
@@ -6213,7 +6331,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of getAttributeValue.</message>
+    <message>incompatible argument for parameter arg0 of XmlPullParser.getAttributeValue.</message>
     <lineContent>.getAttributeValue(null, Attribute.VALUE.toString());</lineContent>
     <details>
       found   : null (NullType)
@@ -6224,7 +6342,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter arg0 of getAttributeValue.</message>
+    <message>incompatible argument for parameter arg0 of XmlPullParser.getAttributeValue.</message>
     <lineContent>macroName = parser.getAttributeValue(null, Attribute.NAME.toString());</lineContent>
     <details>
       found   : null (NullType)
@@ -6232,7 +6350,6 @@
     </details>
   </checkerFrameworkError>
 
-  <!-- Value is reset after parsing is done. -->
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java</fileName>
     <specifier>assignment</specifier>
@@ -6244,7 +6361,6 @@
     </details>
   </checkerFrameworkError>
 
-  <!-- The following 2 fields are initialized during parsing step -->
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java</fileName>
     <specifier>initialization.field.uninitialized</specifier>
@@ -6273,7 +6389,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter input of matcher.</message>
+    <message>incompatible argument for parameter input of Pattern.matcher.</message>
     <lineContent>final Matcher matcher = PROPERTY_VARIABLE_PATTERN.matcher(propertyValue);</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -6295,7 +6411,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter replacement of replaceAll.</message>
+    <message>incompatible argument for parameter replacement of String.replaceAll.</message>
     <lineContent>result = result.replaceAll(&quot;\\$&quot; + i, matcher.group(i));</lineContent>
     <details>
       found   : @Initialized @Nullable String
@@ -6372,8 +6488,15 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java</fileName>
     <specifier>introduce.eliminate</specifier>
-    <message>It is bad style to create an Optional just to chain methods to get a value.</message>
-    <lineContent>.orElseGet(() -&gt; getDefaultScope(aMods.getParent()));</lineContent>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElseGet(() -&gt; getDefaultScope(aMods));</lineContent>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElseGet(() -&gt; getDefaultScope(ast));</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -6398,10 +6521,52 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
+    <specifier>argument</specifier>
+    <message>incompatible argument for parameter object of TokenUtil.getIntFromField.</message>
+    <lineContent>Field::getName, fld -&gt; getIntFromField(fld, null))</lineContent>
+    <details>
+      found   : null (NullType)
+      required: @Initialized @NonNull Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java</fileName>
+    <specifier>return</specifier>
+    <message>incompatible types in return.</message>
+    <lineContent>return Arrays.copyOf(array, length);</lineContent>
+    <details>
+      type of expression: T[ extends @Initialized @Nullable Object super @Initialized @Nullable Void] @Initialized @NonNull []
+      method return type: T[ extends @Initialized @Nullable Object super @Initialized @NonNull Void] @Initialized @NonNull []
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Map.copyOf</message>
+    <lineContent>return Map.copyOf(map);</lineContent>
+    <details>
+      unsatisfiable constraint: K extends @Initialized @Nullable Object &lt;: @Initialized @NonNull Object V extends @Initialized @Nullable Object &lt;: @Initialized @NonNull Object
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java</fileName>
+    <specifier>type.arguments.not.inferred</specifier>
+    <message>Could not infer type arguments for Stream.collect</message>
+    <lineContent>.collect(Collectors.toUnmodifiableList());</lineContent>
+    <details>
+      unsatisfiable constraint: T extends @Initialized @PolyNull Object &lt;: T extends @Initialized @Nullable Object
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter name of AttributeNode.</message>
+    <message>incompatible argument for parameter name of AttributeNode constructor.</message>
     <lineContent>private static final AttributeNode ATTRIBUTE_NODE_UNINITIALIZED = new AttributeNode(null, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -6412,7 +6577,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter nodes of OfNodes.</message>
+    <message>incompatible argument for parameter nodes of OfNodes constructor.</message>
     <lineContent>getChildren().toArray(EMPTY_ABSTRACT_NODE_ARRAY));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractNode @Initialized @NonNull []
@@ -6423,7 +6588,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter nodes of OfNodes.</message>
+    <message>incompatible argument for parameter nodes of OfNodes constructor.</message>
     <lineContent>getFollowingSiblings().toArray(EMPTY_ABSTRACT_NODE_ARRAY));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractNode @Initialized @NonNull []
@@ -6434,7 +6599,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter value of AttributeNode.</message>
+    <message>incompatible argument for parameter value of AttributeNode constructor.</message>
     <lineContent>private static final AttributeNode ATTRIBUTE_NODE_UNINITIALIZED = new AttributeNode(null, null);</lineContent>
     <details>
       found   : null (NullType)
@@ -6442,6 +6607,13 @@
     </details>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java</fileName>
+    <specifier>introduce.eliminate</specifier>
+    <message>It is bad style to create an Optional just to chain methods to get a non-optional value.</message>
+    <lineContent>.orElse(null);</lineContent>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java</fileName>
     <specifier>not.interned</specifier>
@@ -6505,7 +6677,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter nodes of OfNodes.</message>
+    <message>incompatible argument for parameter nodes of OfNodes constructor.</message>
     <lineContent>getChildren().toArray(EMPTY_ABSTRACT_NODE_ARRAY));</lineContent>
     <details>
       found   : @Initialized @Nullable AbstractNode @Initialized @NonNull []
@@ -6534,7 +6706,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNode.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter treeInfo of AbstractNode.</message>
+    <message>incompatible argument for parameter treeInfo of AbstractNode constructor.</message>
     <lineContent>super(null);</lineContent>
     <details>
       found   : null (NullType)
@@ -6556,7 +6728,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter root of getXpathQuery.</message>
+    <message>incompatible argument for parameter root of XpathQueryGenerator.getXpathQuery.</message>
     <lineContent>final StringBuilder xpathQueryBuilder = new StringBuilder(getXpathQuery(null, ast));</lineContent>
     <details>
       found   : null (NullType)
@@ -6592,17 +6764,6 @@
     <lineContent>while (cur != root) {</lineContent>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java</fileName>
-    <specifier>return</specifier>
-    <message>incompatible types in return.</message>
-    <lineContent>XpathUtil::supportsTextAttribute).orElse(null);</lineContent>
-    <details>
-      type of expression: @Initialized @Nullable DetailAST
-      method return type: @Initialized @NonNull DetailAST
-    </details>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java</fileName>
     <specifier>assignment</specifier>
diff --git a/config/checker-framework-suppressions/checker-purity-value-returns-suppressions.xml b/config/checker-framework-suppressions/checker-purity-value-returns-suppressions.xml
index 8a5aa865b9a..f12b4fbd5af 100644
--- a/config/checker-framework-suppressions/checker-purity-value-returns-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-purity-value-returns-suppressions.xml
@@ -3,7 +3,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseInt.</message>
+    <message>incompatible argument for parameter radix of Integer.parseInt.</message>
     <lineContent>result = Integer.parseInt(txt, radix);</lineContent>
     <details>
       found   : int
@@ -14,8 +14,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseLong.</message>
-    <lineContent>result = Long.parseLong(txt, radix);</lineContent>
+    <message>incompatible argument for parameter radix of Integer.parseUnsignedInt.</message>
+    <lineContent>result = Integer.parseUnsignedInt(txt, radix);</lineContent>
     <details>
       found   : int
       required: @IntRange(from=2, to=36) int
@@ -25,8 +25,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseUnsignedInt.</message>
-    <lineContent>result = Integer.parseUnsignedInt(txt, radix);</lineContent>
+    <message>incompatible argument for parameter radix of Long.parseLong.</message>
+    <lineContent>result = Long.parseLong(txt, radix);</lineContent>
     <details>
       found   : int
       required: @IntRange(from=2, to=36) int
@@ -36,7 +36,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter radix of parseUnsignedLong.</message>
+    <message>incompatible argument for parameter radix of Long.parseUnsignedLong.</message>
     <lineContent>result = Long.parseUnsignedLong(txt, radix);</lineContent>
     <details>
       found   : int
diff --git a/config/checker-framework-suppressions/checker-regex-property-key-compiler-message-suppressions.xml b/config/checker-framework-suppressions/checker-regex-property-key-compiler-message-suppressions.xml
index 4e8fe29e475..17ef65c9950 100644
--- a/config/checker-framework-suppressions/checker-regex-property-key-compiler-message-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-regex-property-key-compiler-message-suppressions.xml
@@ -3,7 +3,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getString.</message>
+    <message>incompatible argument for parameter key of ResourceBundle.getString.</message>
     <lineContent>final String pattern = resourceBundle.getString(key);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -12,20 +12,24 @@
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/Main.java</fileName>
-    <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
-    <lineContent>.map(pattern -&gt; Pattern.compile(&quot;^&quot; + pattern + &quot;$&quot;))</lineContent>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java</fileName>
+    <specifier>methodref.param</specifier>
+    <message>Incompatible parameter type for key</message>
+    <lineContent>Collectors.toUnmodifiableMap(Function.identity(), properties::getProperty));</lineContent>
     <details>
-      found   : String
-      required: @Regex String
+      found   : @PropertyKey String
+      required: @UnknownPropertyKey String
+      Consequence: method in @UnknownPropertyKey Properties
+      @UnknownPropertyKey String getProperty(@UnknownPropertyKey Properties this, @PropertyKey String p0)
+      is not a valid method reference for method in @UnknownPropertyKey Function&lt;@UnknownPropertyKey String, @UnknownPropertyKey String&gt;
+      @UnknownPropertyKey String apply(@UnknownPropertyKey Function&lt;@UnknownPropertyKey String, @UnknownPropertyKey String&gt; this, @UnknownPropertyKey String p0)
     </details>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getProperty.</message>
+    <message>incompatible argument for parameter key of Properties.getProperty.</message>
     <lineContent>final String cachedConfigHash = details.getProperty(CONFIG_HASH_KEY);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -36,7 +40,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getProperty.</message>
+    <message>incompatible argument for parameter key of Properties.getProperty.</message>
     <lineContent>final String cachedHashSum = details.getProperty(location);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -47,7 +51,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getProperty.</message>
+    <message>incompatible argument for parameter key of Properties.getProperty.</message>
     <lineContent>final String cachedHashSum = details.getProperty(resource.location);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -58,7 +62,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getProperty.</message>
+    <message>incompatible argument for parameter key of Properties.getProperty.</message>
     <lineContent>final String lastChecked = details.getProperty(uncheckedFileName);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -69,7 +73,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getProperty.</message>
+    <message>incompatible argument for parameter key of Properties.getProperty.</message>
     <lineContent>return details.getProperty(name);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -80,7 +84,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of setProperty.</message>
+    <message>incompatible argument for parameter key of Properties.setProperty.</message>
     <lineContent>.forEach(resource -&gt; details.setProperty(resource.location, resource.contentHashSum));</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -91,7 +95,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of setProperty.</message>
+    <message>incompatible argument for parameter key of Properties.setProperty.</message>
     <lineContent>details.setProperty(CONFIG_HASH_KEY, configHash);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -102,7 +106,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of setProperty.</message>
+    <message>incompatible argument for parameter key of Properties.setProperty.</message>
     <lineContent>details.setProperty(checkedFileName, Long.toString(timestamp));</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -113,7 +117,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of setProperty.</message>
+    <message>incompatible argument for parameter key of Properties.setProperty.</message>
     <lineContent>returnValue.setProperty(entry.getKey(), value);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -124,7 +128,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of setProperty.</message>
+    <message>incompatible argument for parameter key of Properties.setProperty.</message>
     <lineContent>returnValue.setProperty(p.getKey(), p.getValue());</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -135,7 +139,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>+ &quot;|\&quot;&quot;</lineContent>
     <details>
       found   : String
@@ -146,7 +150,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>return Pattern.compile(keyPatternString);</lineContent>
     <details>
       found   : String
@@ -157,7 +161,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of matches.</message>
+    <message>incompatible argument for parameter regex of Pattern.matches.</message>
     <lineContent>if (Pattern.matches(fileNameRegexp, currentFile.getName())) {</lineContent>
     <details>
       found   : String
@@ -168,7 +172,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of replaceAll.</message>
+    <message>incompatible argument for parameter regex of String.replaceAll.</message>
     <lineContent>return fileName.replaceAll(removePattern, &quot;&quot;);</lineContent>
     <details>
       found   : String
@@ -179,7 +183,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>return Pattern.compile(keyPatternString);</lineContent>
     <details>
       found   : String
@@ -190,7 +194,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>private Pattern extendedClassNameFormat = Pattern.compile(DEFAULT_FORMAT);</lineContent>
     <details>
       found   : String
@@ -201,7 +205,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>headerRegexps.add(Pattern.compile(line));</lineContent>
     <details>
       found   : String
@@ -212,7 +216,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of matches.</message>
+    <message>incompatible argument for parameter regex of String.matches.</message>
     <lineContent>classMatch = forImport.matches(className);</lineContent>
     <details>
       found   : String
@@ -223,7 +227,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>return Pattern.compile(expression);</lineContent>
     <details>
       found   : String
@@ -234,7 +238,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>grp = Pattern.compile(pkg);</lineContent>
     <details>
       found   : String
@@ -245,7 +249,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>return Pattern.compile(expression + &quot;(?:\\..*)?&quot;);</lineContent>
     <details>
       found   : String
@@ -256,7 +260,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>return Pattern.compile(expression);</lineContent>
     <details>
       found   : String
@@ -267,7 +271,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of matches.</message>
+    <message>incompatible argument for parameter regex of String.matches.</message>
     <lineContent>pkgMatch = !forImport.matches(pkgName + &quot;\\..*\\..*&quot;);</lineContent>
     <details>
       found   : String
@@ -278,7 +282,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of matches.</message>
+    <message>incompatible argument for parameter regex of String.matches.</message>
     <lineContent>pkgMatch = forImport.matches(pkgName + &quot;\\..*&quot;);</lineContent>
     <details>
       found   : String
@@ -332,7 +336,7 @@
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java</fileName>
     <specifier>group.count</specifier>
     <message>invalid groups parameter 1. Only 0 groups are guaranteed to exist for noargCurlyMatcher.</message>
-    <lineContent>tags.add(new JavadocTag(currentLine, col, noargCurlyMatcher.group(1)));</lineContent>
+    <lineContent>tags.add(new JavadocTag(currentLine, 0, noargCurlyMatcher.group(1)));</lineContent>
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
@@ -363,6 +367,21 @@
     <lineContent>javadocArgMissingDescriptionMatcher.group(2)));</lineContent>
   </checkerFrameworkError>
 
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java</fileName>
+    <specifier>methodref.receiver.bound</specifier>
+    <message>Incompatible receiver type</message>
+    <lineContent>.map(INLINE_RETURN_TAG_PATTERN::matcher)</lineContent>
+    <details>
+      found   : @Regex Pattern
+      required: @PolyRegex Pattern
+      Consequence: method
+      @Regex Pattern
+      is not a valid method reference for method in @Regex Pattern
+      @PolyRegex Matcher matcher(@PolyRegex Pattern this, CharSequence p0)
+    </details>
+  </checkerFrameworkError>
+
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java</fileName>
     <specifier>group.count</specifier>
@@ -373,7 +392,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>return Pattern.compile(formatValue, options);</lineContent>
     <details>
       found   : String
@@ -384,7 +403,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>checkRegexp = Pattern.compile(checks);</lineContent>
     <details>
       found   : String
@@ -395,7 +414,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>fileRegexp = Pattern.compile(files);</lineContent>
     <details>
       found   : String
@@ -406,7 +425,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>messageRegexp = Pattern.compile(message);</lineContent>
     <details>
       found   : String
@@ -417,7 +436,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>private Pattern commentFormat = Pattern.compile(DEFAULT_COMMENT_FORMAT);</lineContent>
     <details>
       found   : String
@@ -428,7 +447,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>tagCheckRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -439,7 +458,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>tagIdRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -450,7 +469,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>tagMessageRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -461,7 +480,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>eventIdRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -472,7 +491,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>eventMessageRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -483,7 +502,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>eventSourceRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -494,7 +513,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>private Pattern nearbyTextPattern = Pattern.compile(DEFAULT_NEARBY_TEXT_PATTERN);</lineContent>
     <details>
       found   : String
@@ -505,7 +524,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>eventIdRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -516,7 +535,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>eventMessageRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -527,7 +546,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>eventSourceRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -538,7 +557,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>private Pattern offCommentFormat = Pattern.compile(DEFAULT_OFF_FORMAT);</lineContent>
     <details>
       found   : String
@@ -549,7 +568,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>private Pattern onCommentFormat = Pattern.compile(DEFAULT_ON_FORMAT);</lineContent>
     <details>
       found   : String
@@ -560,7 +579,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>tagCheckRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -571,7 +590,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>tagIdRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -582,7 +601,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>tagMessageRegexp = Pattern.compile(format);</lineContent>
     <details>
       found   : String
@@ -593,7 +612,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>this.checks = Pattern.compile(checks);</lineContent>
     <details>
       found   : String
@@ -604,7 +623,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>this.checks = Pattern.compile(checks);</lineContent>
     <details>
       found   : String
@@ -615,7 +634,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>this.files = Pattern.compile(files);</lineContent>
     <details>
       found   : String
@@ -626,7 +645,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>this.message = Pattern.compile(message);</lineContent>
     <details>
       found   : String
@@ -665,9 +684,24 @@
   </checkerFrameworkError>
 
   <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.java</fileName>
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java</fileName>
+    <specifier>methodref.receiver.bound</specifier>
+    <message>Incompatible receiver type</message>
+    <lineContent>.map(pattern::matcher)</lineContent>
+    <details>
+      found   : Pattern
+      required: @PolyRegex Pattern
+      Consequence: method
+      Pattern
+      is not a valid method reference for method in Pattern
+      @PolyRegex Matcher matcher(@PolyRegex Pattern this, CharSequence p0)
+    </details>
+  </checkerFrameworkError>
+
+  <checkerFrameworkError unstable="false">
+    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of matches.</message>
+    <message>incompatible argument for parameter regex of String.matches.</message>
     <lineContent>.filter(path -&gt; path.toString().matches(fileNamePattern))</lineContent>
     <details>
       found   : String
@@ -678,7 +712,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getProperty.</message>
+    <message>incompatible argument for parameter key of Properties.getProperty.</message>
     <lineContent>String propertyValue = properties.getProperty(propertyName);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -689,7 +723,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getProperty.</message>
+    <message>incompatible argument for parameter key of Properties.getProperty.</message>
     <lineContent>properties.getProperty(unresolvedPropertyName);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -700,7 +734,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of setProperty.</message>
+    <message>incompatible argument for parameter key of Properties.setProperty.</message>
     <lineContent>properties.setProperty(propertyName, propertyValue);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
@@ -711,7 +745,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>Pattern.compile(pattern);</lineContent>
     <details>
       found   : String
@@ -722,7 +756,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of compile.</message>
+    <message>incompatible argument for parameter regex of Pattern.compile.</message>
     <lineContent>return Pattern.compile(pattern, flags);</lineContent>
     <details>
       found   : String
@@ -733,7 +767,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter regex of replaceAll.</message>
+    <message>incompatible argument for parameter regex of String.replaceAll.</message>
     <lineContent>result = result.replaceAll(&quot;\\$&quot; + i, matcher.group(i));</lineContent>
     <details>
       found   : String
@@ -751,7 +785,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter key of getString.</message>
+    <message>incompatible argument for parameter key of ResourceBundle.getString.</message>
     <lineContent>return bundle.getString(name);</lineContent>
     <details>
       found   : @UnknownPropertyKey String
diff --git a/config/checker-framework-suppressions/checker-signature-gui-units-init-suppressions.xml b/config/checker-framework-suppressions/checker-signature-gui-units-init-suppressions.xml
index be21f291ec1..7f6f0874525 100644
--- a/config/checker-framework-suppressions/checker-signature-gui-units-init-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-signature-gui-units-init-suppressions.xml
@@ -3,8 +3,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter baseName of getBundle.</message>
-    <lineContent>return ResourceBundle.getBundle(bundle, sLocale, sourceClass.getClassLoader(),</lineContent>
+    <message>incompatible argument for parameter baseName of Control.toBundleName.</message>
+    <lineContent>final String bundleName = toBundleName(baseName, locale);</lineContent>
     <details>
       found   : @SignatureUnknown String
       required: @BinaryName String
@@ -14,8 +14,8 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter baseName of toBundleName.</message>
-    <lineContent>final String bundleName = toBundleName(baseName, locale);</lineContent>
+    <message>incompatible argument for parameter baseName of ResourceBundle.getBundle.</message>
+    <lineContent>return ResourceBundle.getBundle(bundle, sLocale, sourceClass.getClassLoader(),</lineContent>
     <details>
       found   : @SignatureUnknown String
       required: @BinaryName String
@@ -25,7 +25,7 @@
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java</fileName>
     <specifier>argument</specifier>
-    <message>incompatible argument for parameter name of forName.</message>
+    <message>incompatible argument for parameter name of Class.forName.</message>
     <lineContent>clazz = Class.forName(className, true, moduleClassLoader);</lineContent>
     <details>
       found   : @SignatureUnknown String
diff --git a/config/checkstyle-checks.xml b/config/checkstyle-checks.xml
index 8c6fceefe4a..042696f8e49 100644
--- a/config/checkstyle-checks.xml
+++ b/config/checkstyle-checks.xml
@@ -330,6 +330,7 @@
       <property name="tokens" value="ENUM_DEF"/>
       <property name="tokens" value="RECORD_DEF"/>
       <property name="tokens" value="COMPACT_CTOR_DEF"/>
+      <property name="tokens" value="LITERAL_CASE"/>
       <property name="option" value="alone"/>
     </module>
     <module name="RightCurly">
@@ -367,6 +368,7 @@
     <module name="AvoidDoubleBraceInitialization"/>
     <module name="AvoidInlineConditionals"/>
     <module name="AvoidNoArgumentSuperConstructorCall"/>
+    <module name="ConstructorsDeclarationGrouping"/>
     <module name="CovariantEquals"/>
     <module name="DeclarationOrder"/>
     <module name="DefaultComesLast"/>
diff --git a/config/checkstyle-examples-checks.xml b/config/checkstyle-examples-checks.xml
index 706cfda3aae..6c21c9259c2 100644
--- a/config/checkstyle-examples-checks.xml
+++ b/config/checkstyle-examples-checks.xml
@@ -80,6 +80,12 @@
     <property name="minimum" value="1"/>
     <property name="maximum" value="1"/>
   </module>
+  <module name="RegexpSingleline">
+    <property name="id" value="ensureSpaceAfterSpecificSingleLineComment"/>
+    <property name="format" value="^//(ok|violation)"/>
+    <property name="message" value="There should be a space between '//' and 'ok' or 'violation'."/>
+    <property name="maximum" value="0"/>
+  </module>
 
   <!-- Miscellaneous -->
   <module name="NewlineAtEndOfFile"/>
@@ -99,6 +105,8 @@
 
   <module name="TreeWalker">
 
+    <module name="PackageDeclaration"/>
+
     <!-- Miscellaneous -->
     <module name="CommentsIndentation"/>
     <module name="Indentation">
diff --git a/config/checkstyle-examples-suppressions.xml b/config/checkstyle-examples-suppressions.xml
index ab1070b94cb..41a7ce3276e 100644
--- a/config/checkstyle-examples-suppressions.xml
+++ b/config/checkstyle-examples-suppressions.xml
@@ -6,6 +6,12 @@
 
 <suppressions>
 
+  <!-- The files have no exampleClassName by design. -->
+  <suppress id="exampleClassName"
+    files="outertypefilename[\\/]Example3.java"/>
+  <suppress id="exampleClassName"
+    files="outertypefilename[\\/]Example4.java"/>
+
   <!-- The file is used so examples can show how overridden methods are treated. -->
   <suppress id="exampleClassName"
     files="abbreviationaswordinname[\\/]SuperClass.java"/>
@@ -18,6 +24,10 @@
   <suppress id="exampleFileXmlConfigPresence"
     files="abbreviationaswordinname[\\/]SuperClass.java"/>
 
+  <!-- non class example files -->
+  <suppress id="exampleFileName" files="package-info.java"/>
+  <suppress id="exampleClassName" files="package-info.java"/>
+
   <!-- Check deals with tab characters. -->
   <suppress checks="FileTabCharacter|Indentation"
     files="filetabcharacter[\\/]Example\d+.java"/>
@@ -49,4 +59,12 @@
   <suppress checks="FileLength"
     files="visibilitymodifier[\\/]Example\d+.java"/>
 
+  <!-- No new line by design to show violation -->
+  <suppress checks="NewlineAtEndOfFile"
+    files="newlineatendoffile[\\/]Example\d+.*"/>
+
+  <!-- Example must show line length violations and suppressed violations -->
+  <suppress checks="LineLength"
+    files="suppresswithplaintextcommentfilter[\\/]Example9.java"/>
+
 </suppressions>
diff --git a/config/checkstyle-input-suppressions.xml b/config/checkstyle-input-suppressions.xml
index 373c3ce1459..61e7952e3a9 100644
--- a/config/checkstyle-input-suppressions.xml
+++ b/config/checkstyle-input-suppressions.xml
@@ -5,114 +5,57 @@
         "https://checkstyle.org/dtds/suppressions_1_1.dtd">
 
 <suppressions>
-
-  <!-- until https://github.com/checkstyle/checkstyle/issues/4845 -->
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]redundantimport[\\/]InputRedundantImportWithoutPackage.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderThirdPartyAndSpecial.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderThirdPartyAndSpecial2.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsAnnotations.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestSameFileNameGeneral.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestStarImports.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstarimport[\\/]InputAvoidStarImportAllowClass.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstarimport[\\/]InputAvoidStarImportAllowStaticMember.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstarimport[\\/]InputAvoidStarImportDefault.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstarimport[\\/]InputAvoidStarImportExcludes.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstaticimport[\\/]InputAvoidStaticImportDefault.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstaticimport[\\/]InputAvoidStaticImportDefault2.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstaticimport[\\/]InputAvoidStaticImportDefault3.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstaticimport[\\/]InputAvoidStaticImportDefault4.java"/>
+  <!-- permanent suppression as import needs to be of same package where class is -->
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]avoidstaticimport[\\/]InputAvoidStaticImportDefault5.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperAbstractSuperCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperAnnotationUseStyleCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault2.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperAtclauseOrderCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault3.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperBeforeExecutionExclusionFileFilter.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault4.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperNoCodeInFileCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault5.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperRightCurlyCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault6.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperSummaryJavadocCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault7.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperSuppressWarningsFilter.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault8.java"/>
+            files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperWriteTagCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault9.java"/>
+            files="[\\/]checks[\\/]imports[\\/]redundantimport[\\/]InputRedundantImportWithoutPackage.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderImportsContainingJava.java"/>
+            files="[\\/]checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderSingleLine.java"/>
+            files="[\\/]checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestSameFileNameGeneral.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderSpanMultipleLines.java"/>
+            files="[\\/]checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesAllIgnored.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrder_NoSeparator.java"/>
+            files="[\\/]checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesCommonPackage.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrder_OverlappingPatterns.java"/>
+            files="[\\/]checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesDirectPackages.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderThirdPartyAndSpecial.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderThirdPartyAndSpecial2.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault4.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault6.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderSingleLine.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderSingleLineList.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderSpanMultipleLines.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Wildcard.java"/>
+            files="[\\/]checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrder_OverlappingPatterns.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_WildcardUnspecified.java"/>
+            files="[\\/]checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]redundantimport[\\/]InputRedundantImportWithChecker.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImports.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImports2.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]indentation[\\/]indentation[\\/]InputIndentationAnonymousClassInMethodCurlyOnNewLine.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesAllIgnored.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesCommonPackage.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesDirectPackages.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]sizes[\\/]linelength[\\/]InputLineLengthLongImportStatements.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparator.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparator2.java"/>
+            files="[\\/]checks[\\/]imports[\\/]redundantimport[\\/]InputRedundantImportWithChecker.java"/>
   <suppress id="noCheckstyleInInputs"
           files="[\\/]packageobjectfactory[\\/]bar[\\/]FooCheck.java"/>
   <suppress id="noCheckstyleInInputs"
@@ -120,7389 +63,988 @@
   <suppress id="noCheckstyleInInputs"
           files="[\\/]packageobjectfactory[\\/]foo[\\/]FooCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperAbstractSuperCheck.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperAnnotationUseStyleCheck.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperAtclauseOrderCheck.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperBeforeExecutionExclusionFileFilter.java"/>
+          files="[\\/]packageobjectfactory[\\/]abc[\\/]FooCheck.java"/>
   <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperNoCodeInFileCheck.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperRightCurlyCheck.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperSummaryJavadocCheck.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperSuppressWarningsFilter.java"/>
-  <suppress id="noCheckstyleInInputs"
-          files="[\\/]meta[\\/]javadocmetadatascraper[\\/]InputJavadocMetadataScraperWriteTagCheck.java"/>
+          files="[\\/]packageobjectfactory[\\/]zoo[\\/]FooCheck.java"/>
 
   <!-- until https://github.com/checkstyle/checkstyle/issues/13213 -->
+
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationRecordsAndCompactCtors.java"/>
+            files="checks[\\/]coding[\\/]packagedeclaration[\\/]InputPackageDeclarationPlain.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineRecordsAndCompactCtors.java"/>
+            files="checks[\\/]coding[\\/]packagedeclaration[\\/]InputPackageDeclarationWithCommentOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineRecordsAndCompactCtors.java"/>
+            files="checks[\\/]coding[\\/]unnecessarysemicolonaftertypememberdeclaration[\\/]InputUnnecessarySemicolonAfterTypeMemberDeclarationNullAst.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleWithTrailingComma.java"/>
+            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistance3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersEscapedS.java"/>
+            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistance3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersEscapedS.java"/>
+            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceDefault2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceIfStatements.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceLabels.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentsAfterMethodCall.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentsAfterMethodCall.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentsAfterMethodCall.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationWithInMethodCallWithSameIndent.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocCustomTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocCustomTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocPositionOnlyComments.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocTokensPass.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocblocktaglocation[\\/]InputJavadocBlockTagLocationCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocblocktaglocation[\\/]InputJavadocBlockTagLocationMultilineCodeBlock.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression3.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression4.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression5.java"/>
+            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrimOptionProperty.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression5.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression5.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression5.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression5.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression5.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression5.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression6.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression6.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression6.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression6.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression6.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression6.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression7.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression7.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression7.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodDefaultAccessModifier.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchExpression7.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodDefaultAccessModifier.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]covariantequals[\\/]InputCovariantEqualsRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodEnum.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]defaultcomeslast[\\/]InputDefaultComesLastSwitchExpressionsSkipIfLast.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]defaultcomeslast[\\/]InputDefaultComesLastSwitchExpressionsSkipIfLast.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullEnhancedInstanceof.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullTextBlocks.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodIgnoreThrows.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodIgnoreThrows.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough3.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodInheritDoc.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough3.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodInheritDoc.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough3.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodInheritDoc.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough4.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableCheckRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]hiddenfield[\\/]InputHiddenFieldClassNestedInRecord.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiationLang2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltokentext[\\/]InputIllegalTokenTextTextBlocks.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltokentext[\\/]InputIllegalTokenTextTextBlocks.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypePackageClassName.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodLoadErrors.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocTagsDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocTagsDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodNoJavadocOnlyPrivateScope.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodNoJavadocProtectedScope.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodNoJavadocProtectedScope.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclarationRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclarationRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclarationRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodReceiverParameter.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodReceiverParameter.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCaseLabelElements.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressions.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressions.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressions.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressions.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsThree.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]missingswitchdefault[\\/]InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nofinalizer[\\/]InputNoFinalizerFallThrough.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nofinalizer[\\/]InputNoFinalizerFallThrough.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLine.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]packagedeclaration[\\/]InputPackageDeclarationDiffDirectory2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]packagedeclaration[\\/]InputPackageDeclarationDiffDirectoryAtParent2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]packagedeclaration[\\/]InputPackageDeclarationDiffDirectoryAtSubpackage2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordAsTopLevel.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordAsTopLevel.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordAsTopLevel.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordAsTopLevel.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodThrowsDetection.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordsAndCompactCtors.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisRecordsWithCheckFields.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]stringliteralequality[\\/]InputStringLiteralEqualityCheckTextBlocks.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]stringliteralequality[\\/]InputStringLiteralEqualityCheckTextBlocks.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesCheckPatterns.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesCheckPatterns.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessarysemicolonafteroutertypedeclaration[\\/]InputUnnecessarySemicolonAfterOuterTypeDeclarationRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableWithoutPackageStatement.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableWithoutPackageStatement.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]designforextension[\\/]InputDesignForExtensionRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassConstructorInRecord.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInRecord.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodsNotSkipWritten.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInRecord.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodsNotSkipWritten.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedStaticClassInsideInnerClass.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedStaticClassInsideInnerClass.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedStaticClassInsideInnerClass.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastRecords.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]onetoplevelclass[\\/]InputOneTopLevelClassEmpty.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]onetoplevelclass[\\/]package-info.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]InputVisibilityModifierPackageClassName.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderSamePackageDepth254.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderThirdPartyPackage.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderContainerOrdering.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderContainerOrdering.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderContainerOrdering.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStatic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticCaseSensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticCaseSensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticCaseSensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticCaseSensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticCaseSensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderEclipseStaticRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderGetGroupNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderGetGroupNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderGetGroupNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderGetGroupNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderMultiline.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderNonStaticWrongSequence.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderSimilarGroupPattern.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderSimilarGroupPattern.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsAbove.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsBottomSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsInflow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTop.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsTopSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupsUnordered.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultNegative.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_EclipseDefaultPositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_MultiplePatternMatches1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_MultiplePatternMatches1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_MultiplePatternMatches2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_MultiplePatternMatches2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderLotsOfRecords1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderLotsOfRecords2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderLotsOfRecords3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderLotsOfRecords4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodCompilationUnit.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeRecordComponents.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeRecordComponents2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodRecordsAndCtorsMinLineCount.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]booleanexpressioncomplexity[\\/]InputBooleanExpressionComplexityRecordLeaves.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]javancss[\\/]InputJavaNCSSRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]javancss[\\/]InputJavaNCSSRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]javancss[\\/]InputJavaNCSSRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierNoViolationRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]modifierorder[\\/]InputModifierOrderSealedAndNonSealed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]modifierorder[\\/]InputModifierOrderSealedAndNonSealed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]modifierorder[\\/]InputModifierOrderSealedAndNonSealedNoViolation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]modifierorder[\\/]InputModifierOrderSealedAndNonSealedNoViolation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]modifierorder[\\/]InputModifierOrderSealedAndNonSealedNoViolation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]modifierorder[\\/]InputModifierOrderSealedAndNonSealedNoViolation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]redundantmodifier[\\/]InputRedundantModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]redundantmodifier[\\/]InputRedundantModifierRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameOpenTransitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameOpenTransitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameOpenTransitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameParameterReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameParameterReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameParameterReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameParameterReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameUnderscore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameUnderscore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]illegalidentifiername[\\/]InputIllegalIdentifierNameUnderscore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNameRecordInInterfaceBody.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]recordcomponentname[\\/]InputRecordComponentNameDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]recordcomponentname[\\/]InputRecordComponentNameLowercase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]recordtypeparametername[\\/]InputRecordTypeParameterNameFoo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]recordtypeparametername[\\/]InputRecordTypeParameterNameFoo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]typename[\\/]InputTypeNameRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]typename[\\/]InputTypeNameRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]typename[\\/]InputTypeNameRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]lambdabodylength[\\/]InputLambdaBodyLengthSwitchExps.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]linelength[\\/]InputLineLengthIgnoringImportStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]linelength[\\/]InputLineLengthIgnoringPackageStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]linelength[\\/]InputLineLengthIgnoringPackageStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodcount[\\/]InputMethodCountRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthCompactCtorsCountEmpty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthCompactCtorsCountEmpty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumber.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberMax20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberPrivateModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]recordcomponentnumber[\\/]InputRecordComponentNumberTopLevel2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]uncommentedmain[\\/]InputUncommentedMainRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nolinewrap[\\/]InputNoLineWrapRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nolinewrap[\\/]InputNoLineWrapRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nolinewrap[\\/]InputNoLineWrapRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nolinewrap[\\/]InputNoLineWrapRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nolinewrap[\\/]InputNoLineWrapRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nowhitespacebefore[\\/]InputNoWhitespaceBeforeTextBlocksTabIndent.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nowhitespacebefore[\\/]InputNoWhitespaceBeforeTextBlocksTabIndent.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nowhitespacebefore[\\/]InputNoWhitespaceBeforeTextBlocksTabIndent.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nowhitespacebeforecasedefaultcolon[\\/]InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nowhitespacebeforecasedefaultcolon[\\/]InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nowhitespacebeforecasedefaultcolon[\\/]InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nowhitespacebeforecasedefaultcolon[\\/]InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapGuardedPatterns.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecordsSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecordsSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecordsSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecordsSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckRecordsSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespaceafter[\\/]InputWhitespaceAfterLiteralYield.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespaceafter[\\/]InputWhitespaceAfterSwitchStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundAllowEmptyCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundAllowEmptyCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundAllowEmptyCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecords.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecordsAllowEmptyTypes.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecordsAllowEmptyTypes.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecordsAllowEmptyTypes.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecordsAllowEmptyTypes.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecordsAllowEmptyTypes.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]whitespacearound[\\/]InputWhitespaceAroundRecordsAllowEmptyTypes.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCustomAnnotationsDeclared.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCustomAnnotationsDeclared.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationCustomAnnotationsDeclared.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationDeprecatedAndCustom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationDeprecatedAndCustom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationDeprecatedAndCustom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationEmpty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationMultiple.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationSingleParameterless.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationWithoutAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationWithoutAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationlocation[\\/]inputs[\\/]PackageAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineCheck.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineCheck.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineCheck2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineCheck2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineCheck3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationonsameline[\\/]InputAnnotationOnSameLineCheck3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyle.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleEverythingMixed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleNoTrailingCommaNever.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleParams.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleWithTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleWithTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleWithTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleWithTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleWithTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]annotationusestyle[\\/]InputAnnotationUseStyleWithTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingdeprecated[\\/]InputMissingDeprecatedGood.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingdeprecated[\\/]InputMissingDeprecatedSingleComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadAnnotationJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadAnnotationJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadAnnotationJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadAnnotationJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideBadOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverride.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverride.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverride.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObject.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObject.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObject.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObject.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObject.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObject.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObjectJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObjectJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObjectJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObjectJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObjectJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromObjectJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOther.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOther.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOther.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOther.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOther.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOther.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideFromOtherJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideGoodOverrideJava5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]missingoverride[\\/]InputMissingOverrideNotOverride.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]packageannotation[\\/]InputPackageAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]suppresswarnings[\\/]InputSuppressWarningsConstants.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]suppresswarnings[\\/]InputSuppressWarningsConstants.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]annotation[\\/]suppresswarnings[\\/]InputSuppressWarningsValuePair.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]arraytypestyle[\\/]InputArrayTypeStyleNestedGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]arraytypestyle[\\/]InputArrayTypeStyleNestedGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]arraytypestyle[\\/]InputArrayTypeStyleNestedGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]avoidnestedblocks[\\/]InputAvoidNestedBlocksAllowInSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]avoidnestedblocks[\\/]InputAvoidNestedBlocksAllowInSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]avoidnestedblocks[\\/]InputAvoidNestedBlocksAllowInSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]avoidnestedblocks[\\/]InputAvoidNestedBlocksDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]avoidnestedblocks[\\/]InputAvoidNestedBlocksDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]avoidnestedblocks[\\/]InputAvoidNestedBlocksDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockAnnotationDefaultKeyword.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic2Statement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic2Statement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic2Statement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic2Text.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic2Text.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemantic2Text.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticInvalid.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticInvalid.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticInvalid.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticText.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticText.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticText.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticText.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticText.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockSemanticText.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockTestUppercaseOptionProperty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockTestUppercaseOptionProperty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptyblock[\\/]InputEmptyBlockWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyCommentBeforeLeftCurly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyDefaultTestNlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyIgnoreEnumsOptTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyMethodTestNewLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefaultLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefaultWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefaultWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefaultWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestDefaultWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestFirstLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLine3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLineOptionWithLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNewLineOptionWithLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlowWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlowWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlowWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyTestNlowWithAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithEmojiNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]leftcurly[\\/]InputLeftCurlyWithTrimOptionProperty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesEmptySingleLineDefaultStmt.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesLoopBodyTrue.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesSingleLineStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesSingleLineStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesSingleLineStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesSingleLineStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestCycles.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestCycles.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestCycles.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestItWithAllowsOn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestItWithAllowsOn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestItWithAllowsOn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestItWithAllowsOn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestItWithAllowsOn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineCaseDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]needbraces[\\/]InputNeedBracesTestSingleLineLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestNewLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyLeftTestShouldStartLine2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyNewTokensAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyNewTokensAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestEmptyOnSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestForceLineBreakBefore2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestForceLineBreakBefore2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestForceLineBreakBefore2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestForceLineBreakBefore2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestForceLineBreakBefore2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestInvalidOption.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneOrSinglelineLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneOrSinglelineLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneOrSinglelineLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsAloneOrSinglelineLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsSameLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsSameLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsSameLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsSameLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsSameLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestIsSameLambda.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestNullPointerException.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptSameBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptSameBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptSameBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptSameBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptSameBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptSameBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptSameBlocksWithSemi.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestOptionAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSameNewTokens.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSameNewTokens.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSameOmitOneLiners.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSingleLineClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestSwitchCase5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestTryWithResourceAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestTryWithResourceSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestTryWithResourceSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestTryWithResourceSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestTryWithResourceSame.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTestWithoutFinally.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTryWithResourceAloneSingle.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTryWithResourceAloneSingle.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTryWithResourceAloneSingle.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyTryWithResourceAloneSingle.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmojiAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmojiAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmojiAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmojiAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]rightcurly[\\/]InputRightCurlyWithEmojiAloneOrSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]avoidinlineconditionals[\\/]InputAvoidInlineConditionals.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]avoidinlineconditionals[\\/]InputAvoidInlineConditionals.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]declarationorder[\\/]InputDeclarationOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]declarationorder[\\/]InputDeclarationOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]declarationorder[\\/]InputDeclarationOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]defaultcomeslast[\\/]InputDefaultComesLastDefaultMethodsInInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]defaultcomeslast[\\/]InputDefaultComesLastDefaultMethodsInInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]defaultcomeslast[\\/]InputDefaultComesLastDefaultMethodsInInterface2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNull.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullIgnoreCase.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullSuperClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCode.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeEqualsParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughFallThroughLotsOfComment2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughStringSwitch.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableLeavingSlistToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableMultiCatch.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableMultipleAndNestedConditions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableNativeMethods.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableReceiverParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableSwitchStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]hiddenfield[\\/]InputHiddenField8.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]hiddenfield[\\/]InputHiddenFieldReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiationBeginTree1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiationBeginTree2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiationLang3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiationNameSimilarToStandardClasses.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiationSameClassNameJavaLang.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalinstantiation[\\/]InputIllegalInstantiationSemantic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsIgnoreMethodNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsIgnoreMethodNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsIgnoreOverriddenMethods.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsIgnoreOverriddenMethods.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsTestClassNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsTestClassNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsTestDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsTestIllegalClassNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegalthrows[\\/]InputIllegalThrowsTestIllegalClassNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltokentext[\\/]InputIllegalTokenTextDefaultFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeAbstractClassNameFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeEmptyStringMemberModifiers.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeEmptyStringMemberModifiers.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeGregCal.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSameFileNameFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeSimilarClassName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestAbstractClassNamesFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestAbstractClassNamesFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestAbstractClassNamesFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestAbstractClassNamesFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestClearDataBetweenFiles.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestClearDataBetweenFiles.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestClearDataBetweenFiles.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestClearDataBetweenFiles.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestDefaults.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestDefaults.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestExtendsImplements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestIgnoreMethodNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestLegalAbstractClassNames.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeTestSameFileNameGeneral.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeWhitespaceInConfig.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]innerassignment[\\/]InputInnerAssignmentLambdaExpressions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreFieldDeclaration1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreHashCodeMethod1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNegativeOctalHex1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIgnoreNone1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberIntegersOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberLocalVariables2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberMagicNumber3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberMagicNumber3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]magicnumber[\\/]InputMagicNumberWaiverParentToken3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathAvoidInstanceCreationWithoutVar.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathExecutableStatementCount.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathForbidParameterizedConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathForbidPrintStackTrace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathIllegalThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathIllegalThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathNoStackoverflowError.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathSingleLineComments.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]modifiedcontrolvariable[\\/]InputModifiedControlVariableEnhancedForLoopVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]multiplestringliterals[\\/]InputMultipleStringLiteralsNoWarnings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedfordepth[\\/]InputNestedForDepth1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedfordepth[\\/]InputNestedForDepth1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nestedifdepth[\\/]InputNestedIfDepthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nofinalizer[\\/]InputNoFinalizerFallThrough.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]nofinalizer[\\/]InputNoFinalizerFallThrough.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineBeginTree2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineBeginTreeTest.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineBeginTreeTest.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineSingleLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineTest.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineTryWithResourcesIgnore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineTryWithResourcesIgnore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineTryWithResourcesIgnore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineTryWithResourcesIgnore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineTryWithResourcesIgnore.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]packagedeclaration[\\/]InputPackageDeclarationPlain.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]packagedeclaration[\\/]InputPackageDeclarationWithCommentOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]parameterassignment[\\/]InputParameterAssignmentReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]parameterassignment[\\/]InputParameterAssignmentReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThis15Extensions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisAllowLocalVars.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisAnnotationInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisBraceAlone.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisCaseGroup.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisEnumConstant.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisExtendedMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisFinalInstanceVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisLocalClassesInsideLambdas.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisMethodReferences.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisStatic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisTryWithResourcesOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisValidateOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisValidateOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisValidateOnlyOverlappingFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]requirethis[\\/]InputRequireThisValidateOnlyOverlappingTrue2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]returncount[\\/]InputReturnCountLambda4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]simplifybooleanexpression[\\/]InputSimplifyBooleanExpression.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]simplifybooleanexpression[\\/]InputSimplifyBooleanExpression.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]simplifybooleanexpression[\\/]InputSimplifyBooleanExpression.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]simplifybooleanexpression[\\/]InputSimplifyBooleanExpression.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]simplifybooleanexpression[\\/]InputSimplifyBooleanExpression.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]superclone[\\/]InputSuperCloneMethodReference.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]superclone[\\/]InputSuperCloneWithoutWarnings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIdentifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIdentifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIdentifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIdentifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesIfStatement2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessaryparentheses[\\/]InputUnnecessaryParenthesesOperator3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unnecessarysemicolonaftertypememberdeclaration[\\/]InputUnnecessarySemicolonAfterTypeMemberDeclarationNullAst.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariable2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableAnonInnerClasses.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableAnonInnerClasses.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableEnum.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableEnum.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableEnum.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableGenericAnonInnerClasses.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableNestedClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableNestedClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableNestedClasses3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableNestedClasses3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableNestedClasses3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableTernaryAndExpressions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableTernaryAndExpressions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]unusedlocalvariable[\\/]InputUnusedLocalVariableTernaryAndExpressions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistance3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistance3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceIfStatements.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]variabledeclarationusagedistance[\\/]InputVariableDeclarationUsageDistanceLabels.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]descendanttoken[\\/]InputDescendantTokenIllegalTokens.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]descendanttoken[\\/]InputDescendantTokenIllegalTokens5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]descendanttoken[\\/]InputDescendantTokenIllegalTokens6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]descendanttoken[\\/]InputDescendantTokenReturnFromFinally2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]descendanttoken[\\/]InputDescendantTokenTestLimitedToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]designforextension[\\/]InputDesignForExtensionMultipleAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassAnonymousInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassAnonymousInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassAnonymousInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassAnonymousInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassAnonymousInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassEnum.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassEnum.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassInnerAndNestedClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassInnerAndNestedClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassInnerAndNestedClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassInnerAndNestedClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassInnerAndNestedClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInEnumWithAnonInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInEnumWithAnonInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInInterfaceWithAnonInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInInterfaceWithAnonInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInInterfaceWithAnonInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassNestedInInterfaceWithAnonInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassPrivateCtor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassPrivateCtor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassPrivateCtor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassPrivateCtor2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassPrivateCtor2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]finalclass[\\/]InputFinalClassPrivateCtor2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorAbstract.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorAbstractSerializable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorDesignForExtension.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorNonUtilityClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorPrivate.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorRegression.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorSerializable.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]hideutilityclassconstructor[\\/]InputHideUtilityClassConstructorSerializableInnerStatic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastClassRootClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]innertypelast[\\/]InputInnerTypeLastClassRootClass2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]mutableexception[\\/]InputMutableExceptionClassExtendsGenericClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]onetoplevelclass[\\/]InputOneTopLevelClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]onetoplevelclass[\\/]InputOneTopLevelClassAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]onetoplevelclass[\\/]InputOneTopLevelClassEnum.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]onetoplevelclass[\\/]InputOneTopLevelClassInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]InputVisibilityModifierGregorianCalendar.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]InputVisibilityModifierImmutableStarImport.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]InputVisibilityModifierImmutableStarImport2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]InputVisibilityModifierIsStarImport.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]InputVisibilityModifierLocalAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]InputVisibilityModifiersPublicImmutable3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]design[\\/]visibilitymodifier[\\/]inputs[\\/]InetSocketAddress.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]finalparameters[\\/]InputFinalParametersReceiver.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]avoidstaticimport[\\/]InputAvoidStaticImportNestedClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderDefault8.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderNoValid.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrderSpecialImportsRegExp.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrder_MultiplePatternMatches.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrder_MultiplePatternMatches2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrder_MultiplePatternMatches3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]customimportorder[\\/]InputCustomImportOrder_NoImports.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]illegalimport[\\/]InputIllegalImportDefault7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControl11.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControl18.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControl20.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControl23.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControl24.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControl7.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControl8.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControlBeginTree2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importcontrol[\\/]InputImportControlWithoutRegexAndWithStrategyOnMismatch.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderBeginTree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderBug.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderCaseInsensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderCaseInsensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderCaseInsensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderCaseInsensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderCaseInsensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderCaseInsensitive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderNoGapBetweenStaticImports.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderNoGapBetweenStaticImports.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderNoGapBetweenStaticImports.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderNoGapBetweenStaticImports.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderRepetition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderSortStaticImportsAlphabetically1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderSortStaticImportsAlphabetically1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderSortStaticImportsAlphabetically1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderSortStaticImportsAlphabetically1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderSortStaticImportsAlphabetically2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupOrderBottom_Negative3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticGroupSeparated.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrder2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrderBottom1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrderBottom1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrderBottom2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrderBottom2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticOnDemandGroupOrderBottom3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrderStaticRepetition2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Above.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Bottom.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_DotPackageName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_DotPackageName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_DotPackageName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_DotPackageName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_HonorsTokensProperty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_InFlow.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_NoFailureForRedundantImports.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Top2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Under.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Wildcard.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Wildcard.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_Wildcard.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_WildcardUnspecified.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_WildcardUnspecified.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]importorder[\\/]InputImportOrder_WildcardUnspecified.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]redundantimport[\\/]InputRedundantImportBug.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]redundantimport[\\/]InputRedundantImportWithoutWarnings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImports15Extensions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsArrayRef.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsBug.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsFromJavaLang.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsFromJavaLang.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsFromJavaLang.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsFromJavaLang.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsJavadocQualifiedName.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsShadowed.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsWithBlockMethodParameters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsWithNewlinesInsideTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsWithValueTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]imports[\\/]unusedimports[\\/]InputUnusedImportsWithoutWarnings.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentIsAtTheEndOfBlock.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentIsAtTheEndOfBlock.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentsAfterMethodCall.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentsAfterMethodCall.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentsAfterMethodCall.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationNoNpe.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationWithInMethodCallWithSameIndent.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocCorrectParagraph.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocCustomTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocCustomTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocJavadocTagsWithoutArgs.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTagsNoViolation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTagsNoViolation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocPosition.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocPositionOnlyComments.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocPositionWithSinglelineComments.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocTokensPass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrder1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderCorrect1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderCorrect2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderCorrect3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderCorrect4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderIncorrect4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]atclauseorder[\\/]InputAtclauseOrderIncorrectCustom1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocblocktaglocation[\\/]InputJavadocBlockTagLocationCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocblocktaglocation[\\/]InputJavadocBlockTagLocationMultilineCodeBlock.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationFirstLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrailingSpace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoccontentlocation[\\/]InputJavadocContentLocationTrimOptionProperty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodDefaultAccessModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodDefaultAccessModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodEnum.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtendAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodExtraThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodGenerics.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodIgnoreThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodIgnoreThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodInheritDoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodInheritDoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodInheritDoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodJavadocInMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodLoadErrors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocNoMissingTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocTagsDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodMissingJavadocTagsDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodNoJavadocOnlyPrivateScope.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodNoJavadocProtectedScope.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodNoJavadocProtectedScope.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodProtectedScopeJavadoc.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodPublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodReceiverParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodReceiverParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSetterGetter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodSurroundingAccessModifier.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodThrowsDetection.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodTypeParamsTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_03.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethod_1379666.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodsNotSkipWritten.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmethod[\\/]InputJavadocMethodsNotSkipWritten.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingleadingasterisk[\\/]InputJavadocMissingLeadingAsteriskCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingwhitespaceafterasterisk[\\/]InputJavadocMissingWhitespaceAfterAsteriskValid.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingwhitespaceafterasterisk[\\/]InputJavadocMissingWhitespaceAfterAsteriskValid.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingwhitespaceafterasterisk[\\/]InputJavadocMissingWhitespaceAfterAsteriskValidWithTab.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocmissingwhitespaceafterasterisk[\\/]InputJavadocMissingWhitespaceAfterAsteriskValidWithTab.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocpackage[\\/]pkghtml[\\/]InputJavadocPackageHtmlIgnored2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocparagraph[\\/]InputJavadocParagraphCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocparagraph[\\/]InputJavadocParagraphCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleCheckOptionLowercaseProperty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleCheckOptionLowercaseProperty.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleDefaultSettingsTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEmptyJavadoc4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleEnumCtorScopeIsPrivate.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleExcludeScope4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFormatTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceFour.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceThree.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleFirstSentenceTwo.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtml4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleHtmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleInterfaceMemberScopeIsPublic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleInterfaceMemberScopeIsPublic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleInterfaceMemberScopeIsPublic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNeverEndingXmlComment.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleNothing.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleRestrictedTokenSet4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePackage4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopeProtected4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocstyle[\\/]InputJavadocStyleScopePublic4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationGuavaFalsePositive.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeAllowedAnnotations_3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeBadTag_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeBadTag_1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeInterfaceMemberScopeIsPublic.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeNoJavadocOnInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeNoJavadocOnInterface.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerClasses1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerClasses1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocTypeTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocvariable[\\/]InputJavadocVariableInner2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocvariable[\\/]InputJavadocVariableInner2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]javadocvariable[\\/]InputJavadocVariableInner2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodAllowedAnnotations.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodEnumCtorScopeIsPrivate.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodIgnoreNameRegex.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodIgnoreNameRegex.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodIgnoreNameRegex.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodInterfacePrivateMethod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodMissingJavadocTags.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodReceiverParameter.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodSetterGetter2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodSetterGetter2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodSetterGetter2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethod_01.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethod_02.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodsNotSkipWritten.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]InputMissingJavadocPackageNotPackageInfo-package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]annotation[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]blank[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]header[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]singleline[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeMultipleQualifiedAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeMultipleQualifiedAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeMultipleQualifiedAnnotation.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation5.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotationWithParameters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotationWithParameters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotationWithParameters.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeUnusedParamInJavadocForClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]nonemptyatclausedescription[\\/]InputNonEmptyAtclauseDescriptionOne.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]requireemptylinebeforeblocktaggroup[\\/]InputRequireEmptyLineBeforeBlockTagGroupCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]requireemptylinebeforeblocktaggroup[\\/]InputRequireEmptyLineBeforeBlockTagGroupCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]requireemptylinebeforeblocktaggroup[\\/]InputRequireEmptyLineBeforeBlockTagGroupCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]requireemptylinebeforeblocktaggroup[\\/]InputRequireEmptyLineBeforeBlockTagGroupCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]requireemptylinebeforeblocktaggroup[\\/]InputRequireEmptyLineBeforeBlockTagGroupCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]requireemptylinebeforeblocktaggroup[\\/]InputRequireEmptyLineBeforeBlockTagGroupCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]requireemptylinebeforeblocktaggroup[\\/]InputRequireEmptyLineBeforeBlockTagGroupCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocEmptyPeriod.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationBlockTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
+            files="checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentationGuavaFalsePositive.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocNoPeriod.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodAllowedAnnotations.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocTestForbiddenFragments2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodEnumCtorScopeIsPrivate.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDefault.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodIgnoreNameRegex.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDefault.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodIgnoreNameRegex.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDefault.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodIgnoreNameRegex.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDoubleTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodInterfacePrivateMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDoubleTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodMissingJavadocTags.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDoubleTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagEmptyTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagEmptyTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagEmptyTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagExpressionError.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagExpressionError.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagExpressionError.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIncomplete.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIncomplete.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIncomplete.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMethod.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingFormat.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingFormat.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingFormat.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingTag.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagSeverity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagSeverity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagSeverity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]booleanexpressioncomplexity[\\/]InputBooleanExpressionComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]booleanexpressioncomplexity[\\/]InputBooleanExpressionComplexityLeaves.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]booleanexpressioncomplexity[\\/]InputBooleanExpressionComplexityNPE.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]booleanexpressioncomplexity[\\/]InputBooleanExpressionComplexitySmall.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCoupling2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCoupling5.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]inputs[\\/]a[\\/]aa[\\/]AAClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]inputs[\\/]a[\\/]ab[\\/]ABClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]inputs[\\/]b[\\/]BClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classdataabstractioncoupling[\\/]inputs[\\/]c[\\/]CClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodPublicOnly3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodReceiverParameter.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodScopeAnonInner2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodSetterGetter2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodSetterGetter2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodSetterGetter2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethod_01.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethod_02.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocmethod[\\/]InputMissingJavadocMethodsNotSkipWritten.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]InputMissingJavadocPackageNotPackageInfo-package-info.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]annotation[\\/]package-info.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]blank[\\/]package-info.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]header[\\/]package-info.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]package-info.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadocpackage[\\/]singleline[\\/]package-info.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeMultipleQualifiedAnnotation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeMultipleQualifiedAnnotation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeMultipleQualifiedAnnotation.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexity4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesAllIgnored.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesDirectPackages.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesDirectPackages.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation4.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityExcludedPackagesDirectPackages.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation5.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityMultiDimensionalArray.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation5.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityPackageName.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotation5.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityRemoveIncorrectAnnotationToken.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotationWithParameters.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityRemoveIncorrectTypeParameter.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotationWithParameters.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]InputClassFanOutComplexityVar.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeQualifiedAnnotationWithParameters.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]inputs[\\/]a[\\/]aa[\\/]AAClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]inputs[\\/]a[\\/]ab[\\/]ABClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]inputs[\\/]b[\\/]BClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]classfanoutcomplexity[\\/]inputs[\\/]c[\\/]CClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]cyclomaticcomplexity[\\/]InputCyclomaticComplexitySwitchBlocks3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]cyclomaticcomplexity[\\/]InputCyclomaticComplexitySwitchBlocks4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]javancss[\\/]InputJavaNCSS2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]javancss[\\/]InputJavaNCSS3.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]javancss[\\/]InputJavaNCSSResolveMutation.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]javancss[\\/]InputJavaNCSSResolveMutation.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerClasses2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]metrics[\\/]npathcomplexity[\\/]InputNPathComplexityDefault2.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]classmemberimpliedmodifier[\\/]InputClassMemberImpliedModifierOnClassNoViolations.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]interfacememberimpliedmodifier[\\/]InputInterfaceMemberImpliedModifierFieldsOnClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]interfacememberimpliedmodifier[\\/]InputInterfaceMemberImpliedModifierFieldsOnInterface5.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]interfacememberimpliedmodifier[\\/]InputInterfaceMemberImpliedModifierMethodsOnClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]interfacememberimpliedmodifier[\\/]InputInterfaceMemberImpliedModifierMethodsOnInterface4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]interfacememberimpliedmodifier[\\/]InputInterfaceMemberImpliedModifierNestedOnClass.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]interfacememberimpliedmodifier[\\/]InputInterfaceMemberImpliedModifierNestedOnInterface4.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]interfacememberimpliedmodifier[\\/]InputInterfaceMemberImpliedModifierPrivateMethods.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]modifierorder[\\/]InputModifierOrderDefaultMethods.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]modifier[\\/]redundantmodifier[\\/]InputRedundantModifierStaticMethodInInterface.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameAbstractMultisetSetCount.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameReceiver.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeScopeInnerInterfaces2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations1.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameTypeSnakeStyle.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassName.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations3.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassName.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassName.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassName.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassName.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameCustom.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeSkipAnnotations4.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameCustom.java"/>
+            files="checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeUnusedParamInJavadocForClass.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameCustom.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameFormerFalsePositive.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocEmptyPeriod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameFormerFalsePositive.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameType.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameType.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameType.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameType.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameType.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocHtmlFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameType.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameVariants.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]abstractclassname[\\/]InputAbstractClassNameVariants.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]catchparametername[\\/]InputCatchParameterName2.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]catchparametername[\\/]InputCatchParameterName2.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]catchparametername[\\/]InputCatchParameterName3.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]catchparametername[\\/]InputCatchParameterName3.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]catchparametername[\\/]InputCatchParameterName3.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]catchparametername[\\/]InputCatchParameterName3.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]catchparametername[\\/]InputCatchParameterNameSimple.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]constantname[\\/]InputConstantName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]constantname[\\/]InputConstantNameInterfaceIgnorePublic.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]constantname[\\/]InputConstantNameInterfaceIgnorePublic.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]constantname[\\/]InputConstantNameInterfaceIgnorePublic.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]constantname[\\/]InputConstantNameInterfaceIgnorePublic.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]constantname[\\/]InputConstantNameStaticModifierInInterface.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]localfinalvariablename[\\/]InputLocalFinalVariableNameInnerClass.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]localfinalvariablename[\\/]InputLocalFinalVariableNameTryResourcesJava9.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]localvariablename[\\/]InputLocalVariableNameInnerClass.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNameExtra.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNamePrivateMethodsInInterfaces.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNamePrivateMethodsInInterfaces.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNamePublicMethodsInInterfaces.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNamePublicMethodsInInterfaces.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNamePublicMethodsInInterfaces.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]methodname[\\/]InputMethodNamePublicMethodsInInterfaces.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]packagename[\\/]InputPackageNameSimple.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineCorrect.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterName.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameAccessModifier.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameCatchOnly.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameCatchOnly.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameLambda.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameLambda.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameLambda.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineForbidden.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameLambda.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameLambda.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameLambda.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameLambda.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOne.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocInlineReturn.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOne.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocNoPeriod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOne.java"/>
+            files="checks[\\/]javadoc[\\/]summaryjavadoc[\\/]InputSummaryJavadocTestForbiddenFragments2.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOne.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOne.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOne.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDefault.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOne.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDoubleTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotation.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDoubleTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotation.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagDoubleTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotationNoNPE.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagEmptyTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotationNoNPE.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagEmptyTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotationNoNPE.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagEmptyTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotationNoNPE.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagExpressionError.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotationOne.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagExpressionError.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameOverrideAnnotationOne.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagExpressionError.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameReceiver.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameWhitespaceInAccessModifierProperty.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]parametername[\\/]InputParameterNameWhitespaceInConfig.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]staticvariablename[\\/]InputStaticVariableName.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIgnore.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]naming[\\/]staticvariablename[\\/]InputStaticVariableName2.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIncomplete.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]newlineatendoffile[\\/]InputNewlineAtEndOfFileCr.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIncomplete.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]newlineatendoffile[\\/]InputNewlineAtEndOfFileCr2.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagIncomplete.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]newlineatendoffile[\\/]InputNewlineAtEndOfFileCrlf2.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMethod.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]newlineatendoffile[\\/]InputNewlineAtEndOfFileCrlf3.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]newlineatendoffile[\\/]InputNewlineAtEndOfFileLf.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]newlineatendoffile[\\/]InputNewlineAtEndOfFileLf2.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingFormat.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]newlineatendoffile[\\/]InputNewlineAtEndOfFileTestTrimProperty.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]nocodeinfile[\\/]InputNoCodeInFile4.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilename1.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagMissingTag.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilename15Extensions.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilename2.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilename3.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilenameBeginTree1.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagRegularExpression.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilenameBeginTree2.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagSeverity.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilenameCheckPublic.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagSeverity.java"/>
   <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]outertypefilename[\\/]InputOuterTypeFilenameIllegalTokens.java"/>
+            files="checks[\\/]javadoc[\\/]writetag[\\/]InputWriteTagSeverity.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]regexp[\\/]regexp[\\/]InputRegexpCheckB3.java"/>
   <suppress id="UnnecessaryOkComment"
@@ -7683,48 +1225,12 @@
             files="checks[\\/]sizes[\\/]executablestatementcount[\\/]InputExecutableStatementCountLambdas.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]sizes[\\/]executablestatementcount[\\/]InputExecutableStatementCountMaxZero.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]filelength[\\/]InputFileLength2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]filelength[\\/]InputFileLength3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]filelength[\\/]InputFileLength4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]filelength[\\/]InputFileLengthDefault.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]lambdabodylength[\\/]InputLambdaBodyLengthMax.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodcount[\\/]InputMethodCount.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodcount[\\/]InputMethodCount4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodcount[\\/]InputMethodCount6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthCountEmptyIsFalse.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthCountEmptySmallSize.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthCountEmptySmallSize.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthCountEmptySmallSize.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthModifier.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]sizes[\\/]outertypenumber[\\/]InputOuterTypeNumberEmptyInner.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]sizes[\\/]outertypenumber[\\/]InputOuterTypeNumberSimple1.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]sizes[\\/]parameternumber[\\/]InputParameterNumberSimple3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]uncommentedmain[\\/]InputUncommentedMain2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]uncommentedmain[\\/]InputUncommentedMain3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]uncommentedmain[\\/]InputUncommentedMain4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]uncommentedmain[\\/]InputUncommentedMainBeginTreePackage1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]upperell[\\/]InputUpperEllSemantic.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]whitespace[\\/]emptyforiteratorpad[\\/]InputEmptyForIteratorPad2.java"/>
   <suppress id="UnnecessaryOkComment"
@@ -7841,26 +1347,6 @@
             files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]packageinfo[\\/]test1[\\/]package-info.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]whitespace[\\/]emptylineseparator[\\/]packageinfo[\\/]test2[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]genericwhitespace[\\/]InputGenericWhitespaceEndsTheLine.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]genericwhitespace[\\/]InputGenericWhitespaceInnerClass.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]genericwhitespace[\\/]InputGenericWhitespaceList.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]genericwhitespace[\\/]InputGenericWhitespaceMethodRef1.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]genericwhitespace[\\/]InputGenericWhitespaceWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]methodparampad[\\/]InputMethodParamPad4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]methodparampad[\\/]InputMethodParamPadSetOptionTrim.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]methodparampad[\\/]InputMethodParamPadWhitespaceAround.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nolinewrap[\\/]InputNoLineWrapGood.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]nolinewrap[\\/]InputNoLineWrapGood.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]whitespace[\\/]nowhitespaceafter[\\/]InputNoWhitespaceAfterArrayDeclarations3.java"/>
   <suppress id="UnnecessaryOkComment"
@@ -8057,78 +1543,6 @@
             files="checks[\\/]whitespace[\\/]nowhitespacebefore[\\/]InputNoWhitespaceBeforeWithEmoji.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]whitespace[\\/]nowhitespacebefore[\\/]InputNoWhitespaceBeforeWithEmoji.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrap6.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapArrayAssign.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapArrayAssign.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapArrayAssign.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapArrayAssign.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapArrayAssign.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapArrayAssign.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapArrayAssign.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapEol.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapNl.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapTryWithResources.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]whitespace[\\/]operatorwrap[\\/]InputOperatorWrapWithTrimOptionProperty.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]whitespace[\\/]parenpad[\\/]InputParenPadCheckEmoji.java"/>
   <suppress id="UnnecessaryOkComment"
@@ -8389,8 +1803,6 @@
             files="utils[\\/]checkutil[\\/]InputCheckUtilPackage.java"/>
   <suppress id="UnnecessaryOkComment"
             files="utils[\\/]checkutil[\\/]package-info.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]blocks[\\/]emptycatchblock[\\/]InputEmptyCatchBlockDefault.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]javadoc[\\/]javadoctype[\\/]InputJavadocType1.java"/>
   <suppress id="UnnecessaryOkComment"
diff --git a/config/checkstyle-non-main-files-checks.xml b/config/checkstyle-non-main-files-checks.xml
index 673ee35dab5..921dd0b4514 100644
--- a/config/checkstyle-non-main-files-checks.xml
+++ b/config/checkstyle-non-main-files-checks.xml
@@ -57,7 +57,7 @@
     <property name="id" value="lineLength"/>
     <!-- catch lines above 100 symbols -->
     <property name="format"
-             value="^(?!(.*value=.*Example\d+|.*href=|.*http(s)?:|import |(.* )?package |.* files=|.*\.dtd| \* \{@code| \* com\.)).{101,}$"/>
+             value="^(?!(.*value=.*|.*href=|.*http(s)?:|import |(.* )?package |.* files=|.*\.dtd| \* \{@code| \* com\.)).{101,}$"/>
     <property name="message" value="Line should not be longer than 100 symbols"/>
   </module>
 
@@ -127,4 +127,40 @@
     <property name="message"
               value="Workflow job steps should have empty lines between each other"/>
   </module>
+
+  <module name="RegexpSingleline">
+    <property name="id" value="exampleMacroMustExist"/>
+    <property name="format" value="&lt;macro name=&quot;example&quot;&gt;"/>
+    <property name="fileExtensions" value="xml.template"/>
+    <property name="minimum" value="1"/>
+    <property name="maximum" value="9999"/>
+    <property name="message" value="Example macro usage is required in template files."/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <property name="id" value="parentModuleMacroMustExist"/>
+    <property name="format" value="&lt;macro name=&quot;parent-module&quot;&gt;"/>
+    <property name="fileExtensions" value="xml.template"/>
+    <property name="minimum" value="1"/>
+    <property name="maximum" value="9999"/>
+    <property name="message" value="Parent module macro usage is required in template files."/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <property name="id" value="violationMessagesModuleMacroMustExist"/>
+    <property name="format" value="&lt;macro name=&quot;violation-messages&quot;&gt;"/>
+    <property name="fileExtensions" value="xml.template"/>
+    <property name="minimum" value="1"/>
+    <property name="maximum" value="9999"/>
+    <property name="message" value="Violation messages macro usage is required in template files."/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <property name="id" value="propertiesMacroMustExist"/>
+    <property name="format" value="&lt;macro name=&quot;properties&quot;&gt;"/>
+    <property name="fileExtensions" value="xml.template"/>
+    <property name="minimum" value="1"/>
+    <property name="maximum" value="9999"/>
+    <property name="message" value="Properties macro usage is required in template files."/>
+  </module>
 </module>
diff --git a/config/checkstyle-non-main-files-suppressions.xml b/config/checkstyle-non-main-files-suppressions.xml
index 315e719da7d..57063d40aa3 100644
--- a/config/checkstyle-non-main-files-suppressions.xml
+++ b/config/checkstyle-non-main-files-suppressions.xml
@@ -167,4 +167,118 @@
   <!-- We use negative suppression to check workflow files only. -->
   <suppress id="workflowJobStepSpacing" files="^.((?!github[\\/]workflows[\\/]).)*$" />
 
+  <!-- Examples macro suppressions -->
+  <suppress id="exampleMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]imports[\\/]importcontrol.xml.template"/>
+  <suppress id="exampleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppressionfilter.xml.template"/>
+  <suppress id="exampleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppressionxpathfilter.xml.template"/>
+
+  <!-- there is no messages in module by design -->
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]annotation[\\/]suppresswarningsholder.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filefilters[\\/]beforeexecutionexclusionfilefilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]severitymatchfilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppressioncommentfilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppressionfilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppressionsinglefilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppressionxpathfilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppressionxpathsinglefilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppresswarningsfilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppresswithnearbycommentfilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppresswithnearbytextfilter.xml.template"/>
+  <suppress id="violationMessagesModuleMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppresswithplaintextcommentfilter.xml.template"/>
+
+  <!-- no properties in module by design -->
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]annotation[\\/]packageannotation.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]avoiddoublebraceinitialization.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]avoidinlineconditionals.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]avoidnoargumentsuperconstructorcall.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]constructorsdeclarationgrouping.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]covariantequals.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]emptystatement.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]equalshashcode.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]innerassignment.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]missingctor.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]missingswitchdefault.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]multiplevariabledeclarations.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]noarraytrailingcomma.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]noclone.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]noenumtrailingcomma.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]nofinalizer.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]overloadmethodsdeclarationorder.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]parameterassignment.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]simplifybooleanexpression.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]simplifybooleanreturn.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]stringliteralequality.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]superclone.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]superfinalize.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]unnecessarysemicoloninenumeration.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]coding[\\/]unusedlocalvariable.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]design[\\/]finalclass.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]design[\\/]hideutilityclassconstructor.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]design[\\/]innertypelast.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]design[\\/]onetoplevelclass.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]imports[\\/]redundantimport.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]javadoc[\\/]invalidjavadocposition.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]javadoc[\\/]missingjavadocpackage.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]misc[\\/]nocodeinfile.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]misc[\\/]outertypefilename.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]misc[\\/]upperell.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]modifier[\\/]modifierorder.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]whitespace[\\/]genericwhitespace.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]checks[\\/]whitespace[\\/]nowhitespacebeforecasedefaultcolon.xml.template"/>
+  <suppress id="propertiesMacroMustExist"
+         files="src[\\/]xdocs[\\/]filters[\\/]suppresswarningsfilter.xml.template"/>
+
 </suppressions>
diff --git a/config/checkstyle-resources-suppressions.xml b/config/checkstyle-resources-suppressions.xml
index 445c2a18937..1ba9b02b25c 100644
--- a/config/checkstyle-resources-suppressions.xml
+++ b/config/checkstyle-resources-suppressions.xml
@@ -85,7 +85,7 @@
   <suppress checks="OuterTypeFilename"
     files="[\\/]package-info\.java"/>
   <suppress checks="OuterTypeFilename"
-    files="src[\\/]it[\\/]resources[\\/].*[\\/]SuppressionXpathRegressionOuterTypeFilename.*\.java"/>
+    files="src[\\/]it[\\/]resources[\\/].*[\\/]InputXpathOuterTypeFilename.*\.java"/>
 
   <!-- intentional problem for testing -->
   <suppress id="noTrailingWhitespace"
@@ -184,6 +184,8 @@
     files="[\\/]InputNoWhitespaceBeforeTextBlocksTabIndent\.java"/>
   <suppress checks="FileTabCharacter"
     files="[\\/]InputJava14TextBlocksTabSize\.java"/>
+  <suppress checks="FileTabCharacter"
+    files="[\\/]InputStringTemplateBasicWithTabs\.java"/>
 
   <!-- This file must not have a package statement, for testing purposes -->
   <suppress checks="PackageDeclarationCheck"
@@ -194,20 +196,6 @@
     files="[\\/]InputJavaNCSSRecordsMax\.java"/>
 
   <!-- Until https://github.com/checkstyle/checkstyle/issues/11163 -->
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocPosition\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocPositionWithSinglelineComments\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTagsNoViolation\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocCorrectParagraph\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTagsVisitCount\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocNonTightHtmlTags\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]abstractjavadoc[\\/]InputAbstractJavadocLeaveToken\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc3\.java"/>
   <suppress checks="FileLength"
@@ -216,14 +204,8 @@
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly2\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypePublicOnly1\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeNoJavadoc1\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]missingjavadoctype[\\/]InputMissingJavadocTypeTags\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]javadoctagcontinuationindentation[\\/]InputJavadocTagContinuationIndentation\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]javadocvariable[\\/]InputJavadocVariableNoJavadoc\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]javadoc[\\/]javadocvariable[\\/]InputJavadocVariableNoJavadoc5\.java"/>
   <suppress checks="FileLength"
@@ -316,18 +298,6 @@
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]avoidescapedunicodecharacters[\\/]InputAvoidEscapedUnicodeCharacters3\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]todocomment[\\/]InputTodoCommentSimple\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationCommentIsAtTheEndOfBlock\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationSurroundingCode\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationInSwitchBlock\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationSurroundingCode2\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationInMultiblockStructures\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]commentsindentation[\\/]InputCommentsIndentationSurroundingCode3\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]indentation[\\/]InputIndentationInvalidMethodIndent\.java"/>
   <suppress checks="FileLength"
@@ -370,22 +340,10 @@
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]indentation[\\/]InputIndentationTryResourcesNotStrict\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]indentation[\\/]indentation[\\/]InputIndentationInvalidIfIndent\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect2\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect3\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]annotation[\\/]annotationlocation[\\/]InputAnnotationLocationIncorrect\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthSimple\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthCountEmptyIsFalse\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]sizes[\\/]methodlength[\\/]InputMethodLengthModifier\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]sizes[\\/]methodcount[\\/]InputMethodCount\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]sizes[\\/]methodcount[\\/]InputMethodCount1\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]sizes[\\/]linelength[\\/]InputLineLengthSimple1\.java"/>
   <suppress checks="FileLength"
@@ -544,6 +502,8 @@
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullIgnoreCase\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNull\.java"/>
+  <suppress checks="FileLength"
+    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]constructorsdeclarationgrouping[\\/]InputConstructorsDeclarationGrouping\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]covariantequals[\\/]InputCovariantEquals\.java"/>
   <suppress checks="FileLength"
@@ -566,24 +526,12 @@
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]fallthrough[\\/]InputFallThrough3\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]fallthrough[\\/]InputFallThroughDefault\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]innerassignment[\\/]InputInnerAssignment\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]equalshashcode[\\/]InputEqualsHashCodeSemantic\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableFalsePositives\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableAssignedMultipleTimes\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariable2\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariable\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineSingleLine\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]onestatementperline[\\/]InputOneStatementPerLineMultiline\.java"/>
-  <suppress checks="FileLength"
-    files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]coding[\\/]noenumtrailingcomma[\\/]InputNoEnumTrailingComma\.java"/>
   <suppress checks="FileLength"
     files="[\\/]test[\\/]resources[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]checks[\\/]whitespace[\\/]emptylineseparator[\\/]InputEmptyLineSeparatorWithComments2\.java"/>
   <suppress checks="FileLength"
diff --git a/config/error-prone-suppressions/compile-phase-suppressions.xml b/config/error-prone-suppressions/compile-phase-suppressions.xml
index 0ce589422fe..d1f017ef3b4 100644
--- a/config/error-prone-suppressions/compile-phase-suppressions.xml
+++ b/config/error-prone-suppressions/compile-phase-suppressions.xml
@@ -6,4 +6,11 @@
     <description>hashcode method on array does not hash array contents</description>
     <lineContent>+ &quot;, children=&quot; + Objects.hashCode(children)</lineContent>
   </error>
+  <!-- Better suggestion after https://github.com/PicnicSupermarket/error-prone-support/issues/954. -->
+  <error>
+    <sourceFile>PropertiesMacro.java</sourceFile>
+    <bugPattern>CollectorMutability</bugPattern>
+    <description>Avoid `Collectors.to{List,Map,Set}` in favor of collectors that emphasize (im)mutability</description>
+    <lineContent>}).collect(Collectors.toSet()));</lineContent>
+  </error>
 </suppressedErrors>
diff --git a/config/error-prone-suppressions/test-compile-phase-suppressions.xml b/config/error-prone-suppressions/test-compile-phase-suppressions.xml
index 41bafdafad8..6e9af9e9c15 100644
--- a/config/error-prone-suppressions/test-compile-phase-suppressions.xml
+++ b/config/error-prone-suppressions/test-compile-phase-suppressions.xml
@@ -6,11 +6,4 @@
     <description>Return value of &apos;findFirst&apos; must be used</description>
     <lineContent>.findFirst();</lineContent>
   </error>
-
-  <error>
-    <sourceFile>PropertyCacheFileTest.java</sourceFile>
-    <bugPattern>CheckReturnValue</bugPattern>
-    <description>The result of `toByteArray(...)` must be used</description>
-    <lineContent>byteStream.when(() -&gt; ByteStreams.toByteArray(any(BufferedInputStream.class)))</lineContent>
-  </error>
 </suppressedErrors>
diff --git a/config/import-control-test.xml b/config/import-control-test.xml
index 601cd9da58d..e4250df0dde 100644
--- a/config/import-control-test.xml
+++ b/config/import-control-test.xml
@@ -20,13 +20,16 @@
   <!-- Disallow @BeforeAll, see https://github.com/checkstyle/checkstyle/issues/12100 -->
   <disallow class="org.junit.jupiter.api.BeforeAll"/>
   <!-- Disallow Junit assert in favor of Truth asserts in few exceptions -->
-  <allow class="org.junit.jupiter.api.Assertions.assertThrows"/>
   <allow class="org.junit.jupiter.api.Assertions.assertDoesNotThrow"/>
   <disallow pkg="org.junit.jupiter.api.Assertions"/>
 
   <!-- Reflection shouldn't be used in tests. -->
   <disallow pkg="java\.lang\.reflect\.*" regex="true" />
 
+  <!-- see reason at https://github.com/checkstyle/checkstyle/issues/11343 -->
+  <disallow pkg="org.junit.jupiter.api.Assertions.assertThrows"/>
+  <disallow pkg="org.junit.Assert.assertThrows"/>
+
   <allow pkg=".*" regex="true" />
 
   <subpackage name="api">
@@ -40,6 +43,7 @@
       <file name="TestUtil">
         <!-- All reflection usage should be in this class. -->
         <allow pkg="java.lang.reflect" />
+        <allow class="org.junit.jupiter.api.Assertions.assertThrows" />
       </file>
     </subpackage>
   </subpackage>
diff --git a/config/import-control.xml b/config/import-control.xml
index 1c2d1093a1c..222543be061 100644
--- a/config/import-control.xml
+++ b/config/import-control.xml
@@ -19,6 +19,7 @@
   <allow pkg="java.io"/>
   <allow pkg="java.net"/>
   <allow pkg="java.util"/>
+  <allow class="javax.annotation.Nullable"/>
   <allow pkg="javax.xml.parsers"/>
   <allow pkg="org.apache.commons.beanutils"/>
   <allow pkg="org.apache.commons.logging"/>
@@ -73,15 +74,31 @@
     <allow pkg="java.nio" local-only="true"/>
     <allow pkg="org.codehaus.plexus" local-only="true"/>
     <allow class="java.lang.reflect.Field" local-only="true"/>
+    <allow class="java.lang.reflect.Array" local-only="true"/>
+    <allow class="java.lang.reflect.ParameterizedType" local-only="true"/>
+    <allow class="java.lang.reflect.InvocationTargetException" local-only="true"/>
+    <allow class="java.beans.Introspector" local-only="true"/>
+    <allow class="java.beans.PropertyDescriptor" local-only="true"/>
     <allow class="javax.swing.text.MutableAttributeSet" local-only="true"/>
     <allow class="javax.swing.text.html.HTML.Attribute" local-only="true"/>
+    <allow class="com.google.common.collect.Lists" local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.Checker" local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.TreeWalker" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.FileStatefulCheck" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.DefaultConfiguration" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.PropertyCacheFile" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.XdocsPropertyType" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.meta.ModulePropertyDetails" local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.TreeWalkerFilter" local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.ModuleFactory" local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.PackageNamesLoader" local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.PackageObjectFactory" local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.utils.CommonUtil" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.utils.CheckUtil" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.utils.JavadocUtil" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.utils.TokenUtil" local-only="true"/>
+    <allow class="com.puppycrawl.tools.checkstyle.PropertyType"/>
   </subpackage>
 
   <subpackage name="utils">
@@ -276,6 +293,7 @@
     <file name="Abstract.*Node" regex="true">
       <!-- These are more saxon utilities, and should not have anything checkstyle specific -->
       <allow pkg="com.puppycrawl.tools.checkstyle.xpath.iterators"/>
+      <allow pkg="com.puppycrawl.tools.checkstyle.utils"/>
       <disallow pkg="com\.puppycrawl.*" regex="true"/>
     </file>
 
@@ -289,6 +307,10 @@
     <file name="CrAwareLexerSimulator">
       <allow pkg="org.antlr.v4.runtime"/>
     </file>
+    <file name="CompositeLexerContextCache">
+      <allow pkg="org.antlr.v4.runtime"/>
+      <allow class="com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageLexer"/>
+    </file>
   </subpackage>
 
   <file name="Main">
diff --git a/config/intellij-idea-inspections.xml b/config/intellij-idea-inspections.xml
index f7736bcb9ed..85a62454019 100644
--- a/config/intellij-idea-inspections.xml
+++ b/config/intellij-idea-inspections.xml
@@ -4106,6 +4106,9 @@
                    enabled_by_default="false"/>
   <inspection_tool class="SpringBootApplicationYaml" enabled="false" level="ERROR"
                    enabled_by_default="false"/>
+  <!-- until #14806 -->
+  <inspection_tool class="YAMLSchemaValidation" enabled="false" level="ERROR"
+                   enabled_by_default="false"/>
   <inspection_tool class="SpringBootBootstrapConfigurationInspection" enabled="false"
                    level="WEAK WARNING" enabled_by_default="false"/>
   <inspection_tool class="SpringCacheAnnotationsOnInterfaceInspection" enabled="false"
diff --git a/config/java.header b/config/java.header
index 1b9a24e52b2..dad13d7dcb0 100644
--- a/config/java.header
+++ b/config/java.header
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/config/jsoref-spellchecker/exclude.pl b/config/jsoref-spellchecker/exclude.pl
index 7ac75851178..2b2a807bade 100755
--- a/config/jsoref-spellchecker/exclude.pl
+++ b/config/jsoref-spellchecker/exclude.pl
@@ -19,6 +19,7 @@
   ^config/projects-to-test/openjdk17-excluded\.files$
   ^config/projects-to-test/openjdk19-excluded\.files$
   ^config/projects-to-test/openjdk20-excluded\.files$
+  ^config/projects-to-test/openjdk21-excluded\.files$
   ^config/jsoref-spellchecker/whitelist.words$
   ^config/checker-framework-suppressions/
   ^config/archunit-store/
diff --git a/config/jsoref-spellchecker/whitelist.words b/config/jsoref-spellchecker/whitelist.words
index 8e4f1c3ef6b..ef1abe33882 100644
--- a/config/jsoref-spellchecker/whitelist.words
+++ b/config/jsoref-spellchecker/whitelist.words
@@ -47,6 +47,7 @@ apos
 applet
 appveyor
 APRV
+Aqj
 archunit
 arget
 arity
@@ -103,7 +104,6 @@ basetag
 baz
 bbb
 bc
-BClass
 bdc
 bdd
 bdo
@@ -128,7 +128,6 @@ Bludov
 BNOT
 booleanexpressioncomplexity
 bothfiles
-bountysource
 Bpmn
 bracesareused
 breadcrumbs
@@ -155,7 +154,6 @@ catchparametername
 cba
 cbeaff
 ccc
-CClass
 CComments
 cdata
 cde
@@ -188,7 +186,6 @@ CHDHGJGD
 CHDHJECF
 CHDJBFDB
 checkchmod
-checkconfig
 checkerframework
 checkstyle
 checkstyleanttask
@@ -243,6 +240,7 @@ config
 configurationloader
 Connell's
 constantname
+constructorsdeclarationgrouping
 Contextualizable
 contextualization
 contextualized
@@ -323,7 +321,7 @@ Dnew
 doccheck
 Dockter
 doclet
-DOCTYPE
+doctype
 documentationcomments
 donotignoreexceptions
 Dorekit
@@ -343,6 +341,7 @@ dsm
 Dsonar
 Dspotbugs
 Dstrict
+Dsurefire
 Dtag
 Dtest
 Dubinin
@@ -446,6 +445,7 @@ finallocalvariable
 finalparameters
 findbugs
 Findentation
+findstr
 firefox
 firstsentence
 FIXME
@@ -478,10 +478,12 @@ ftpclient
 fullident
 fullname
 func
+funmodifiablecollection
 Fwhitespace
 Fx
 gav
 gcp
+Gdrox
 generalform
 genericwhitespace
 Getenv
@@ -554,6 +556,7 @@ http
 httpcomponents
 hurz
 hyperlinks
+hz
 iae
 ico
 icu
@@ -685,6 +688,7 @@ jhu
 jide
 jidesoft
 jira
+JIs
 jitpack
 jkl
 JLabel
@@ -783,7 +787,7 @@ magicnumber
 mailhost
 mailto
 mainframemodel
-mancuso
+Mancuso
 mapfile
 marazmatic
 markdownlint
@@ -811,7 +815,6 @@ microsoft
 minimalistic
 Mipmap
 misconfigured
-Misordered
 missingctor
 missingdeprecated
 missingjavadocmethod
@@ -939,6 +942,7 @@ npath
 npathcomplexity
 npe
 npm
+nrmancuso
 nts
 NTU
 NULLCHECK
@@ -970,6 +974,7 @@ openstreetmap
 operatorwrap
 optgroup
 optimisation
+OQ
 orderedproperties
 orderingandspacing
 orekit
@@ -1040,6 +1045,7 @@ pkga
 pkghtml
 pkginfo
 pkx
+PLHM
 plugin
 PMB
 pmd
@@ -1178,6 +1184,7 @@ servlet
 SETPOINT
 severitymatchfilter
 sevntu
+shanegenschaw
 shellcheck
 shengchen
 Shiell
@@ -1291,11 +1298,13 @@ td
 teamcity
 technotes
 tected
+temurin
 Testik
 testmodules
 textlevel
 Tfo
 tfoot
+Thauvin
 thead
 thesummaryfragment
 thetaphi
@@ -1306,6 +1315,7 @@ throwscount
 Thymeleaf
 tidelift
 TKN
+Tls
 tmp
 tmpdir
 tngtech
@@ -1502,7 +1512,7 @@ yamllint
 Yaroslavtsev
 yml
 youtrack
-Youtube
+youtube
 Yoyodyne
 yyyy
 Yzz
diff --git a/config/linkcheck-suppressions.txt b/config/linkcheck-suppressions.txt
index f697535d7d7..1d484a4d781 100644
--- a/config/linkcheck-suppressions.txt
+++ b/config/linkcheck-suppressions.txt
@@ -1,1327 +1,1351 @@
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedAccessModifierArrayConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedStringArrayConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.ScopeConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.SeverityLevelConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.UriConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/Checker.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.IgnoredModulesOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.InternalLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">../ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">../ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">../DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">../../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/Definitions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DetailAstImpl.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavaAstVisitor.DetailAstPair.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavaAstVisitor.html#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)">#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavaParser.CheckstyleErrorListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavaParser.Options.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavaParser.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.DescriptiveErrorListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseErrorMessage.html#%3Cinit%3E(int,java.lang.String,java.lang.Object...)">#%3Cinit%3E(int,java.lang.String,java.lang.Object...)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseStatus.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)">#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)">../../../JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.CliOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/LocalizedMessage.Utf8Control.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/LocalizedMessage.html#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)">#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/Main.CliOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/Main.OnlyCheckstyleLoggersFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/Main.OutputFormat.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/Main.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PackageNamesLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.ModuleLoadOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)">#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)">#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)">#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)">../PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PropertiesExpander.html#%3Cinit%3E(java.util.Properties)">#%3Cinit%3E(java.util.Properties)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyCacheFile.ExternalResource.html#%3Cinit%3E(java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)">../../PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyType.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ThreadModeSettings.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalker.AstState.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalker.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.FileMessages.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">../../XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XmlLoader.LoadExternalDtdFeatureProvider.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XmlLoader.html#%3Cinit%3E(java.util.Map)">#%3Cinit%3E(java.util.Map)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Formatter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.FormatterType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Property.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.FileContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#beginTreecom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#beginTreecom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#finishTreecom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#finishTreecom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getAcceptableTokens--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getAcceptableTokens--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getDefaultTokens--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getDefaultTokens--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getRequiredTokens--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getRequiredTokens--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#isCommentNodesRequired--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#isCommentNodesRequired--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#leaveTokencom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#leaveTokencom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#setTokens-java.lang.String...-">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#setTokens-java.lang.String...-</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitTokencom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitTokencom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.FileContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#processFiltered-java.io.File-com.puppycrawl.tools.checkstyle.api.FileText-">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#processFiltered-java.io.File-com.puppycrawl.tools.checkstyle.api.FileText-</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object)">#%3Cinit%3E(java.lang.Object)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String)">#%3Cinit%3E(java.lang.Object,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)">#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)">../AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/AutomaticBean.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)">#%3Cinit%3E(java.lang.String,java.lang.Throwable)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Comment.html#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)">#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.html#getExternalResourceLocations--">apidocs/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.html#getExternalResourceLocations--</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">../FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">../FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.lang.String)">#%3Cinit%3E(java.io.File,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.util.List)">#%3Cinit%3E(java.io.File,java.util.List)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FilterSet.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/FullIdent.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/LineColumn.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Scope.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/SeverityLevel.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)">../SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.SequencedProperties.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.Entry.html#%3Cinit%3E(java.lang.String,int,int,int,int)">#%3Cinit%3E(java.lang.String,int,int,int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.ResourceBundle.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.UniqueProperties.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ClosingParensOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ElementStyleOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.TrailingArrayCommaOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)">../../checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.ScopeState.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)">../EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.ScopeData.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)">../HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)">#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)">../../checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)">../RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.FrameType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.Context.html#%3Cinit%3E(boolean)">#%3Cinit%3E(boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.html#%3Cinit%3E(boolean,boolean,boolean)">#%3Cinit%3E(boolean,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)">#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.RuleMatchForImport.html#%3Cinit%3E(java.lang.String,int,int)">#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)">../FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)">#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)">#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)">../UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">../../checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">../AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">../DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)">../IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(int)">#%3Cinit%3E(int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.LineWrappingOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">../LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">../PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.FileContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getAcceptableJavadocTokens--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getAcceptableJavadocTokens--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getBlockCommentAst--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getBlockCommentAst--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getDefaultJavadocTokens--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getDefaultJavadocTokens--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getRequiredJavadocTokens--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getRequiredJavadocTokens--</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#setJavadocTokens-java.lang.String...-">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#setJavadocTokens-java.lang.String...-</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitJavadocToken-com.puppycrawl.tools.checkstyle.api.DetailNode-">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitJavadocToken-com.puppycrawl.tools.checkstyle.api.DetailNode-</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.html#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)">#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)">../JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">../../checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">../JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)">../../checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(java.lang.String,int,int)">#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)">#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)">../JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.Type.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)">#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)">../JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)">#%3Cinit%3E(java.util.Collection,java.util.Collection)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)">../JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.Point.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#%3Cinit%3E(java.lang.String%5B%5D,int)">#%3Cinit%3E(java.lang.String%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTags(java.lang.String%5B%5D,int)">#parseTags(java.lang.String%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)">#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)">../../checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.html#%3Cinit%3E(int)">#%3Cinit%3E(int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.Context.html#%3Cinit%3E(boolean)">#%3Cinit%3E(boolean)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.Counter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.TokenEnd.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.Values.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)">#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)">../../checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.Builder.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">../MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">../SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">../../checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">../../checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isBlockCommentEnd(int%5B%5D,int)">#isBlockCommentEnd(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isFirstInLine(int%5B%5D,int)">#isFirstInLine(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSingleSpace(int%5B%5D,int)">#isSingleSpace(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSpace(int%5B%5D,int)">#isSpace(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)">#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.html#%3Cinit%3E(int)">#%3Cinit%3E(int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)">../SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)">../SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">../SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">../SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.SuppressionType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">../SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">../SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.TagType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)">#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)">#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelector.html#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)">#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)">../../gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)">../../gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)">../ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/Main.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.ExpandCollapseAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.FileSelectionAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.FindNodeByXpathAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.JavaFileFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.ReloadAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.ParseMode.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)">#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTable.TreeTableCellEditor.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)">../TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)">../TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeExpansionListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeModelListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)">../TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/ModuleDetails.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/ModuleType.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/site/ExampleMacro.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/site/SiteUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#%3Cinit%3E(java.io.Writer,java.lang.String)">#%3Cinit%3E(java.io.Writer,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CheckUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#endsWith(int%5B%5D,java.lang.String)">#endsWith(int%5B%5D,java.lang.String)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#isCodePointWhitespace(int%5B%5D,int)">#isCodePointWhitespace(int%5B%5D,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/FilterUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.JavadocTagType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ParserUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/TokenUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/utils/XpathUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)">../AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#%3Cinit%3E(net.sf.saxon.om.TreeInfo)">#%3Cinit%3E(net.sf.saxon.om.TreeInfo)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AttributeNode.html#%3Cinit%3E(java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">../../xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">../ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)">../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.StartWith.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)">../DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.html#%3Cinit%3E(java.util.Collection)">#%3Cinit%3E(java.util.Collection)</a>: doesn't exist.</i></td></tr></table></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.OutputStreamOptions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternConverter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedAccessModifierArrayConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedAccessModifierArrayConverter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedStringArrayConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedStringArrayConverter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.ScopeConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.ScopeConverter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.SeverityLevelConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.SeverityLevelConverter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.UriConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.UriConverter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/Checker.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Checker.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ConfigurationLoader.IgnoredModulesOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ConfigurationLoader.IgnoredModulesOptions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ConfigurationLoader.InternalLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ConfigurationLoader.InternalLoader.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DefaultContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/DefaultContext.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/Definitions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Definitions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DetailAstImpl.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/DetailAstImpl.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavaAstVisitor.DetailAstPair.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaAstVisitor.DetailAstPair.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavaAstVisitor.html#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)">com/puppycrawl/tools/checkstyle/JavaAstVisitor.html#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavaParser.CheckstyleErrorListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaParser.CheckstyleErrorListener.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavaParser.Options.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaParser.Options.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavaParser.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaParser.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.DescriptiveErrorListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.DescriptiveErrorListener.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseErrorMessage.html#%3Cinit%3E(int,java.lang.String,java.lang.Object...)">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseErrorMessage.html#%3Cinit%3E(int,java.lang.String,java.lang.Object...)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseStatus.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseStatus.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.CliOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.CliOptions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/LocalizedMessage.Utf8Control.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/LocalizedMessage.Utf8Control.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/LocalizedMessage.html#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)">com/puppycrawl/tools/checkstyle/LocalizedMessage.html#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/Main.CliOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.CliOptions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/Main.OnlyCheckstyleLoggersFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.OnlyCheckstyleLoggersFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/Main.OutputFormat.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.OutputFormat.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/Main.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PackageNamesLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/PackageNamesLoader.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.ModuleLoadOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/PackageObjectFactory.ModuleLoadOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)">com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)">com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)">com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PropertiesExpander.html#%3Cinit%3E(java.util.Properties)">com/puppycrawl/tools/checkstyle/PropertiesExpander.html#%3Cinit%3E(java.util.Properties)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PropertyCacheFile.ExternalResource.html#%3Cinit%3E(java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/PropertyCacheFile.ExternalResource.html#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)">com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/PropertyType.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/PropertyType.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ThreadModeSettings.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/ThreadModeSettings.html#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/TreeWalker.AstState.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/TreeWalker.AstState.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/TreeWalker.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/TreeWalker.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/XMLLogger.FileMessages.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/XMLLogger.FileMessages.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/XmlLoader.LoadExternalDtdFeatureProvider.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/XmlLoader.LoadExternalDtdFeatureProvider.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/XmlLoader.html#%3Cinit%3E(java.util.Map)">com/puppycrawl/tools/checkstyle/XmlLoader.html#%3Cinit%3E(java.util.Map)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Formatter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Formatter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.FormatterType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.FormatterType.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Property.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Property.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AbstractCheck.FileContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractCheck.FileContext.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.FileContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.FileContext.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object)">com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String)">com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)">com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AutomaticBean.OutputStreamOptions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/AutomaticBean.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AutomaticBean.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)">com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Comment.html#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)">com/puppycrawl/tools/checkstyle/api/Comment.html#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.lang.String)">com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.util.List)">com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.util.List)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/FilterSet.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/FilterSet.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/FullIdent.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/FullIdent.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/LineColumn.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/api/LineColumn.html#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Scope.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/Scope.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/SeverityLevel.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/SeverityLevel.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)">com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/TokenTypes.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/TokenTypes.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.SequencedProperties.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.SequencedProperties.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.Entry.html#%3Cinit%3E(java.lang.String,int,int,int,int)">com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.Entry.html#%3Cinit%3E(java.lang.String,int,int,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/TranslationCheck.ResourceBundle.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/TranslationCheck.ResourceBundle.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/TranslationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/TranslationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.UniqueProperties.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.UniqueProperties.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ClosingParensOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ClosingParensOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ElementStyleOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ElementStyleOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.TrailingArrayCommaOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.TrailingArrayCommaOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)">com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.ScopeState.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.ScopeState.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)">com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.ScopeData.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.ScopeData.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)">com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.FrameType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.FrameType.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.Context.html#%3Cinit%3E(boolean)">com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.Context.html#%3Cinit%3E(boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.html#%3Cinit%3E(boolean,boolean,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.html#%3Cinit%3E(boolean,boolean,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.RuleMatchForImport.html#%3Cinit%3E(java.lang.String,int,int)">com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.RuleMatchForImport.html#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)">com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)">com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(int)">com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.LineWrappingOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.LineWrappingOptions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.FileContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.FileContext.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.html#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.html#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.html#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(java.lang.String,int,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.Type.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.Type.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.Point.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.Point.html#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#%3Cinit%3E(java.lang.String%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#%3Cinit%3E(java.lang.String%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTags(java.lang.String%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTags(java.lang.String%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)">com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.html#%3Cinit%3E(int)">com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.html#%3Cinit%3E(int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.Context.html#%3Cinit%3E(boolean)">com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.Context.html#%3Cinit%3E(boolean)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.Counter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.Counter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.TokenEnd.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.TokenEnd.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.Values.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)">com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.Values.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)">com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.Builder.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.Builder.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isBlockCommentEnd(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isBlockCommentEnd(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isFirstInLine(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isFirstInLine(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSingleSpace(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSingleSpace(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSpace(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSpace(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.html#%3Cinit%3E(int)">com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.html#%3Cinit%3E(int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.html#%3Cinit%3E(int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.SuppressionType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.SuppressionType.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.TagType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.TagType.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)">com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/CodeSelector.html#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)">com/puppycrawl/tools/checkstyle/gui/CodeSelector.html#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)">com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)">com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)">com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/Main.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/Main.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.ExpandCollapseAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.ExpandCollapseAction.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.FileSelectionAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.FileSelectionAction.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.FindNodeByXpathAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.FindNodeByXpathAction.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.JavaFileFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.JavaFileFilter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.ReloadAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.ReloadAction.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrameModel.ParseMode.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/gui/MainFrameModel.ParseMode.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/MainFrameModel.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrameModel.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)">com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/TreeTable.TreeTableCellEditor.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/TreeTable.TreeTableCellEditor.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)">com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)">com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeExpansionListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeExpansionListener.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeModelListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeModelListener.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)">com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/ModuleDetails.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/ModuleDetails.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/ModuleType.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/meta/ModuleType.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/site/ExampleMacro.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/ExampleMacro.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/site/SiteUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/SiteUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#%3Cinit%3E(java.io.Writer,java.lang.String)">com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#%3Cinit%3E(java.io.Writer,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/CheckUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/CheckUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#endsWith(int%5B%5D,java.lang.String)">com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#endsWith(int%5B%5D,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#isCodePointWhitespace(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#isCodePointWhitespace(int%5B%5D,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/FilterUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/FilterUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/JavadocUtil.JavadocTagType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/JavadocUtil.JavadocTagType.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/JavadocUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/JavadocUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/ParserUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ParserUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/ScopeUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ScopeUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/TokenUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/TokenUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/utils/XpathUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/XpathUtil.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)">com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#%3Cinit%3E(net.sf.saxon.om.TreeInfo)">com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#%3Cinit%3E(net.sf.saxon.om.TreeInfo)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/AttributeNode.html#%3Cinit%3E(java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/xpath/AttributeNode.html#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)">com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.StartWith.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.StartWith.html#%3Cinit%3E()</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)">com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.</i></td></tr>
-<td><i><a href="com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.html#%3Cinit%3E(java.util.Collection)">com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.html#%3Cinit%3E(java.util.Collection)</a>: doesn't exist.</i></td></tr></table></td></tr>
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.
+<a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.
+<a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.
+<a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.
+<a href="AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternArrayConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedAccessModifierArrayConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedStringArrayConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.ScopeConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.SeverityLevelConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.UriConverter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/Checker.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.IgnoredModulesOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.InternalLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">../ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">../ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">../DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">../../DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/Definitions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DetailAstImpl.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavaAstVisitor.DetailAstPair.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavaAstVisitor.html#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)">#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavaParser.CheckstyleErrorListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavaParser.Options.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavaParser.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.DescriptiveErrorListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseErrorMessage.html#%3Cinit%3E(int,java.lang.String,java.lang.Object...)">#%3Cinit%3E(int,java.lang.String,java.lang.Object...)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseStatus.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)">#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)">../../../JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.CliOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/LocalizedMessage.Utf8Control.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/LocalizedMessage.html#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)">#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/Main.CliOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/Main.OnlyCheckstyleLoggersFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/Main.OutputFormat.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/Main.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/OsSpecificUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PackageNamesLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.ModuleLoadOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)">#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)">#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)">#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)">../PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PropertiesExpander.html#%3Cinit%3E(java.util.Properties)">#%3Cinit%3E(java.util.Properties)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyCacheFile.ExternalResource.html#%3Cinit%3E(java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)">../../PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/PropertyType.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ThreadModeSettings.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalker.AstState.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalker.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.FileMessages.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">../../XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XmlLoader.LoadExternalDtdFeatureProvider.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XmlLoader.html#%3Cinit%3E(java.util.Map)">#%3Cinit%3E(java.util.Map)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">../XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Formatter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.FormatterType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Property.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.FileContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#beginTreecom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#beginTreecom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#finishTreecom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#finishTreecom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getAcceptableTokens--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getAcceptableTokens--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getDefaultTokens--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getDefaultTokens--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getRequiredTokens--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#getRequiredTokens--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#isCommentNodesRequired--">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#isCommentNodesRequired--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#leaveTokencom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#leaveTokencom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#setTokens-java.lang.String...-">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#setTokens-java.lang.String...-</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitTokencom.puppycrawl.tools.checkstyle.api.DetailAST">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#visitTokencom.puppycrawl.tools.checkstyle.api.DetailAST</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.FileContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#processFiltered-java.io.File-com.puppycrawl.tools.checkstyle.api.FileText-">apidocs/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#processFiltered-java.io.File-com.puppycrawl.tools.checkstyle.api.FileText-</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object)">#%3Cinit%3E(java.lang.Object)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String)">#%3Cinit%3E(java.lang.Object,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)">#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)">../AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/AutomaticBean.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)">#%3Cinit%3E(java.lang.String,java.lang.Throwable)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Comment.html#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)">#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.html#getExternalResourceLocations--">apidocs/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.html#getExternalResourceLocations--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">../FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">../FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.lang.String)">#%3Cinit%3E(java.io.File,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.util.List)">#%3Cinit%3E(java.io.File,java.util.List)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FilterSet.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/FullIdent.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/LineColumn.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Scope.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/SeverityLevel.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)">../SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">../Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.SequencedProperties.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.Entry.html#%3Cinit%3E(java.lang.String,int,int,int,int)">#%3Cinit%3E(java.lang.String,int,int,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.ResourceBundle.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.UniqueProperties.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ClosingParensOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ElementStyleOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.TrailingArrayCommaOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)">../../checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.ScopeState.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)">../EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.ScopeData.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)">../HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)">#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)">../../checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)">../RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.FrameType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">../RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.Context.html#%3Cinit%3E(boolean)">#%3Cinit%3E(boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.html#%3Cinit%3E(boolean,boolean,boolean)">#%3Cinit%3E(boolean,boolean,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)">#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.RuleMatchForImport.html#%3Cinit%3E(java.lang.String,int,int)">#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)">../FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)">#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">../PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)">#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)">../UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">../../checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">../AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">../DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)">../IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(int)">#%3Cinit%3E(int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.LineWrappingOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">../LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">../PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../../checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">../YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.FileContext.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getAcceptableJavadocTokens--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getAcceptableJavadocTokens--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getBlockCommentAst--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getBlockCommentAst--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getDefaultJavadocTokens--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getDefaultJavadocTokens--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getRequiredJavadocTokens--">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#getRequiredJavadocTokens--</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#setJavadocTokens-java.lang.String...-">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#setJavadocTokens-java.lang.String...-</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitJavadocToken-com.puppycrawl.tools.checkstyle.api.DetailNode-">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitJavadocToken-com.puppycrawl.tools.checkstyle.api.DetailNode-</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-">apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#visitToken-com.puppycrawl.tools.checkstyle.api.DetailAST-</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.html#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)">#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)">../JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">../../checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">../JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)">../../checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(java.lang.String,int,int)">#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)">#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)">../JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String)">#%3Cinit%3E(int,int,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.Type.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)">#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)">../JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)">#%3Cinit%3E(java.util.Collection,java.util.Collection)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)">../JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.Point.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#%3Cinit%3E(java.lang.String%5B%5D,int)">#%3Cinit%3E(java.lang.String%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTags(java.lang.String%5B%5D,int)">#parseTags(java.lang.String%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">../TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)">#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)">../../checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.html#%3Cinit%3E(int)">#%3Cinit%3E(int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.Context.html#%3Cinit%3E(boolean)">#%3Cinit%3E(boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.Counter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.TokenEnd.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.Values.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)">#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)">../../checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.Builder.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">../MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">../SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">../../checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">../../checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isBlockCommentEnd(int%5B%5D,int)">#isBlockCommentEnd(int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isFirstInLine(int%5B%5D,int)">#isFirstInLine(int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSingleSpace(int%5B%5D,int)">#isSingleSpace(int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSpace(int%5B%5D,int)">#isSpace(int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)">#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.html#%3Cinit%3E(int)">#%3Cinit%3E(int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)">../SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)">../SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">../SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">../SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.SuppressionType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">../SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">../SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.TagType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)">#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)">#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelector.html#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)">#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)">../../gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)">../../gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)">../ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/Main.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.ExpandCollapseAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.FileSelectionAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.FindNodeByXpathAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.JavaFileFilter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.ReloadAction.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrame.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.ParseMode.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)">#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTable.TreeTableCellEditor.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)">../TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)">../TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeExpansionListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeModelListener.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)">../TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/ModuleDetails.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/ModuleType.html#%3Cinit%3E(java.lang.String)">#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/ExampleMacro.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/PropertiesMacro.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/SiteUtil.DescriptionExtractor.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/SiteUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/SiteUtil.html#getDifference(int%5B%5D,int...)">#getDifference(int%5B%5D,int...)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#%3Cinit%3E(java.io.Writer,java.lang.String)">#%3Cinit%3E(java.io.Writer,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#tableRows(int%5B%5D,boolean)">#tableRows(int%5B%5D,boolean)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CheckUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#endsWith(int%5B%5D,java.lang.String)">#endsWith(int%5B%5D,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#isCodePointWhitespace(int%5B%5D,int)">#isCodePointWhitespace(int%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/FilterUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.JavadocTagType.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ParserUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/TokenUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#copyOfArray(T%5B%5D,int)">#copyOfArray(T%5B%5D,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/utils/XpathUtil.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)">../AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#%3Cinit%3E(net.sf.saxon.om.TreeInfo)">#%3Cinit%3E(net.sf.saxon.om.TreeInfo)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/AttributeNode.html#%3Cinit%3E(java.lang.String,java.lang.String)">#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">../../xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">../ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">../../xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)">../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">../../xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.StartWith.html#%3Cinit%3E()">#%3Cinit%3E()</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)">../DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.html#%3Cinit%3E(java.util.Collection)">#%3Cinit%3E(java.util.Collection)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.CustomPrintWriter.html#%3Cinit%3E(java.io.Writer)">#%3Cinit%3E(java.io.Writer)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.OutputStreamOptions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternArrayConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternArrayConverter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.PatternConverter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedAccessModifierArrayConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedAccessModifierArrayConverter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedStringArrayConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.RelaxedStringArrayConverter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.ScopeConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.ScopeConverter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.SeverityLevelConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.SeverityLevelConverter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.UriConverter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.UriConverter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/Checker.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Checker.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ConfigurationLoader.IgnoredModulesOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ConfigurationLoader.IgnoredModulesOptions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ConfigurationLoader.InternalLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ConfigurationLoader.InternalLoader.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">com/puppycrawl/tools/checkstyle/ConfigurationLoader.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.PropertyResolver,boolean,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)">com/puppycrawl/tools/checkstyle/DefaultConfiguration.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.ThreadModeSettings)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DefaultContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/DefaultContext.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions,com.puppycrawl.tools.checkstyle.AuditEventFormatter)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/DefaultLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/Definitions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Definitions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DetailAstImpl.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/DetailAstImpl.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavaAstVisitor.DetailAstPair.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaAstVisitor.DetailAstPair.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavaAstVisitor.html#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)">com/puppycrawl/tools/checkstyle/JavaAstVisitor.html#%3Cinit%3E(org.antlr.v4.runtime.CommonTokenStream)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavaParser.CheckstyleErrorListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaParser.CheckstyleErrorListener.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavaParser.Options.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaParser.Options.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavaParser.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavaParser.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.DescriptiveErrorListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.DescriptiveErrorListener.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseErrorMessage.html#%3Cinit%3E(int,java.lang.String,java.lang.Object...)">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseErrorMessage.html#%3Cinit%3E(int,java.lang.String,java.lang.Object...)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseStatus.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.ParseStatus.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)">com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.html#insertChildrenNodes(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl%5B%5D,org.antlr.v4.runtime.tree.ParseTree)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.CliOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.CliOptions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/LocalizedMessage.Utf8Control.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/LocalizedMessage.Utf8Control.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/LocalizedMessage.html#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)">com/puppycrawl/tools/checkstyle/LocalizedMessage.html#%3Cinit%3E(java.lang.String,java.lang.Class,java.lang.String,java.lang.Object...)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/Main.CliOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.CliOptions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/Main.OnlyCheckstyleLoggersFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.OnlyCheckstyleLoggersFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/Main.OutputFormat.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.OutputFormat.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/Main.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/Main.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/OsSpecificUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/OsSpecificUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PackageNamesLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/PackageNamesLoader.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.ModuleLoadOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/PackageObjectFactory.ModuleLoadOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)">com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.lang.String,java.lang.ClassLoader)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)">com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)">com/puppycrawl/tools/checkstyle/PackageObjectFactory.html#%3Cinit%3E(java.util.Set,java.lang.ClassLoader,com.puppycrawl.tools.checkstyle.PackageObjectFactory.ModuleLoadOption)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PropertiesExpander.html#%3Cinit%3E(java.util.Properties)">com/puppycrawl/tools/checkstyle/PropertiesExpander.html#%3Cinit%3E(java.util.Properties)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PropertyCacheFile.ExternalResource.html#%3Cinit%3E(java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/PropertyCacheFile.ExternalResource.html#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)">com/puppycrawl/tools/checkstyle/PropertyCacheFile.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.Configuration,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/PropertyType.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/PropertyType.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/SarifLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ThreadModeSettings.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/ThreadModeSettings.html#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/TreeWalker.AstState.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/TreeWalker.AstState.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/TreeWalker.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/TreeWalker.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/XMLLogger.FileMessages.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/XMLLogger.FileMessages.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/XMLLogger.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/XmlLoader.LoadExternalDtdFeatureProvider.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/XmlLoader.LoadExternalDtdFeatureProvider.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/XmlLoader.html#%3Cinit%3E(java.util.Map)">com/puppycrawl/tools/checkstyle/XmlLoader.html#%3Cinit%3E(java.util.Map)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)">com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.html#%3Cinit%3E(java.io.OutputStream,com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Formatter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Formatter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.FormatterType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.FormatterType.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Property.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.Property.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AbstractCheck.FileContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractCheck.FileContext.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.FileContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.FileContext.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object)">com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String)">com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)">com/puppycrawl/tools/checkstyle/api/AuditEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,com.puppycrawl.tools.checkstyle.api.Violation)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AutomaticBean.OutputStreamOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AutomaticBean.OutputStreamOptions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/AutomaticBean.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/AutomaticBean.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)">com/puppycrawl/tools/checkstyle/api/CheckstyleException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Comment.html#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)">com/puppycrawl/tools/checkstyle/api/Comment.html#%3Cinit%3E(java.lang.String%5B%5D,int,int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">com/puppycrawl/tools/checkstyle/api/FileContents.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)">com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileText)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.lang.String)">com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.util.List)">com/puppycrawl/tools/checkstyle/api/FileText.html#%3Cinit%3E(java.io.File,java.util.List)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/FilterSet.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/FilterSet.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/FullIdent.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/FullIdent.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/LineColumn.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/api/LineColumn.html#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Scope.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/Scope.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/SeverityLevel.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/SeverityLevel.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)">com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.SeverityLevel)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/TokenTypes.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/api/TokenTypes.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,com.puppycrawl.tools.checkstyle.api.SeverityLevel,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)">com/puppycrawl/tools/checkstyle/api/Violation.html#%3Cinit%3E(int,java.lang.String,java.lang.String,java.lang.Object%5B%5D,java.lang.String,java.lang.Class,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.SequencedProperties.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.SequencedProperties.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.Entry.html#%3Cinit%3E(java.lang.String,int,int,int,int)">com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.Entry.html#%3Cinit%3E(java.lang.String,int,int,int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/TranslationCheck.ResourceBundle.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/TranslationCheck.ResourceBundle.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/TranslationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/TranslationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.UniqueProperties.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.UniqueProperties.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ClosingParensOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ClosingParensOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ElementStyleOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.ElementStyleOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.TrailingArrayCommaOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.TrailingArrayCommaOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)">com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST,boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.MethodNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.ScopeState.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.ScopeState.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)">com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.FieldFrame)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.FinalVariableCandidate.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.ScopeData.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.ScopeData.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.FieldFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.FieldFrame,boolean,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)">com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.html#isInContext(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D%5B%5D,java.util.BitSet)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AbstractFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.AnonymousClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.BlockFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.CatchFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ClassFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ConstructorFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.ForFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.FrameType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.FrameType.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.MethodFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.TryWithResourcesFrame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck.AbstractFrame,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.Context.html#%3Cinit%3E(boolean)">com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.Context.html#%3Cinit%3E(boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.TypeDeclDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.VariableDesc.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.ClassDesc.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.TypeDeclarationDescription.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.Details.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.AbstractImportControl,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.html#%3Cinit%3E(boolean,boolean,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.html#%3Cinit%3E(boolean,boolean,boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.ImportDetails.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.RuleMatchForImport.html#%3Cinit%3E(java.lang.String,int,int)">com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.RuleMatchForImport.html#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.html#getGroupNumber(java.util.regex.Pattern%5B%5D,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl,java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)">com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.html#%3Cinit%3E(java.lang.String,boolean,com.puppycrawl.tools.checkstyle.checks.imports.MismatchStrategy)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)">com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.html#%3Cinit%3E(boolean,boolean,java.lang.String,boolean,boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)">com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.Frame.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.Frame)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)">com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.html#checkChildren(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,boolean,boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)">com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentLevel,int...)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(int)">com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.html#%3Cinit%3E(int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.LineWrappingOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.LineWrappingOptions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)">com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)">com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck,com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.FileContext.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.FileContext.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.html#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.html#%3Cinit%3E(java.lang.String,int,int,boolean,boolean,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.html#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ClassInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.Token)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.ExceptionInfo.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.ClassInfo)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FullIdent)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(java.lang.String,int,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.Token.html#%3Cinit%3E(java.lang.String,int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.html#getMultilineNoArgTags(java.util.regex.Matcher,java.lang.String%5B%5D,int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.html#%3Cinit%3E(int,int,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.Type.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.Type.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo.Type)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.html#%3Cinit%3E(java.util.Collection,java.util.Collection)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.Point.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.Point.html#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#%3Cinit%3E(java.lang.String%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#%3Cinit%3E(java.lang.String%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#findChar(java.lang.String%5B%5D,char,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getNextPoint(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#getTagId(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isCommentTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#isTag(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTag(java.lang.String%5B%5D,int,int,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTags(java.lang.String%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#parseTags(java.lang.String%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)">com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.html#skipHtmlComment(java.lang.String%5B%5D,com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser.Point)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)">com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.html#%3Cinit%3E(java.lang.String,java.lang.String,com.puppycrawl.tools.checkstyle.api.LineColumn)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.ClassContext.html#%3Cinit%3E(java.lang.String,com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.html#%3Cinit%3E(int)">com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.html#%3Cinit%3E(int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.Context.html#%3Cinit%3E(boolean)">com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.Context.html#%3Cinit%3E(boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.Counter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.Counter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.TokenEnd.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.TokenEnd.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.Values.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)">com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.Values.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)">com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.FileContents)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.Builder.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.Builder.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)">com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.checks.regexp.DetectorOptions)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.Context.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.MethodCounter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processNestedGenerics(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.html#processSingleGeneric(com.puppycrawl.tools.checkstyle.api.DetailAST,int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isBlockCommentEnd(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isBlockCommentEnd(int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isFirstInLine(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isFirstInLine(int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSingleSpace(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSingleSpace(int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSpace(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isSpace(int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.html#isTextSeparatedCorrectlyFromPrevious(int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.html#%3Cinit%3E(int)">com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.html#%3Cinit%3E(int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.html#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.Tag.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyTextFilter)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.Suppression.html#%3Cinit%3E(java.lang.String,int,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter.SuppressionType,com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.SuppressionType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.SuppressionType.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)">com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.Tag.html#%3Cinit%3E(int,int,java.lang.String,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter.TagType,com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.TagType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.TagType.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.html#%3Cinit%3E(java.util.regex.Pattern,java.util.regex.Pattern,java.util.regex.Pattern,java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)">com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer,org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.dfa.DFA%5B%5D,org.antlr.v4.runtime.atn.PredictionContextCache)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/CodeSelector.html#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)">com/puppycrawl/tools/checkstyle/gui/CodeSelector.html#%3Cinit%3E(java.lang.Object,javax.swing.JTextArea,java.util.Collection)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)">com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,java.util.List)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)">com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailNode,java.util.List)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)">com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/Main.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/Main.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.ExpandCollapseAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.ExpandCollapseAction.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.FileSelectionAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.FileSelectionAction.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.FindNodeByXpathAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.FindNodeByXpathAction.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.JavaFileFilter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.JavaFileFilter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.ReloadAction.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.ReloadAction.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrame.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrame.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrameModel.ParseMode.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/gui/MainFrameModel.ParseMode.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/MainFrameModel.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/MainFrameModel.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)">com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.html#fireTreeStructureChanged(java.lang.Object,java.lang.Object%5B%5D,int%5B%5D,java.lang.Object...)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/TreeTable.TreeTableCellEditor.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/TreeTable.TreeTableCellEditor.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)">com/puppycrawl/tools/checkstyle/gui/TreeTable.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)">com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.TreeTable,javax.swing.tree.TreeModel)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeExpansionListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeExpansionListener.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeModelListener.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.UpdatingTreeModelListener.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)">com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.gui.ParseTreeTableModel,javax.swing.JTree)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/ModuleDetails.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/ModuleDetails.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/ModuleType.html#%3Cinit%3E(java.lang.String)">com/puppycrawl/tools/checkstyle/meta/ModuleType.html#%3Cinit%3E(java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/ExampleMacro.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/ExampleMacro.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/PropertiesMacro.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/PropertiesMacro.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/SiteUtil.DescriptionExtractor.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/SiteUtil.DescriptionExtractor.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/SiteUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/SiteUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/SiteUtil.html#getDifference(int%5B%5D,int...)">com/puppycrawl/tools/checkstyle/site/SiteUtil.html#getDifference(int%5B%5D,int...)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#%3Cinit%3E(java.io.Writer,java.lang.String)">com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#%3Cinit%3E(java.io.Writer,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#tableRows(int%5B%5D,boolean)">com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.html#tableRows(int%5B%5D,boolean)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/CheckUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/CheckUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#endsWith(int%5B%5D,java.lang.String)">com/puppycrawl/tools/checkstyle/utils/CodePointUtil.html#endsWith(int%5B%5D,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#isCodePointWhitespace(int%5B%5D,int)">com/puppycrawl/tools/checkstyle/utils/CommonUtil.html#isCodePointWhitespace(int%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/FilterUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/FilterUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/JavadocUtil.JavadocTagType.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/JavadocUtil.JavadocTagType.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/JavadocUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/JavadocUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/ParserUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ParserUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/ScopeUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/ScopeUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/TokenUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/TokenUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/XpathUtil.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/utils/XpathUtil.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)">com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#%3Cinit%3E(net.sf.saxon.om.TreeInfo)">com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#%3Cinit%3E(net.sf.saxon.om.TreeInfo)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)">com/puppycrawl/tools/checkstyle/xpath/AbstractNode.html#getDeclaredNamespaces(net.sf.saxon.om.NamespaceBinding%5B%5D)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/AttributeNode.html#%3Cinit%3E(java.lang.String,java.lang.String)">com/puppycrawl/tools/checkstyle/xpath/AttributeNode.html#%3Cinit%3E(java.lang.String,java.lang.String)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)">com/puppycrawl/tools/checkstyle/xpath/ElementNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.xpath.AbstractNode,com.puppycrawl.tools.checkstyle.api.DetailAST,int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)">com/puppycrawl/tools/checkstyle/xpath/RootNode.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)">com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)">com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.html#%3Cinit%3E(com.puppycrawl.tools.checkstyle.api.DetailAST,int,int,int,com.puppycrawl.tools.checkstyle.api.FileText,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.StartWith.html#%3Cinit%3E()">com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.StartWith.html#%3Cinit%3E()</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)">com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo,com.puppycrawl.tools.checkstyle.xpath.iterators.DescendantIterator.StartWith)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)">com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.html#%3Cinit%3E(net.sf.saxon.om.NodeInfo)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.html#%3Cinit%3E(java.util.Collection)">com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.html#%3Cinit%3E(java.util.Collection)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#copyOfArray(T%5B%5D,int)">com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.html#copyOfArray(T%5B%5D,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.CustomPrintWriter.html#%3Cinit%3E(java.io.Writer)">com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.CustomPrintWriter.html#%3Cinit%3E(java.io.Writer)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer)">com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.html#%3Cinit%3E(org.antlr.v4.runtime.Lexer)">#%3Cinit%3E(org.antlr.v4.runtime.Lexer)</a>: doesn't exist.
+<a href="apidocs/com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.StringTemplateContext.html#%3Cinit%3E(int,int)">#%3Cinit%3E(int,int)</a>: doesn't exist.
+<a href="com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.StringTemplateContext.html#%3Cinit%3E(int,int)">com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.StringTemplateContext.html#%3Cinit%3E(int,int)</a>: doesn't exist.
diff --git a/config/pitest-suppressions/pitest-api-suppressions.xml b/config/pitest-suppressions/pitest-api-suppressions.xml
index b00396e26a9..ee8189065be 100644
--- a/config/pitest-suppressions/pitest-api-suppressions.xml
+++ b/config/pitest-suppressions/pitest-api-suppressions.xml
@@ -9,51 +9,6 @@
     <lineContent>charset = null;</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>FileText.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.api.FileText</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/nio/charset/CharsetDecoder::onMalformedInput</description>
-    <lineContent>decoder.onMalformedInput(CodingErrorAction.REPLACE);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>FileText.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.api.FileText</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/nio/charset/CharsetDecoder::onMalformedInput with receiver</description>
-    <lineContent>decoder.onMalformedInput(CodingErrorAction.REPLACE);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>FileText.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.api.FileText</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/nio/charset/CharsetDecoder::onUnmappableCharacter</description>
-    <lineContent>decoder.onUnmappableCharacter(CodingErrorAction.REPLACE);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>FileText.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.api.FileText</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/nio/charset/CharsetDecoder::onUnmappableCharacter with receiver</description>
-    <lineContent>decoder.onUnmappableCharacter(CodingErrorAction.REPLACE);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Violation.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.api.Violation</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Arrays::copyOf with argument</description>
-    <lineContent>this.args = Arrays.copyOf(args, args.length);</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>Violation.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.api.Violation</mutatedClass>
@@ -62,13 +17,4 @@
     <description>Removed assignment to member variable args</description>
     <lineContent>this.args = null;</lineContent>
   </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Violation.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.api.Violation</mutatedClass>
-    <mutatedMethod>compareTo</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/String::compareTo</description>
-    <lineContent>result = getViolation().compareTo(other.getViolation());</lineContent>
-  </mutation>
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-coding-1-suppressions.xml b/config/pitest-suppressions/pitest-coding-1-suppressions.xml
new file mode 100644
index 00000000000..564e522b55e
--- /dev/null
+++ b/config/pitest-suppressions/pitest-coding-1-suppressions.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressedMutations>
+  <mutation unstable="false">
+    <sourceFile>VariableDeclarationUsageDistanceCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck</mutatedClass>
+    <mutatedMethod>getDistToVariableUsageInChildNode</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
+    <description>replaced call to com/puppycrawl/tools/checkstyle/api/DetailAST::getFirstChild with receiver</description>
+    <lineContent>examineNode = examineNode.getFirstChild().getNextSibling();</lineContent>
+  </mutation>
+
+  <mutation unstable="false">
+    <sourceFile>VariableDeclarationUsageDistanceCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck</mutatedClass>
+    <mutatedMethod>getDistToVariableUsageInChildNode</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
+    <description>replaced call to com/puppycrawl/tools/checkstyle/api/DetailAST::getNextSibling with receiver</description>
+    <lineContent>examineNode = examineNode.getFirstChild().getNextSibling();</lineContent>
+  </mutation>
+
+  <mutation unstable="false">
+    <sourceFile>VariableDeclarationUsageDistanceCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck</mutatedClass>
+    <mutatedMethod>getDistToVariableUsageInChildNode</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
+    <description>removed call to com/puppycrawl/tools/checkstyle/api/DetailAST::getType</description>
+    <lineContent>if (examineNode.getType() == TokenTypes.LABELED_STAT) {</lineContent>
+  </mutation>
+
+  <mutation unstable="false">
+    <sourceFile>VariableDeclarationUsageDistanceCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck</mutatedClass>
+    <mutatedMethod>getDistToVariableUsageInChildNode</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE</mutator>
+    <description>removed conditional - replaced equality check with false</description>
+    <lineContent>if (examineNode.getType() == TokenTypes.LABELED_STAT) {</lineContent>
+  </mutation>
+
+  <mutation unstable="false">
+    <sourceFile>VariableDeclarationUsageDistanceCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck</mutatedClass>
+    <mutatedMethod>getDistToVariableUsageInChildNode</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.RemoveSwitchMutator_4</mutator>
+    <description>RemoveSwitch 4 (case value 89)</description>
+    <lineContent>switch (examineNode.getType()) {</lineContent>
+  </mutation>
+</suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-coding-2-suppressions.xml b/config/pitest-suppressions/pitest-coding-2-suppressions.xml
index d47cdd11c82..894830e692b 100644
--- a/config/pitest-suppressions/pitest-coding-2-suppressions.xml
+++ b/config/pitest-suppressions/pitest-coding-2-suppressions.xml
@@ -1,67 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressedMutations>
+  <!-- until https://github.com/checkstyle/checkstyle/issues/14894 -->
   <mutation unstable="false">
-    <sourceFile>FallThroughCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck</mutatedClass>
-    <mutatedMethod>matchesComment</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Matcher::start</description>
-    <lineContent>lineNo, matcher.start(), lineNo, matcher.end());</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>FinalLocalVariableCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck</mutatedClass>
-    <mutatedMethod>leaveToken</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/Deque::pop</description>
-    <lineContent>prevScopeUninitializedVariables.pop();</lineContent>
+    <sourceFile>UnusedLocalVariableCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck</mutatedClass>
+    <mutatedMethod>getBlockContainingLocalAnonInnerClass</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NegateConditionalsMutator</mutator>
+    <description>negated conditional</description>
+    <lineContent>if (currentAst.getType() == TokenTypes.LAMBDA) {</lineContent>
   </mutation>
 
-
-
-
-
-
-
-
-
-
-
   <mutation unstable="false">
-    <sourceFile>MatchXpathCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.MatchXpathCheck</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable query</description>
-    <lineContent>private String query = &quot;&quot;;</lineContent>
+    <sourceFile>UnusedLocalVariableCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck</mutatedClass>
+    <mutatedMethod>getBlockContainingLocalAnonInnerClass</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
+    <description>removed conditional - replaced equality check with true</description>
+    <lineContent>if (currentAst.getType() == TokenTypes.LAMBDA) {</lineContent>
   </mutation>
 
   <mutation unstable="false">
-    <sourceFile>MatchXpathCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.MatchXpathCheck</mutatedClass>
-    <mutatedMethod>setQuery</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable query</description>
-    <lineContent>this.query = query;</lineContent>
+    <sourceFile>UnusedLocalVariableCheck.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck</mutatedClass>
+    <mutatedMethod>isInsideLocalAnonInnerClass</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NegateConditionalsMutator</mutator>
+    <description>negated conditional</description>
+    <lineContent>if (currentAst.getType() == TokenTypes.SLIST) {</lineContent>
   </mutation>
 
-
-
-
-
-
-
-
-
-
   <mutation unstable="false">
     <sourceFile>UnusedLocalVariableCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck$TypeDeclDesc</mutatedClass>
-    <mutatedMethod>getUpdatedCopyOfVarStack</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/api/DetailAST::getLastChild with receiver</description>
-    <lineContent>final DetailAST updatedScope = literalNewAst.getLastChild();</lineContent>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck</mutatedClass>
+    <mutatedMethod>isInsideLocalAnonInnerClass</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
+    <description>removed conditional - replaced equality check with true</description>
+    <lineContent>if (currentAst.getType() == TokenTypes.SLIST) {</lineContent>
   </mutation>
-
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-common-2-suppressions.xml b/config/pitest-suppressions/pitest-common-2-suppressions.xml
deleted file mode 100644
index 3945d750166..00000000000
--- a/config/pitest-suppressions/pitest-common-2-suppressions.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<suppressedMutations>
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable childCount</description>
-    <lineContent>private int childCount = NOT_INITIALIZED;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>addChild</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/DetailAstImpl::getLastChild</description>
-    <lineContent>astImpl.previousSibling = (DetailAstImpl) getLastChild();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>addChild</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable previousSibling</description>
-    <lineContent>astImpl.previousSibling = (DetailAstImpl) getLastChild();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>addNextSibling</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable previousSibling</description>
-    <lineContent>astImpl.previousSibling = this;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>addNextSibling</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable previousSibling</description>
-    <lineContent>sibling.previousSibling = astImpl;</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>removeChildren</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable firstChild</description>
-    <lineContent>firstChild = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>toString</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/DetailAstImpl::getColumnNo</description>
-    <lineContent>return text + &quot;[&quot; + getLineNo() + &quot;x&quot; + getColumnNo() + &quot;]&quot;;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>DetailAstImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.DetailAstImpl</mutatedClass>
-    <mutatedMethod>toString</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/DetailAstImpl::getLineNo</description>
-    <lineContent>return text + &quot;[&quot; + getLineNo() + &quot;x&quot; + getColumnNo() + &quot;]&quot;;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavaParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.JavaParser</mutatedClass>
-    <mutatedMethod>appendHiddenCommentNodes</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.returns.NullReturnValsMutator</mutator>
-    <description>replaced return value with null for com/puppycrawl/tools/checkstyle/JavaParser::appendHiddenCommentNodes</description>
-    <lineContent>return root;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavaParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.JavaParser</mutatedClass>
-    <mutatedMethod>parseFile</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/io/File::getAbsoluteFile with receiver</description>
-    <lineContent>final FileText text = new FileText(file.getAbsoluteFile(),</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocPropertiesGenerator.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.JavadocPropertiesGenerator</mutatedClass>
-    <mutatedMethod>getFirstJavadocSentence</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/api/DetailAST::getNextSibling</description>
-    <lineContent>child = child.getNextSibling()) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocPropertiesGenerator.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.JavadocPropertiesGenerator</mutatedClass>
-    <mutatedMethod>main</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to picocli/CommandLine::setUsageHelpWidth with receiver</description>
-    <lineContent>final CommandLine cmd = new CommandLine(cliOptions).setUsageHelpWidth(USAGE_HELP_WIDTH);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XmlLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.XmlLoader</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Map::copyOf with argument</description>
-    <lineContent>this.publicIdToResourceNameMap = Map.copyOf(publicIdToResourceNameMap);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XmlLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.XmlLoader</mutatedClass>
-    <mutatedMethod>resolveEntity</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to org/xml/sax/helpers/DefaultHandler::resolveEntity</description>
-    <lineContent>inputSource = super.resolveEntity(publicId, systemId);</lineContent>
-  </mutation>
-
-  <!-- until https://github.com/checkstyle/checkstyle/issues/12186 -->
-  <mutation unstable="false">
-    <sourceFile>JavaParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.JavaParser</mutatedClass>
-    <mutatedMethod>parse</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.VoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageLexer::removeErrorListeners</description>
-    <lineContent>lexer.removeErrorListeners();</lineContent>
-  </mutation>
-</suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-common-suppressions.xml b/config/pitest-suppressions/pitest-common-suppressions.xml
index 1ed5890ad56..5d3e15ec845 100644
--- a/config/pitest-suppressions/pitest-common-suppressions.xml
+++ b/config/pitest-suppressions/pitest-common-suppressions.xml
@@ -1,183 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressedMutations>
-  <mutation unstable="false">
-    <sourceFile>AuditEventDefaultFormatter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.AuditEventDefaultFormatter</mutatedClass>
-    <mutatedMethod>format</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter::calculateBufferLength</description>
-    <lineContent>final int bufLen = calculateBufferLength(event, severityLevelName.length());</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>AuditEventDefaultFormatter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.AuditEventDefaultFormatter</mutatedClass>
-    <mutatedMethod>format</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/String::length</description>
-    <lineContent>final int bufLen = calculateBufferLength(event, severityLevelName.length());</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>AuditEventDefaultFormatter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.AuditEventDefaultFormatter</mutatedClass>
-    <mutatedMethod>format</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter::calculateBufferLength with argument</description>
-    <lineContent>final int bufLen = calculateBufferLength(event, severityLevelName.length());</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable fileExtensions</description>
-    <lineContent>private String[] fileExtensions = CommonUtil.EMPTY_STRING_ARRAY;</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>Checker.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
     <mutatedMethod>acceptFileStarted</mutatedMethod>
     <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/CommonUtil::relativizeAndNormalizePath with argument</description>
-    <lineContent>final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>fireErrors</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/CommonUtil::relativizeAndNormalizePath with argument</description>
-    <lineContent>final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>fireFileFinished</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/CommonUtil::relativizeAndNormalizePath with argument</description>
-    <lineContent>final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>fireFileStarted</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/CommonUtil::relativizeAndNormalizePath with argument</description>
-    <lineContent>final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>getExternalResourceLocations</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/util/stream/Stream::map with receiver</description>
-    <lineContent>.map(ExternalResourceHolder.class::cast)</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>processFile</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/io/IOException::getMessage</description>
-    <lineContent>new String[] {ioe.getMessage()}, null, getClass(), null));</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>processFiles</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/io/File::getPath</description>
-    <lineContent>throw new Error(&quot;Error was thrown while processing &quot; + file.getPath(), error);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>setCharset</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable charset</description>
-    <lineContent>this.charset = charset;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>setFileExtensions</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable fileExtensions</description>
-    <lineContent>fileExtensions = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>setSeverity</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/api/SeverityLevel::getInstance</description>
-    <lineContent>this.severity = SeverityLevel.getInstance(severity);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>Checker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.Checker</mutatedClass>
-    <mutatedMethod>setSeverity</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable severity</description>
-    <lineContent>this.severity = SeverityLevel.getInstance(severity);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ConfigurationLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.ConfigurationLoader</mutatedClass>
-    <mutatedMethod>replaceProperties</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/StringBuilder::length</description>
-    <lineContent>sb.replace(0, sb.length(), defaultValue);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ConfigurationLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.ConfigurationLoader$InternalLoader</mutatedClass>
-    <mutatedMethod>startElement</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to org/xml/sax/Attributes::getValue</description>
-    <lineContent>final String value = attributes.getValue(VALUE);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ConfigurationLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.ConfigurationLoader$InternalLoader</mutatedClass>
-    <mutatedMethod>startElement</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to org/xml/sax/Attributes::getValue with argument</description>
-    <lineContent>final String value = attributes.getValue(VALUE);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ConfigurationLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.ConfigurationLoader$InternalLoader</mutatedClass>
-    <mutatedMethod>startElement</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to org/xml/sax/Attributes::getValue</description>
-    <lineContent>overridePropsResolver, attributes.getValue(DEFAULT));</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>LocalizedMessage.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.LocalizedMessage</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Arrays::copyOf with argument</description>
-    <lineContent>this.args = Arrays.copyOf(args, args.length);</lineContent>
+    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/CommonUtil::relativizePath with argument</description>
+    <lineContent>final String stripped = CommonUtil.relativizePath(basedir, fileName);</lineContent>
   </mutation>
 
   <mutation unstable="false">
@@ -189,42 +18,6 @@
     <lineContent>this.args = null;</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>PackageObjectFactory.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.PackageObjectFactory</mutatedClass>
-    <mutatedMethod>createModule</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/String::contains</description>
-    <lineContent>if (!name.contains(PACKAGE_SEPARATOR)) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>PackageObjectFactory.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.PackageObjectFactory</mutatedClass>
-    <mutatedMethod>createModule</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (!name.contains(PACKAGE_SEPARATOR)) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>PackageObjectFactory.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.PackageObjectFactory</mutatedClass>
-    <mutatedMethod>createModule</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (thirdPartyNameToFullModuleNames == null) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>PackageObjectFactory.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.PackageObjectFactory</mutatedClass>
-    <mutatedMethod>createObjectFromFullModuleNames</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/util/stream/Stream::sorted with receiver</description>
-    <lineContent>.sorted()</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SarifLogger.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.SarifLogger</mutatedClass>
@@ -332,22 +125,4 @@
     <description>replaced call to java/util/Collections::synchronizedList with argument</description>
     <lineContent>private final List&lt;Throwable&gt; exceptions = Collections.synchronizedList(new ArrayList&lt;&gt;());</lineContent>
   </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XMLLogger.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.XMLLogger$FileMessages</mutatedClass>
-    <mutatedMethod>getErrors</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Collections::unmodifiableList with argument</description>
-    <lineContent>return Collections.unmodifiableList(errors);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XMLLogger.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.XMLLogger$FileMessages</mutatedClass>
-    <mutatedMethod>getExceptions</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Collections::unmodifiableList with argument</description>
-    <lineContent>return Collections.unmodifiableList(exceptions);</lineContent>
-  </mutation>
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-filters-suppressions.xml b/config/pitest-suppressions/pitest-filters-suppressions.xml
index 550fd4f59a3..f81ddc63f23 100644
--- a/config/pitest-suppressions/pitest-filters-suppressions.xml
+++ b/config/pitest-suppressions/pitest-filters-suppressions.xml
@@ -1,32 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressedMutations>
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Pattern::pattern</description>
-    <lineContent>checkPattern = checks.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable checkPattern</description>
-    <lineContent>checkPattern = checks.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable checkPattern</description>
-    <lineContent>checkPattern = null;</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SuppressFilterElement.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
@@ -63,42 +36,6 @@
     <lineContent>columnsCsv = null;</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Pattern::pattern</description>
-    <lineContent>filePattern = files.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable filePattern</description>
-    <lineContent>filePattern = files.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable filePattern</description>
-    <lineContent>filePattern = files;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable filePattern</description>
-    <lineContent>filePattern = null;</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SuppressFilterElement.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
@@ -135,42 +72,6 @@
     <lineContent>linesCsv = null;</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Pattern::pattern</description>
-    <lineContent>messagePattern = message.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable messagePattern</description>
-    <lineContent>messagePattern = message.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable messagePattern</description>
-    <lineContent>messagePattern = message;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable messagePattern</description>
-    <lineContent>messagePattern = null;</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SuppressFilterElement.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement</mutatedClass>
@@ -225,24 +126,6 @@
     <lineContent>if (!cachedFileAbsolutePath.equals(eventFileTextAbsolutePath)) {</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>SuppressWithPlainTextCommentFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter</mutatedClass>
-    <mutatedMethod>getSuppression</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Matcher::start</description>
-    <lineContent>lineNo + 1, offCommentMatcher.start(), SuppressionType.OFF, this);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressWithPlainTextCommentFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter</mutatedClass>
-    <mutatedMethod>getSuppression</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Matcher::start</description>
-    <lineContent>lineNo + 1, onCommentMatcher.start(), SuppressionType.ON, this);</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SuppressWithPlainTextCommentFilter.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter$Suppression</mutatedClass>
@@ -261,33 +144,6 @@
     <lineContent>eventMessageRegexp = null;</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>SuppressWithPlainTextCommentFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter$Suppression</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable columnNo</description>
-    <lineContent>this.columnNo = columnNo;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressWithPlainTextCommentFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilter$Suppression</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable text</description>
-    <lineContent>this.text = text;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressionCommentFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter</mutatedClass>
-    <mutatedMethod>accept</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter::getFileContents</description>
-    <lineContent>if (getFileContents() != currentContents) {</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SuppressionCommentFilter.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter$Tag</mutatedClass>
@@ -306,42 +162,6 @@
     <lineContent>tagMessageRegexp = null;</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>SuppressionFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionFilter</mutatedClass>
-    <mutatedMethod>finishLocalSetup</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable filters</description>
-    <lineContent>filters = SuppressionsLoader.loadSuppressions(file);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressionFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionFilter</mutatedClass>
-    <mutatedMethod>finishLocalSetup</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable filters</description>
-    <lineContent>filters = new FilterSet();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressionFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionFilter</mutatedClass>
-    <mutatedMethod>getExternalResourceLocations</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.returns.EmptyObjectReturnValsMutator</mutator>
-    <description>replaced return value with Collections.emptySet for com/puppycrawl/tools/checkstyle/filters/SuppressionFilter::getExternalResourceLocations</description>
-    <lineContent>return Collections.singleton(file);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>SuppressionXpathFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionXpathFilter</mutatedClass>
-    <mutatedMethod>finishLocalSetup</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/Set::addAll</description>
-    <lineContent>filters.addAll(SuppressionsLoader.loadXpathSuppressions(file));</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SuppressionXpathSingleFilter.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionXpathSingleFilter</mutatedClass>
@@ -351,15 +171,6 @@
     <lineContent>this.checks = null;</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>SuppressionXpathSingleFilter.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionXpathSingleFilter</mutatedClass>
-    <mutatedMethod>setFiles</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable files</description>
-    <lineContent>this.files = null;</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>SuppressionXpathSingleFilter.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.SuppressionXpathSingleFilter</mutatedClass>
@@ -387,114 +198,6 @@
     <lineContent>Optional.ofNullable(checks).map(CommonUtil::createPattern).orElse(null),</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Pattern::pattern</description>
-    <lineContent>checkPattern = checks.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable checkPattern</description>
-    <lineContent>checkPattern = checks.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable checkPattern</description>
-    <lineContent>checkPattern = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable checkRegexp</description>
-    <lineContent>checkRegexp = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Pattern::pattern</description>
-    <lineContent>filePattern = files.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable filePattern</description>
-    <lineContent>filePattern = files.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable filePattern</description>
-    <lineContent>filePattern = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable fileRegexp</description>
-    <lineContent>fileRegexp = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Pattern::pattern</description>
-    <lineContent>messagePattern = message.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable messagePattern</description>
-    <lineContent>messagePattern = message.pattern();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable messagePattern</description>
-    <lineContent>messagePattern = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathFilterElement.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable messageRegexp</description>
-    <lineContent>messageRegexp = null;</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>XpathFilterElement.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.filters.XpathFilterElement</mutatedClass>
@@ -510,6 +213,6 @@
     <mutatedMethod>isXpathQueryMatching</mutatedMethod>
     <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
     <description>replaced call to java/util/stream/Stream::map with receiver</description>
-    <lineContent>.stream().map(AbstractNode.class::cast).collect(Collectors.toList());</lineContent>
+    <lineContent>.stream().map(AbstractNode.class::cast)</lineContent>
   </mutation>
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-imports-suppressions.xml b/config/pitest-suppressions/pitest-imports-suppressions.xml
index a0613f147de..1737714a513 100644
--- a/config/pitest-suppressions/pitest-imports-suppressions.xml
+++ b/config/pitest-suppressions/pitest-imports-suppressions.xml
@@ -1,77 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressedMutations>
-  <mutation unstable="false">
-    <sourceFile>FileImportControl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.imports.FileImportControl</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.MemberVariableMutator</mutator>
-    <description>Removed assignment to member variable patternForExactMatch</description>
-    <lineContent>patternForExactMatch = null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>FileImportControl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.imports.FileImportControl</mutatedClass>
-    <mutatedMethod>&lt;init&gt;</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl::encloseInGroup with argument</description>
-    <lineContent>this.name = encloseInGroup(name);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ImportControlLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.imports.ImportControlLoader</mutatedClass>
-    <mutatedMethod>load</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/Exception::getMessage</description>
-    <lineContent>+ &quot; - &quot; + ex.getMessage(), ex);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ImportControlLoader.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.imports.ImportControlLoader</mutatedClass>
-    <mutatedMethod>startElement</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader::containsRegexAttribute</description>
-    <lineContent>final boolean regex = containsRegexAttribute(attributes);</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>ImportOrderCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck</mutatedClass>
-    <mutatedMethod>getGroupNumber</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Matcher::end</description>
-    <lineContent>bestEnd = matcher.end();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ImportOrderCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck</mutatedClass>
-    <mutatedMethod>getGroupNumber</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/util/regex/Matcher::start</description>
-    <lineContent>if (matcher.start() &lt; bestPos) {</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>PkgImportControl.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.imports.PkgImportControl</mutatedClass>
@@ -98,5 +26,4 @@
     <description>Removed assignment to member variable regex</description>
     <lineContent>this.regex = false;</lineContent>
   </mutation>
-
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-javadoc-suppressions.xml b/config/pitest-suppressions/pitest-javadoc-suppressions.xml
index f9989dd9a31..1a0f9d24968 100644
--- a/config/pitest-suppressions/pitest-javadoc-suppressions.xml
+++ b/config/pitest-suppressions/pitest-javadoc-suppressions.xml
@@ -1,32 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressedMutations>
-  <mutation unstable="false">
-    <sourceFile>AbstractJavadocCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck</mutatedClass>
-    <mutatedMethod>init</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/Class::getName</description>
-    <lineContent>JavadocUtil.getTokenName(javadocTokenId), getClass().getName());</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>AbstractJavadocCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck</mutatedClass>
-    <mutatedMethod>validateDefaultJavadocTokens</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (getRequiredJavadocTokens().length != 0) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>AbstractJavadocCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck</mutatedClass>
-    <mutatedMethod>validateDefaultJavadocTokens</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/Class::getName</description>
-    <lineContent>javadocToken, getClass().getName());</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>AbstractJavadocCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck</mutatedClass>
@@ -45,15 +18,6 @@
     <lineContent>if (curNode != null) {</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>AbstractJavadocCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck</mutatedClass>
-    <mutatedMethod>walk</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (toVisit == null) {</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>AbstractJavadocCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck</mutatedClass>
@@ -63,33 +27,6 @@
     <lineContent>waitsForProcessing = shouldBeProcessed(curNode);</lineContent>
   </mutation>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   <mutation unstable="false">
     <sourceFile>JavadocMethodCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
@@ -117,33 +54,6 @@
     <lineContent>final Token token = new Token(tag.getFirstArg(), tag.getLineNo(), tag</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>JavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
-    <mutatedMethod>getMethodTags</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck::calculateTagColumn</description>
-    <lineContent>final int col = calculateTagColumn(noargCurlyMatcher, i, startColumnNumber);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
-    <mutatedMethod>getMethodTags</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck::calculateTagColumn with argument</description>
-    <lineContent>final int col = calculateTagColumn(noargCurlyMatcher, i, startColumnNumber);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
-    <mutatedMethod>getParameters</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (child.getType() == TokenTypes.PARAMETER_DEF) {</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>JavadocMethodCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
@@ -171,24 +81,6 @@
     <lineContent>if (class1.contains(separator) || class2.contains(separator)) {</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>JavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
-    <mutatedMethod>isInIgnoreBlock</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/api/DetailAST::getParent with receiver</description>
-    <lineContent>DetailAST ancestor = throwAst.getParent();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
-    <mutatedMethod>isInIgnoreBlock</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (ancestor.getType() == TokenTypes.LITERAL_TRY</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>JavadocMethodCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
@@ -207,15 +99,6 @@
     <lineContent>foundThrows.add(documentedClassInfo.getName().getText());</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>JavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
-    <mutatedMethod>setAccessModifiers</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Arrays::copyOf with argument</description>
-    <lineContent>Arrays.copyOf(accessModifiers, accessModifiers.length);</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>JavadocMethodCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck</mutatedClass>
@@ -261,42 +144,6 @@
     <lineContent>lineNo = fullIdent.getLineNo();</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>JavadocMissingLeadingAsteriskCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck</mutatedClass>
-    <mutatedMethod>isLastLine</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (detailNode.getType() == JavadocTokenTypes.TEXT</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocNodeImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl</mutatedClass>
-    <mutatedMethod>getChildren</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/util/Optional::map with receiver</description>
-    <lineContent>.map(array -&gt; Arrays.copyOf(array, array.length))</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocNodeImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl</mutatedClass>
-    <mutatedMethod>lambda$getChildren$0</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Arrays::copyOf with argument</description>
-    <lineContent>.map(array -&gt; Arrays.copyOf(array, array.length))</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocNodeImpl.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl</mutatedClass>
-    <mutatedMethod>setChildren</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Arrays::copyOf with argument</description>
-    <lineContent>this.children = Arrays.copyOf(children, children.length);</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>JavadocNodeImpl.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl</mutatedClass>
@@ -305,132 +152,6 @@
     <description>removed call to java/util/Objects::hashCode</description>
     <lineContent>+ &quot;, children=&quot; + Objects.hashCode(children)</lineContent>
   </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>JavadocParagraphCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck</mutatedClass>
-    <mutatedMethod>getNearestEmptyLine</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/JavadocUtil::getPreviousSibling with argument</description>
-    <lineContent>DetailNode newLine = JavadocUtil.getPreviousSibling(node);</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>JavadocStyleCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck</mutatedClass>
-    <mutatedMethod>findTextStart</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.RemoveIncrementsMutator</mutator>
-    <description>Removed increment 2</description>
-    <lineContent>index += 2;</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
   <mutation unstable="false">
     <sourceFile>JavadocStyleCheck.java</sourceFile>
@@ -450,15 +171,6 @@
     <lineContent>builder.deleteCharAt(index);</lineContent>
   </mutation>
 
-
-
-
-
-
-
-
-
-
   <mutation unstable="false">
     <sourceFile>JavadocStyleCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck</mutatedClass>
@@ -486,68 +198,14 @@
     <lineContent>if (Character.isWhitespace(builder.charAt(index))) {</lineContent>
   </mutation>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>JavadocTagInfo.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$11</mutatedClass>
-    <mutatedMethod>isValidOn</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>return astType == TokenTypes.METHOD_DEF</lineContent>
-  </mutation>
+  <mutation unstable="false">
+    <sourceFile>JavadocTagInfo.java</sourceFile>
+    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagInfo$11</mutatedClass>
+    <mutatedMethod>isValidOn</mutatedMethod>
+    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
+    <description>removed conditional - replaced equality check with true</description>
+    <lineContent>return astType == TokenTypes.METHOD_DEF</lineContent>
+  </mutation>
 
   <mutation unstable="false">
     <sourceFile>JavadocTagInfo.java</sourceFile>
@@ -576,354 +234,6 @@
     <lineContent>return astType == TokenTypes.VARIABLE_DEF</lineContent>
   </mutation>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>MissingJavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck</mutatedClass>
-    <mutatedMethod>isContentsAllowMissingJavadoc</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE</mutator>
-    <description>removed conditional - replaced equality check with false</description>
-    <lineContent>return (ast.getType() == TokenTypes.METHOD_DEF</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>MissingJavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck</mutatedClass>
-    <mutatedMethod>isContentsAllowMissingJavadoc</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>|| ast.getType() == TokenTypes.COMPACT_CTOR_DEF)</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>MissingJavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck</mutatedClass>
-    <mutatedMethod>isContentsAllowMissingJavadoc</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE</mutator>
-    <description>removed conditional - replaced equality check with false</description>
-    <lineContent>|| ast.getType() == TokenTypes.CTOR_DEF</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>MissingJavadocMethodCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck</mutatedClass>
-    <mutatedMethod>shouldCheck</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>return (excludeScope == null</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>SummaryJavadocCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck</mutatedClass>
-    <mutatedMethod>startsWithInheritDoc</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>for (int i = 0; !found; i++) {</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>getTagId</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/Character::isJavaIdentifierStart</description>
-    <lineContent>&amp;&amp; (Character.isJavaIdentifierStart(text.charAt(position))</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>getTagId</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/String::charAt</description>
-    <lineContent>&amp;&amp; (Character.isJavaIdentifierStart(text.charAt(position))</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>getTagId</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>&amp;&amp; (Character.isJavaIdentifierStart(text.charAt(position))</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>getTagId</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/lang/String::trim with receiver</description>
-    <lineContent>text = text.substring(column).trim();</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>parseTag</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE</mutator>
-    <description>removed conditional - replaced equality check with false</description>
-    <lineContent>if (incompleteTag) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>parseTags</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser::findChar with argument</description>
-    <lineContent>Point position = findChar(text, &apos;&lt;&apos;, new Point(0, 0));</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>skipHtmlComment</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE</mutator>
-    <description>removed conditional - replaced equality check with false</description>
-    <lineContent>.substring(0, toPoint.getColumnNo() + 1).endsWith(&quot;--&gt;&quot;)) {</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>TagParser.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
@@ -932,22 +242,4 @@
     <description>replaced call to com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser::findChar with argument</description>
     <lineContent>toPoint = findChar(text, &apos;&gt;&apos;, getNextPoint(text, toPoint));</lineContent>
   </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>skipHtmlComment</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser::findChar with argument</description>
-    <lineContent>toPoint = findChar(text, &apos;&gt;&apos;, toPoint);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TagParser.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.javadoc.TagParser</mutatedClass>
-    <mutatedMethod>skipHtmlComment</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_ORDER_ELSE</mutator>
-    <description>removed conditional - replaced comparison check with false</description>
-    <lineContent>while (toPoint.getLineNo() &lt; text.length &amp;&amp; !text[toPoint.getLineNo()]</lineContent>
-  </mutation>
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-tree-walker-suppressions.xml b/config/pitest-suppressions/pitest-tree-walker-suppressions.xml
index 187867d8dc0..5a2f72dc771 100644
--- a/config/pitest-suppressions/pitest-tree-walker-suppressions.xml
+++ b/config/pitest-suppressions/pitest-tree-walker-suppressions.xml
@@ -72,15 +72,6 @@
     <lineContent>.thenComparing(AbstractCheck::getId,</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>TreeWalker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.TreeWalker</mutatedClass>
-    <mutatedMethod>createNewCheckSortedSet</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/util/Comparator::thenComparing with receiver</description>
-    <lineContent>.thenComparing(AbstractCheck::hashCode));</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>TreeWalker.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.TreeWalker</mutatedClass>
@@ -89,49 +80,4 @@
     <description>removed call to java/util/Comparator::naturalOrder</description>
     <lineContent>Comparator.nullsLast(Comparator.naturalOrder()))</lineContent>
   </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TreeWalker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.TreeWalker</mutatedClass>
-    <mutatedMethod>getExternalResourceLocations</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/util/stream/Stream::map with receiver</description>
-    <lineContent>.map(ExternalResourceHolder.class::cast)</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TreeWalker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.TreeWalker</mutatedClass>
-    <mutatedMethod>lambda$createNewCheckSortedSet$3</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.returns.EmptyObjectReturnValsMutator</mutator>
-    <description>replaced return value with &quot;&quot; for com/puppycrawl/tools/checkstyle/TreeWalker::lambda$createNewCheckSortedSet$3</description>
-    <lineContent>Comparator.&lt;AbstractCheck, String&gt;comparing(check -&gt; check.getClass().getName())</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TreeWalker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.TreeWalker</mutatedClass>
-    <mutatedMethod>registerCheck</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/Class::getName</description>
-    <lineContent>+ &quot;method to return &apos;true&apos;&quot;, check.getClass().getName(),</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TreeWalker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.TreeWalker</mutatedClass>
-    <mutatedMethod>registerCheck</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/utils/TokenUtil::getTokenName</description>
-    <lineContent>TokenUtil.getTokenName(tokenId));</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TreeWalker.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.TreeWalker</mutatedClass>
-    <mutatedMethod>registerCheck</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/lang/String::format with argument</description>
-    <lineContent>final String message = String.format(Locale.ROOT, &quot;Check &apos;%s&apos; waits for comment type &quot;</lineContent>
-  </mutation>
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-utils-suppressions.xml b/config/pitest-suppressions/pitest-utils-suppressions.xml
index c060d902075..ee6b1ac7d44 100644
--- a/config/pitest-suppressions/pitest-utils-suppressions.xml
+++ b/config/pitest-suppressions/pitest-utils-suppressions.xml
@@ -1,311 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressedMutations>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>BlockCommentPosition.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition</mutatedClass>
-    <mutatedMethod>isOnPlainClassMember</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>&amp;&amp; parent.getParent().getType() == memberType</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>CodePointUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CodePointUtil</mutatedClass>
-    <mutatedMethod>stripLeading</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/utils/CommonUtil::isCodePointWhitespace</description>
-    <lineContent>&amp;&amp; CommonUtil.isCodePointWhitespace(codePoints, startIndex)) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CodePointUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CodePointUtil</mutatedClass>
-    <mutatedMethod>stripLeading</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE</mutator>
-    <description>removed conditional - replaced equality check with false</description>
-    <lineContent>&amp;&amp; CommonUtil.isCodePointWhitespace(codePoints, startIndex)) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CodePointUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CodePointUtil</mutatedClass>
-    <mutatedMethod>stripLeading</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Arrays::copyOfRange with argument</description>
-    <lineContent>return Arrays.copyOfRange(codePoints, startIndex, codePoints.length);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CodePointUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CodePointUtil</mutatedClass>
-    <mutatedMethod>stripLeading</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_ORDER_ELSE</mutator>
-    <description>removed conditional - replaced comparison check with false</description>
-    <lineContent>while (startIndex &lt; codePoints.length</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CodePointUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CodePointUtil</mutatedClass>
-    <mutatedMethod>trim</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/CodePointUtil::stripTrailing with argument</description>
-    <lineContent>final int[] strippedCodePoints = stripTrailing(codePoints);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CodePointUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CodePointUtil</mutatedClass>
-    <mutatedMethod>trim</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/utils/CodePointUtil::stripLeading with argument</description>
-    <lineContent>return stripLeading(strippedCodePoints);</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CommonUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CommonUtil</mutatedClass>
-    <mutatedMethod>baseClassName</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE</mutator>
-    <description>removed conditional - replaced equality check with false</description>
-    <lineContent>if (index == -1) {</lineContent>
-  </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>CommonUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CommonUtil</mutatedClass>
-    <mutatedMethod>matchesFileExtension</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>if (extension.startsWith(EXTENSION_SEPARATOR)) {</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CommonUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CommonUtil</mutatedClass>
-    <mutatedMethod>relativizeAndNormalizePath</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/nio/file/Path::normalize with receiver</description>
-    <lineContent>final Path pathAbsolute = Paths.get(path).normalize();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>CommonUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.CommonUtil</mutatedClass>
-    <mutatedMethod>relativizeAndNormalizePath</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/nio/file/Path::normalize with receiver</description>
-    <lineContent>final Path pathBase = Paths.get(baseDirectory).normalize();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ModuleReflectionUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.ModuleReflectionUtil</mutatedClass>
-    <mutatedMethod>getCheckstyleModules</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/util/stream/Stream::filter with receiver</description>
-    <lineContent>.filter(ModuleReflectionUtil::isCheckstyleModule)</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ScopeUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.ScopeUtil</mutatedClass>
-    <mutatedMethod>getDeclaredScopeFromMods</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF</mutator>
-    <description>removed conditional - replaced equality check with true</description>
-    <lineContent>for (DetailAST token = aMods.getFirstChild(); token != null &amp;&amp; result == null;</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>ScopeUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.ScopeUtil</mutatedClass>
-    <mutatedMethod>getSurroundingScope</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/api/DetailAST::getParent with receiver</description>
-    <lineContent>for (DetailAST token = node.getParent();</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>ScopeUtil.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.utils.ScopeUtil</mutatedClass>
@@ -314,49 +9,4 @@
     <description>removed conditional - replaced equality check with true</description>
     <lineContent>token != null &amp;&amp; !returnValue;</lineContent>
   </mutation>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  <mutation unstable="false">
-    <sourceFile>ScopeUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.ScopeUtil</mutatedClass>
-    <mutatedMethod>lambda$getScopeFromMods$1</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to com/puppycrawl/tools/checkstyle/api/DetailAST::getParent with receiver</description>
-    <lineContent>.orElseGet(() -&gt; getDefaultScope(aMods.getParent()));</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>TokenUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.TokenUtil</mutatedClass>
-    <mutatedMethod>lambda$nameToValueMapFromPublicIntFields$1</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to java/lang/reflect/Field::getName</description>
-    <lineContent>Field::getName, fld -&gt; getIntFromField(fld, fld.getName()))</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>XpathUtil.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.utils.XpathUtil</mutatedClass>
-    <mutatedMethod>getXpathItems</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/util/stream/Stream::map with receiver</description>
-    <lineContent>.map(NodeInfo.class::cast)</lineContent>
-  </mutation>
 </suppressedMutations>
diff --git a/config/pitest-suppressions/pitest-xpath-suppressions.xml b/config/pitest-suppressions/pitest-xpath-suppressions.xml
index c488fb43ded..ace4e55b78a 100644
--- a/config/pitest-suppressions/pitest-xpath-suppressions.xml
+++ b/config/pitest-suppressions/pitest-xpath-suppressions.xml
@@ -1,59 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressedMutations>
-  <mutation unstable="false">
-    <sourceFile>AbstractElementNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.AbstractElementNode</mutatedClass>
-    <mutatedMethod>getPrecedingSiblings</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.ArgumentPropagationMutator</mutator>
-    <description>replaced call to java/util/Collections::unmodifiableList with argument</description>
-    <lineContent>return Collections.unmodifiableList(siblings.subList(0, indexAmongSiblings));</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>AbstractElementNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.AbstractElementNode</mutatedClass>
-    <mutatedMethod>iterateAxis</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.RemoveSwitchMutator_8</mutator>
-    <description>RemoveSwitch 8 (case value 8)</description>
-    <lineContent>switch (axisNumber) {</lineContent>
-  </mutation>
-
-  <mutation unstable="true">
-    <sourceFile>AbstractRootNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.AbstractRootNode</mutatedClass>
-    <mutatedMethod>iterateAxis</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.RemoveSwitchMutator_1</mutator>
-    <description>RemoveSwitch 1 (case value 1)</description>
-    <lineContent>switch (axisNumber) {</lineContent>
-  </mutation>
-
-  <mutation unstable="true">
-    <sourceFile>AbstractRootNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.AbstractRootNode</mutatedClass>
-    <mutatedMethod>iterateAxis</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.RemoveSwitchMutator_2</mutator>
-    <description>RemoveSwitch 2 (case value 2)</description>
-    <lineContent>switch (axisNumber) {</lineContent>
-  </mutation>
-
-  <mutation unstable="true">
-    <sourceFile>AbstractRootNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.AbstractRootNode</mutatedClass>
-    <mutatedMethod>iterateAxis</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.RemoveSwitchMutator_5</mutator>
-    <description>RemoveSwitch 5 (case value 5)</description>
-    <lineContent>switch (axisNumber) {</lineContent>
-  </mutation>
-
-  <mutation unstable="true">
-    <sourceFile>AbstractRootNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.AbstractRootNode</mutatedClass>
-    <mutatedMethod>iterateAxis</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.RemoveSwitchMutator_8</mutator>
-    <description>RemoveSwitch 8 (case value 8)</description>
-    <lineContent>switch (axisNumber) {</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>FollowingIterator.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.iterators.FollowingIterator</mutatedClass>
@@ -80,23 +26,4 @@
     <description>Removed assignment to member variable items</description>
     <lineContent>this.items = null;</lineContent>
   </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>RootNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.RootNode</mutatedClass>
-    <mutatedMethod>getColumnNumber</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutator</mutator>
-    <description>removed call to com/puppycrawl/tools/checkstyle/api/DetailAST::getColumnNo</description>
-    <lineContent>return detailAst.getColumnNo();</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>RootNode.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.xpath.RootNode</mutatedClass>
-    <mutatedMethod>getColumnNumber</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.returns.PrimitiveReturnsMutator</mutator>
-    <description>replaced int return with 0 for com/puppycrawl/tools/checkstyle/xpath/RootNode::getColumnNumber</description>
-    <lineContent>return detailAst.getColumnNo();</lineContent>
-  </mutation>
-
 </suppressedMutations>
diff --git a/config/pmd-main.xml b/config/pmd-main.xml
index f6d1079cdc4..55d67203a33 100644
--- a/config/pmd-main.xml
+++ b/config/pmd-main.xml
@@ -18,29 +18,28 @@
              we value full coverage more than final modifier.
            Picocli fields will have their value injected and should not be marked final. -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='FileText']
+               value="//ClassDeclaration[@SimpleName='FileText']
                         //FieldDeclaration//VariableDeclarator[@Name='fullText']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='CliOptions']"/>
+                    | //ClassDeclaration[@SimpleName='CliOptions']"/>
     </properties>
   </rule>
   <rule ref="category/java/errorprone.xml/CloseResource">
     <properties>
       <property name="allowedResourceTypes"
-               value="java.io.ByteArrayOutputStream|java.io.ByteArrayInputStream"/>
-      <property name="allowedResourceTypes"
-               value="java.io.StringWriter|java.io.CharArrayWriter|java.io.StringReader"/>
+               value="java.io.ByteArrayOutputStream,java.io.ByteArrayInputStream,
+                      java.io.StringWriter,java.io.CharArrayWriter,java.io.StringReader"/>
       <!-- we do close streams in special methods -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='DefaultLogger']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='Main']
+               value="//ClassDeclaration[@SimpleName='DefaultLogger']
+                    | //ClassDeclaration[@SimpleName='Main']
                         //MethodDeclaration[@Name='createListener']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='PropertyCacheFile']
+                    | //ClassDeclaration[@SimpleName='PropertyCacheFile']
                         //MethodDeclaration[@Name='persist' or @Name='serialize']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='XmlLoader']
+                    | //ClassDeclaration[@SimpleName='XmlLoader']
                         //MethodDeclaration[@Name='resolveEntity']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='CheckstyleAntTask']
+                    | //ClassDeclaration[@SimpleName='CheckstyleAntTask']
                         //MethodDeclaration[@Name='getListeners' or @Name='createDefaultLogger']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='AbstractNode']
+                    | //ClassDeclaration[@SimpleName='AbstractNode']
                         //MethodDeclaration[@Name='iterateAxis']"/>
     </properties>
   </rule>
@@ -48,7 +47,21 @@
     <properties>
       <!-- until https://github.com/checkstyle/checkstyle/issues/12873 -->
       <property name="violationSuppressXPath"
-         value="//ClassOrInterfaceDeclaration[@SimpleName='AutomaticBean']"/>
+         value="//ClassDeclaration[@SimpleName='AutomaticBean']"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/design.xml/AvoidCatchingGenericException">
+    <properties>
+      <!-- we allow catching Exception in certain cases to provide more details in wrapper -->
+      <property name="violationSuppressXPath"
+         value="//ClassDeclaration[@SimpleName='PropertiesMacro']
+                        //MethodDeclaration[@Name='writeTablePropertiesRows']
+                    | //ClassDeclaration[@SimpleName='Checker']
+                        //MethodDeclaration[@Name='processFiles']
+                    | //ClassDeclaration[@SimpleName='Checker']
+                        //MethodDeclaration[@Name='processFile']
+                    | //ClassDeclaration[@SimpleName='TranslationCheck']
+                        //MethodDeclaration[@Name='getTranslationKeys']"/>
     </properties>
   </rule>
 </ruleset>
diff --git a/config/pmd-test.xml b/config/pmd-test.xml
index 7e834475eb7..e0d61b18740 100644
--- a/config/pmd-test.xml
+++ b/config/pmd-test.xml
@@ -40,9 +40,6 @@
     <exclude name="AvoidUsingHardCodedIP"/>
     <!-- UTests are required to be public by design -->
     <exclude name="ExcessivePublicCount"/>
-    <!-- we have too much UTs for each main class, it is better to keep all tests in one
-      file to ease navigation and search for test -->
-    <exclude name="ExcessiveClassLength"/>
     <!-- we want to avoid wide throws signature, it is just test -->
     <exclude name="AvoidCatchingGenericException"/>
     <!-- we do not want to invest extra time to make logic ideal
@@ -71,13 +68,13 @@
              token explicitly.
            IndentationCheckTest has a lot of cases. -->
       <property name="violationSuppressXPath"
-              value="//ClassOrInterfaceDeclaration[@SimpleName='JavadocTokenTypesTest']
+              value="//ClassDeclaration[@SimpleName='JavadocTokenTypesTest']
                        //MethodDeclaration[@Name='testTokenValues']
-                   | //ClassOrInterfaceDeclaration[@SimpleName='GeneratedJavaTokenTypesTest']
+                   | //ClassDeclaration[@SimpleName='GeneratedJavaTokenTypesTest']
                        //MethodDeclaration[@Name='testTokenNumbering']
-                   | //ClassOrInterfaceDeclaration[@SimpleName='GeneratedJavadocTokenTypesTest']
+                   | //ClassDeclaration[@SimpleName='GeneratedJavadocTokenTypesTest']
                        //MethodDeclaration[@Name='testTokenNumbers']
-                   | //ClassOrInterfaceDeclaration[@SimpleName='IndentationCheckTest']"/>
+                   | //ClassDeclaration[@SimpleName='IndentationCheckTest']"/>
     </properties>
   </rule>
 
@@ -98,29 +95,39 @@
            assertion calls are not required as they are called by the library.
            In MainTest PMD does not find asserts in lambdas called in the method
              invokeAndWait. -->
+      <!-- For AllCheckTest.testAllModulesAreReferencedInConfigFile,
+           testAllCheckTokensAreReferencedInCheckstyleConfigFile,
+           testAllCheckTokensAreReferencedInGoogleConfigFile,
+           testAllCheckstyleModulesHaveXdocDocumentation
+           until https://github.com/checkstyle/checkstyle/issues/14870 -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='AllChecksTest'
+               value="//ClassDeclaration[@SimpleName='AllChecksTest'
                      or @SimpleName='AstRegressionTest'
-                     or @SimpleName='ImportControlCheckTest']//PrimaryPrefix/Name[@Image='verify']
-                   | //ClassOrInterfaceDeclaration[@SimpleName='MainTest']
+                     or @SimpleName='ImportControlCheckTest']//PrimaryPrefix/Name[@Name='verify']
+                   | //ClassDeclaration[@SimpleName='AllChecksTest']
+                       //MethodDeclaration[@Name='testAllModulesAreReferencedInConfigFile'
+                        or @Name='testAllCheckTokensAreReferencedInCheckstyleConfigFile'
+                        or @Name='testAllCheckTokensAreReferencedInGoogleConfigFile'
+                        or @Name='testAllCheckstyleModulesHaveXdocDocumentation']
+                   | //ClassDeclaration[@SimpleName='MainTest']
                        //PrimaryPrefix//Name[starts-with(@SimpleName, 'assert')]
-                   | //ClassOrInterfaceDeclaration[@SimpleName='XdocsPagesTest']
+                   | //ClassDeclaration[@SimpleName='XdocsPagesTest']
                        //MethodDeclaration[@Name='testAllChecksPresentOnAvailableChecksPage']
-                   | //ClassOrInterfaceDeclaration[@SimpleName='XdocsJavaDocsTest']
+                   | //ClassDeclaration[@SimpleName='XdocsJavaDocsTest']
                        //MethodDeclaration[@Name='testAllCheckSectionJavaDocs']
-                   | //ClassOrInterfaceDeclaration[starts-with(@SimpleName,'XpathRegression')]
+                   | //ClassDeclaration[starts-with(@SimpleName,'XpathRegression')]
                        //MethodDeclaration
-                   | //ClassOrInterfaceDeclaration[@SimpleName='ImmutabilityTest']
+                   | //ClassDeclaration[@SimpleName='ImmutabilityTest']
                        //MethodDeclaration
-                   | //ClassOrInterfaceDeclaration[@SimpleName='ArchUnitTest']
+                   | //ClassDeclaration[@SimpleName='ArchUnitTest']
                        //MethodDeclaration
-                   | //ClassOrInterfaceDeclaration[@SimpleName='ArchUnitSuperClassTest']
+                   | //ClassDeclaration[@SimpleName='ArchUnitSuperClassTest']
                        //MethodDeclaration
-                   | //ClassOrInterfaceDeclaration[@SimpleName='ArchUnitCyclesCheckTest']
+                   | //ClassDeclaration[@SimpleName='ArchUnitCyclesCheckTest']
                        //MethodDeclaration
-                   | //ClassOrInterfaceDeclaration[@SimpleName='SuppressionFilterTest']
+                   | //ClassDeclaration[@SimpleName='SuppressionFilterTest']
                        //MethodDeclaration[starts-with(@Name, 'testUseCache')]
-                   | //ClassOrInterfaceDeclaration[@SimpleName='MainTest']
+                   | //ClassDeclaration[@SimpleName='MainTest']
                        //MethodDeclaration[starts-with(@Name, 'testMain')]"/>
     </properties>
   </rule>
@@ -129,7 +136,7 @@
     <properties>
       <!-- A false positive. -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='CommitValidationTest']"/>
+               value="//ClassDeclaration[@SimpleName='CommitValidationTest']"/>
     </properties>
   </rule>
   <rule ref="category/java/bestpractices.xml/JUnitTestContainsTooManyAsserts">
@@ -140,15 +147,25 @@
           as they check each token and each rule explicitly.
          JavadocTokenTypes.testTokenValues contains several asserts as it checks each
           token explicitly. -->
+      <!-- For ClassImportRuleTest and all the below suppressions
+          until https://github.com/checkstyle/checkstyle/issues/14870 -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='JavadocTokenTypesTest']
+               value="//ClassDeclaration[@SimpleName='JavadocTokenTypesTest']
                         //MethodDeclaration[@Name='testTokenValues']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='GeneratedJavaTokenTypesTest']
+                    | //ClassDeclaration[@SimpleName='GeneratedJavaTokenTypesTest']
                         //MethodDeclaration[@Name='testTokenNumbering']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='GeneratedJavadocTokenTypesTest']
+                    | //ClassDeclaration[@SimpleName='GeneratedJavadocTokenTypesTest']
                         //MethodDeclaration[@Name='testTokenNumbers']
-                    | //ClassOrInterfaceDeclaration[@SimpleName='ParseTreeTablePresentationTest']
-                        //MethodDeclaration[@Name='testGetValueAtDetailNode']"/>
+                    | //ClassDeclaration[@SimpleName='ParseTreeTablePresentationTest']
+                        //MethodDeclaration[@Name='testGetValueAtDetailNode']
+                    | //ClassDeclaration[@SimpleName='ClassImportRuleTest']
+                    | //ClassDeclaration[@SimpleName='PkgImportRuleTest']
+                    | //ClassDeclaration[@SimpleName='PkgImportControlTest']
+                       //MethodDeclaration[ends-with(@Name, 'CheckAccess')]
+                    | //ClassDeclaration[@SimpleName='JavadocTagInfoTest']
+                       //MethodDeclaration[@Name='testCoverage']
+                    | //ClassDeclaration[@SimpleName='AstRegressionTest']
+                       //MethodDeclaration[@Name='testCustomAstTree']"/>
     </properties>
   </rule>
 
@@ -157,7 +174,7 @@
       <!-- A false positive: commit validation is a sequence of checks, if we shuffle them
           it would be broken. -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='CommitValidationTest']
+               value="//ClassDeclaration[@SimpleName='CommitValidationTest']
                         //MethodDeclaration[@Name='validateCommitMessage']"/>
     </properties>
   </rule>
@@ -169,9 +186,9 @@
          easy to maintain. The rule should also only check public methods but has a bug.
          Suppress the false-positives. -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='SuppressionXpathSingleFilterTest']
+               value="//ClassDeclaration[@SimpleName='SuppressionXpathSingleFilterTest']
                         //MethodDeclaration[@Name='createSuppressionXpathSingleFilter']
-                    | //ClassOrInterfaceDeclaration[ @SimpleName='XdocsPagesTest']
+                    | //ClassDeclarationClassDeclaration[@SimpleName='XdocsPagesTest']
                         //MethodDeclaration[@Name='validateRuleNameOrder']"/>
     </properties>
   </rule>
@@ -179,17 +196,17 @@
     <properties>
       <!-- we do close streams in special methods -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='XdocsPagesTest']
+               value="//ClassDeclaration[@SimpleName='XdocsPagesTest']
                         //MethodDeclaration[@Name='getModulePropertyExpectedValue']
-                 | //ClassOrInterfaceDeclaration[@SimpleName='DefaultLoggerPowerTest']
+                 | //ClassDeclaration[@SimpleName='DefaultLoggerPowerTest']
                      //MethodDeclaration[@Name='testNewCtor']
-                 | //ClassOrInterfaceDeclaration[@SimpleName='ImportControlLoaderPowerTest']
+                 | //ClassDeclaration[@SimpleName='ImportControlLoaderPowerTest']
                      //MethodDeclaration[@Name='testInputStreamThatFailsOnClose']
-                 | //ClassOrInterfaceDeclaration[@SimpleName='ImportControlLoaderPowerTest']
+                 | //ClassDeclaration[@SimpleName='ImportControlLoaderPowerTest']
                      //MethodDeclaration[@Name='testInputStreamFailsOnRead']
-                 | //ClassOrInterfaceDeclaration[@SimpleName='XpathFileGeneratorAuditListenerTest']
+                 | //ClassDeclaration[@SimpleName='XpathFileGeneratorAuditListenerTest']
                      //MethodDeclaration[@Name='verifyOutput']
-                 | //ClassOrInterfaceDeclaration[@SimpleName='CommonUtilTest']
+                 | //ClassDeclaration[@SimpleName='CommonUtilTest']
                      //MethodDeclaration[@Name='testClose']"/>
     </properties>
   </rule>
@@ -201,9 +218,16 @@
   <rule ref="category/java/multithreading.xml/DoNotUseThreads">
     <properties>
       <!-- We use thread to limit the stack size for a test method. -->
+      <!-- For SuppressionFilterTest.isConnectionAvailableAndStable and
+           SuppressionsLoaderTest.loadFilterSet
+           https://github.com/checkstyle/checkstyle/issues/14870 -->
       <property name="violationSuppressXPath"
-               value="//ClassOrInterfaceDeclaration[@SimpleName='TestUtil']
-                        //MethodDeclaration[@Name='getResultWithLimitedResources']"/>
+               value="//ClassDeclaration[@SimpleName='TestUtil']
+                        //MethodDeclaration[@Name='getResultWithLimitedResources']
+               | //ClassDeclaration[@SimpleName='SuppressionFilterTest']
+                        //MethodDeclaration[@Name='isConnectionAvailableAndStable']
+               | //ClassDeclaration[@SimpleName='SuppressionsLoaderTest']
+                    //MethodDeclaration[@Name='loadFilterSet']"/>
     </properties>
   </rule>
 </ruleset>
diff --git a/config/pmd.xml b/config/pmd.xml
index db04ea7ae13..46e62a6d1b8 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -14,10 +14,32 @@
     <!-- too much false-positives from 6.18.0 -->
     <exclude name="UnusedPrivateMethod"/>
   </rule>
+  <rule ref="category/java/bestpractices.xml/UnusedLocalVariable">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='FilterUtil']
+                        //MethodDeclaration[@Name='isFileExists']
+                | //ClassDeclaration[@SimpleName='TreeWalkerTest']
+                        //MethodDeclaration[@Name='testNoAuditEventsWithoutFilters']
+                | //ClassDeclaration[@SimpleName='OrderedPropertiesCheckTest']
+                        //MethodDeclaration[@Name='getFileNotFoundDetail']
+                | //ClassDeclaration[@SimpleName='UniquePropertiesCheckTest']
+                        //MethodDeclaration[@Name='getFileNotFoundDetail']
+                | //ClassDeclaration[@SimpleName='HeaderCheckTest']
+                        //MethodDeclaration[@Name='testIoExceptionWhenLoadingHeader']
+                | //ClassDeclaration[@SimpleName='CustomImportOrderCheckTest']
+                        //MethodDeclaration[@Name='testGetFullImportIdent']
+               | //ClassDeclaration[@SimpleName='MainFrameTest']
+                        //MethodDeclaration[@Name='testOpenFileButton']
+               | //ClassDeclaration[@SimpleName='ConfigurationLoaderTest']
+                        //MethodDeclaration[@Name='testConfigWithIgnoreExceptionalAttributes']"/>
+    </properties>
+  </rule>
   <rule ref="category/java/bestpractices.xml/AvoidPrintStackTrace">
     <properties>
       <!-- It is ok to use print stack trace in CLI class. -->
-      <property name="violationSuppressXPath" value="//ClassOrInterfaceDeclaration[
+      <property name="violationSuppressXPath" value="//ClassDeclaration[
         @SimpleName='Main']"/>
     </properties>
   </rule>
@@ -26,7 +48,7 @@
       <!-- The PMD check accepts only a string constant as the assertion message.
            This check uses a method call. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='JavadocCatchCheck']
+                value="//ClassDeclaration[@SimpleName='JavadocCatchCheck']
                            //MethodDeclaration[@Name='visitJavadocToken']"/>
     </properties>
   </rule>
@@ -34,11 +56,47 @@
     <properties>
       <!-- it is ok to use println in CLI class. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration
+                value="//ClassDeclaration
                        [@SimpleName='Main' or @SimpleName='Main$CliOptions'
                        or @SimpleName='JavadocPropertiesGenerator']"/>
     </properties>
   </rule>
+  <rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath" value="//ClassDeclaration[
+        @SimpleName='XdocsUrlTest']//MethodDeclaration[@Name='characters' or @Name='endElement']"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/bestpractices.xml/LooseCoupling">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='CodeSelectorPresentationTest']
+                     //FieldDeclaration//VariableDeclarator[@Name='linesToPosition']
+                | //ClassDeclaration[@SimpleName='FileText']
+                     //ConstructorDeclaration
+                | //ClassDeclaration[@SimpleName='ArchUnitSuperClassTest']
+                  //MethodDeclaration[@Name=
+                  'testChecksShouldHaveAllowedAbstractClassAsSuperclass']
+                | //ClassDeclaration[@SimpleName='ArchUnitTest']
+                  //MethodDeclaration[@Name='nonProtectedCheckMethodsTest'
+                      or @Name='testClassesInApiDoNotDependOnClassesInUtil']
+               | //ClassDeclaration[@SimpleName='ImmutabilityTest']
+                    //FieldDeclaration//VariableDeclarator[@Name='CHECKSTYLE_CHECKS']
+               | //ClassDeclaration[@SimpleName='ImmutabilityTest']
+                    //MethodDeclaration[@Name='testUtilClassesImmutability']"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/bestpractices.xml/UnnecessaryVarargsArrayCreation">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='CustomImportOrderCheckTest']
+                    //MethodDeclaration[@Name='testGetFullImportIdent']"/>
+    </properties>
+  </rule>
+
 
   <rule ref="category/java/documentation.xml">
     <!-- We use class comments as source for xdoc files,
@@ -49,18 +107,13 @@
     <properties>
       <!-- RequireThisCheck$AbstractFrame is a private class, no comment is required. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='RequireThisCheck']"/>
+                value="//ClassDeclaration[@SimpleName='RequireThisCheck']"/>
     </properties>
   </rule>
 
   <rule ref="category/java/codestyle.xml">
     <!-- Opposite to UnnecessaryConstructor. -->
     <exclude name="AtLeastOneConstructor"/>
-    <!-- Turning a local variable to the field may create design problems and extend the scope of
-           the variable. -->
-    <exclude name="AvoidFinalLocalVariable"/>
-    <!-- Conflicts with names that does not mean in/out. -->
-    <exclude name="AvoidPrefixingMethodParameters"/>
     <!-- Calling super() is completely pointless, no matter if class inherits anything or not;
          it is meaningful only if you do not call implicit constructor of the base class. -->
     <exclude name="CallSuperInConstructor"/>
@@ -90,7 +143,7 @@
            JavadocTokenTypes and TokenTypes aren't utility classes. They are
              token definition classes. Also, they are part of the API. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Definitions'
+                value="//ClassDeclaration[@SimpleName='Definitions'
                            or @SimpleName='LoadExternalDtdFeatureProvider'
                            or @SimpleName='JavadocTokenTypes'
                            or @SimpleName='TokenTypes'
@@ -101,17 +154,17 @@
     <properties>
       <!-- False positives on IF_ELSE-IF-ELSE-IF. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='XMLLogger']
+                value="//ClassDeclaration[@SimpleName='XMLLogger']
                            //MethodDeclaration[@Name='isReference']
-      | //ClassOrInterfaceDeclaration[@SimpleName='DetailAstImpl']
+      | //ClassDeclaration[@SimpleName='DetailAstImpl']
               //MethodDeclaration[@Name='addPreviousSibling']
-      | //ClassOrInterfaceDeclaration[@SimpleName='AnnotationLocationCheck']
+      | //ClassDeclaration[@SimpleName='AnnotationLocationCheck']
               //MethodDeclaration[@Name='checkAnnotations']
-      | //ClassOrInterfaceDeclaration[@SimpleName='AbstractImportControl']
+      | //ClassDeclaration[@SimpleName='AbstractImportControl']
               //MethodDeclaration[@Name='checkAccess']
-      | //ClassOrInterfaceDeclaration[@SimpleName='HandlerFactory']
+      | //ClassDeclaration[@SimpleName='HandlerFactory']
               //MethodDeclaration[@Name='getHandler']
-      | //ClassOrInterfaceDeclaration[@SimpleName='JavaAstVisitor']
+      | //ClassDeclaration[@SimpleName='JavaAstVisitor']
               //MethodDeclaration[@Name='visitWildCardTypeArgument']"/>
     </properties>
   </rule>
@@ -122,11 +175,11 @@
        AbstractRootNode is what a root node is.
       -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='AbstractFileSetCheck'
+                value="//ClassDeclaration[@SimpleName='AbstractFileSetCheck'
         or @SimpleName='AbstractCheck' or @SimpleName='AbstractJavadocCheck'
         or @SimpleName='AbstractNode'
         or @SimpleName='AbstractViolationReporter']
-        | //ClassOrInterfaceDeclaration[@SimpleName='AbstractRootNode']
+        | //ClassDeclaration[@SimpleName='AbstractRootNode']
           //MethodDeclaration[@Name='getParent' or @Name='getDepth']"/>
     </properties>
   </rule>
@@ -148,7 +201,7 @@
       <!-- Main is a good name for the class containing the main method.
            Tag as inner class name is fine. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Main' or @SimpleName='Tag']"/>
+                value="//ClassDeclaration[@SimpleName='Main' or @SimpleName='Tag']"/>
     </properties>
   </rule>
   <rule ref="category/java/codestyle.xml/CommentDefaultAccessModifier">
@@ -158,6 +211,22 @@
       <property name="checkTopLevelTypes" value="false" />
     </properties>
   </rule>
+  <rule ref="category/java/codestyle.xml/UnnecessaryBoxing">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='IntMatchFilterElement']
+                        //MethodDeclaration[@Name='hashCode']"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/codestyle.xml/CommentDefaultAccessModifier">
+    <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+    <properties>
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='Main']
+                        //EnumDeclaration[@SimpleName='OutputFormat']"/>
+    </properties>
+  </rule>
 
   <rule ref="category/java/errorprone.xml">
     <!-- That rule is not practical, no options to allow some magic numbers,
@@ -166,8 +235,6 @@
     <!-- We need compare by ref as Tree structure is immutable, we can easily
          rely on refs. -->
     <exclude name="CompareObjectsWithEquals"/>
-    <!-- Too many false positives. -->
-    <exclude name="DataflowAnomalyAnalysis"/>
     <!-- This rule does not have any option, unreasonable to use. -->
     <exclude name="ImplicitSwitchFallThrough"/>
     <!-- We reuse Check instances between java files, we need to clear state of
@@ -187,7 +254,7 @@
       <property name="skipAnnotations" value="true"/>
       <!-- Keeping the duplicated strings maintains readability -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='SarifLogger']"/>
+                value="//ClassDeclaration[@SimpleName='SarifLogger']"/>
     </properties>
   </rule>
   <rule ref="category/java/errorprone.xml/EmptyCatchBlock">
@@ -199,8 +266,20 @@
     <properties>
       <!-- There is no alternative to using System.exit in the CLI class
            to report the return code. -->
+      <!-- For MainTest.assertMainReturnCode
+            until https://github.com/checkstyle/checkstyle/issues/14870 -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='ExitHelper']"/>
+                value="//ClassDeclaration[@SimpleName='ExitHelper']
+                 | //ClassDeclaration[@SimpleName='MainTest']
+                    //MethodDeclaration[@Name='assertMainReturnCode'] "/>
+    </properties>
+  </rule>
+  <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='MainFrame']
+                        //ConstructorDeclaration"/>
     </properties>
   </rule>
 
@@ -228,11 +307,11 @@
            a runtime exception.
            JavadocMethodCheck: Exception type is not predictable. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Checker']
+                value="//ClassDeclaration[@SimpleName='Checker']
                              //MethodDeclaration[@Name='processFiles']
-                      |//ClassOrInterfaceDeclaration[@SimpleName='TranslationCheck']
+                      | //ClassDeclaration[@SimpleName='TranslationCheck']
                              //MethodDeclaration[@Name='getTranslationKeys']
-                      |//ClassOrInterfaceDeclaration[@SimpleName='JavadocMethodCheck']
+                      | //ClassDeclaration[@SimpleName='JavadocMethodCheck']
                              //MethodDeclaration[@Name='resolveClass']"/>
     </properties>
   </rule>
@@ -242,7 +321,7 @@
        requires some extra IFs. -->
       <property name="problemDepth" value="4"/>
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='ClassResolver']
+                value="//ClassDeclaration[@SimpleName='ClassResolver']
                              //MethodDeclaration[@Name='resolve']"/>
     </properties>
   </rule>
@@ -251,15 +330,21 @@
       <!-- There is no other way to deliver the filename that was under processing.
            See https://github.com/checkstyle/checkstyle/issues/2285 -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Checker']
+                value="//ClassDeclaration[@SimpleName='Checker']
                              //MethodDeclaration[@Name='processFiles']"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/CouplingBetweenObjects">
     <properties>
-      <!-- I do not see any problem, looks like a false positive. -->
+      <!-- I do not see any problem, looks like a false positive.
+           SiteUtil is a utility class providing different functionality. -->
+      <!-- For all Except SiteUtil and HandlerFactory
+          until https://github.com/checkstyle/checkstyle/issues/14870 -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='HandlerFactory']"/>
+                value="//ClassDeclaration[@SimpleName='HandlerFactory'
+                or @SimpleName='SiteUtil' or @SimpleName='Checker' or @SimpleName='JavaAstVisitor'
+                or @SimpleName='Main' or @SimpleName='TreeWalker' or @SimpleName='CheckstyleAntTask'
+                or @SimpleName='TranslationCheck' or @SimpleName='JavadocMethodCheck']"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/NcssCount">
@@ -274,30 +359,51 @@
              AbstractElementNode.iterateAxis,
              NoWhitespaceAfterCheck.getArrayDeclaratorPreviousElement
              are also huge switches, they had to be monolithic.
-           SuppressFilterElement is a single constructor and can't be split easily -->
+           SuppressFilterElement is a single constructor and can't be split easily
+           Splitting PropertiesMacro.getDefaultValue will damage readability
+           Splitting SiteUtil.getDefaultValue would not make it more readable -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Main'
+                value="//ClassDeclaration[@SimpleName='Main'
         or @SimpleName='PackageObjectFactory' or @SimpleName='RequireThisCheck'
         or @SimpleName='VariableDeclarationUsageDistanceCheck'
         or @SimpleName='HandlerFactory']
-      | //ClassOrInterfaceDeclaration[@SimpleName='XMLLogger']//MethodDeclaration[@Name='encode']
-      | //ClassOrInterfaceDeclaration[@SimpleName='SarifLogger']//MethodDeclaration[@Name='escape']
-      | //ClassOrInterfaceDeclaration[@SimpleName='LeftCurlyCheck'
+      | //ClassDeclaration[@SimpleName='XMLLogger']//MethodDeclaration[@Name='encode']
+      | //ClassDeclaration[@SimpleName='SarifLogger']//MethodDeclaration[@Name='escape']
+      | //ClassDeclaration[@SimpleName='LeftCurlyCheck'
         or @SimpleName='FinalLocalVariableCheck'
         or @SimpleName='NPathComplexityCheck']
              //MethodDeclaration[@Name='visitToken']
-      | //ClassOrInterfaceDeclaration[@SimpleName='FallThroughCheck']
+      | //ClassDeclaration[@SimpleName='FallThroughCheck']
              //MethodDeclaration[@Name='isTerminated']
-      | //ClassOrInterfaceDeclaration[@SimpleName='ModifiedControlVariableCheck'
+      | //ClassDeclaration[@SimpleName='ModifiedControlVariableCheck'
         or @SimpleName='NPathComplexityCheck']//MethodDeclaration[@Name='leaveToken']
-      | //ClassOrInterfaceDeclaration[@SimpleName='NoWhitespaceAfterCheck']
+      | //ClassDeclaration[@SimpleName='NoWhitespaceAfterCheck']
              //MethodDeclaration[@Name='getArrayDeclaratorPreviousElement']
-      | //ClassOrInterfaceDeclaration[@SimpleName='AbstractElementNode'
+      | //ClassDeclaration[@SimpleName='AbstractElementNode'
         or @SimpleName='AbstractRootNode']
              //MethodDeclaration[@Name='iterateAxis']
-      | //ClassOrInterfaceDeclaration[@SimpleName='SuppressFilterElement']
+      | //ClassDeclaration[@SimpleName='SuppressFilterElement']
              //ConstructorDeclaration
-      "/>
+      | //ClassDeclaration[@SimpleName='PropertiesMacro']
+             //MethodDeclaration[@Name='getDefaultValue']
+      | //ClassDeclaration[@SimpleName='SiteUtil']
+               //MethodDeclaration[@Name='getDefaultValue']
+      | //ClassDeclaration[@SimpleName='DescriptionExtractor']
+               //MethodDeclaration[@Name='getDescriptionFromJavadoc']"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/design.xml/NcssCount">
+    <properties>
+      <property name="classReportLevel" value="1000" />
+      <!-- *TokenTypes are special classes that are big due to a lot of description comments.
+           RequireThisCheck has to work with and identify many frames.
+           JavadocMethodCheck is in the process of being rewritten.
+           SiteUtil provides a lot of functionality to generate documentation. -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='JavadocTokenTypes'
+        or @SimpleName='TokenTypes' or @SimpleName='RequireThisCheck'
+        or @SimpleName='JavadocMethodCheck' or @SimpleName='JavaAstVisitor'
+        or @SimpleName='SiteUtil']"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/TooManyFields">
@@ -305,8 +411,9 @@
       <!-- Unable to split fields out of the class. -->
       <!-- Main has an annotated field for each command line option. This is by design. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Checker']
-    | //ClassOrInterfaceDeclaration[@SimpleName='Main']"/>
+                value="//ClassDeclaration[@SimpleName='Checker']
+      | //ClassDeclaration[@SimpleName='Main']
+      |  //ClassDeclaration[@SimpleName='ImportOrderCheck']"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/TooManyMethods">
@@ -315,25 +422,14 @@
       <property name="maxmethods" value="34"/>
       <!-- JavaAstVisitor is a visitor class with methods for the entire Java grammar. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='JavaAstVisitor']"/>
-    </properties>
-  </rule>
-  <rule ref="category/java/design.xml/ExcessiveClassLength">
-    <properties>
-      <!-- *TokenTypes are special classes that are big due to a lot of description comments.
-           RequireThisCheck has to work with and identify many frames.
-           JavadocMethodCheck is in the process of being rewritten. -->
-      <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='JavadocTokenTypes'
-        or @SimpleName='TokenTypes' or @SimpleName='RequireThisCheck'
-        or @SimpleName='JavadocMethodCheck' or @SimpleName='JavaAstVisitor']"/>
+                value="//ClassDeclaration[@SimpleName='JavaAstVisitor']"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/ExcessiveParameterList">
     <properties>
       <!-- The class Violation has a constructor with many parameters by design. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Violation']"/>
+                value="//ClassDeclaration[@SimpleName='Violation']"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/ExcessiveImports">
@@ -342,21 +438,35 @@
            Checker collects external resource locations and sets up the configuration.
            CheckstyleAntTask integrates Checkstyle with Ant.
            TranslationCheck uses a lot of imports for it's logic and custom violations.
+           SiteUtil uses a lot of imports to provide logic for generating documentation
             -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='Main'
+                value="//ClassDeclaration[@SimpleName='Main'
         or @SimpleName='Checker' or @SimpleName='CheckstyleAntTask'
         or @SimpleName='TranslationCheck'
-        or @SimpleName='AbstractAutomaticBean']"/>
+        or @SimpleName='AbstractAutomaticBean'
+        or @SimpleName='SiteUtil']"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/CognitiveComplexity">
     <properties>
       <property name="reportLevel" value="22"/>
-      <!-- Till https://github.com/checkstyle/checkstyle/issues/10064 -->
+      <!-- Till https://github.com/checkstyle/checkstyle/issues/10064
+           Splitting SiteUtil's methods will damage readability -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='XdocsPagesTest']
-                    //MethodDeclaration[@Name='getModulePropertyExpectedValue']"/>
+                value="//ClassDeclaration[@SimpleName='XdocsPagesTest']
+                    //MethodDeclaration[@Name='getModulePropertyExpectedValue']
+                    |  //ClassDeclaration[@SimpleName='SiteUtil']
+                    //MethodDeclaration[@Name='getDefaultValue']
+                    |  //ClassDeclaration[@SimpleName='DescriptionExtractor']
+                    //MethodDeclaration[@Name='getDescriptionFromJavadoc']"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal">
+    <properties>
+       <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='AbstractInvalidClass']"/>
     </properties>
   </rule>
 
@@ -370,7 +480,7 @@
       overloads a synchronized method, so it should have synchronized
       modifier. -->
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='UniqueProperties'
+                value="//ClassDeclaration[@SimpleName='UniqueProperties'
           or @SimpleName='SequencedProperties']//MethodDeclaration[@Name='keys' or @Name='put']"/>
     </properties>
   </rule>
@@ -382,10 +492,42 @@
     <exclude name="UseStringBufferForStringAppends"/>
   </rule>
 
+  <rule ref="category/java/performance.xml/ConsecutiveAppendsShouldReuse">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='XMLLogger']
+                        //MethodDeclaration[@Name='encode']
+                | //ClassDeclaration[@SimpleName='InlineTagUtil']
+                      //MethodDeclaration[@Name='convertLinesToString']
+                | //ClassDeclaration[@SimpleName='XdocsPagesTest']
+                      //MethodDeclaration[@Name='validateViolationSection']
+                | //ClassDeclaration[@SimpleName='XdocsJavaDocsTest']
+                     //MethodDeclaration[@Name='createPropertiesText'
+                        or @Name='appendNodeText' or @Name='getAttributeText']"/>
+    </properties>
+  </rule>
+  <rule ref="category/java/performance.xml/UseArraysAsList">
+    <properties>
+      <!-- until https://github.com/checkstyle/checkstyle/issues/14870 -->
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='DescriptionExtractor']
+                        //MethodDeclaration[@Name='getDescriptionNodes']"/>
+    </properties>
+  </rule>
+
   <rule ref="category/java/design.xml/ExcessivePublicCount">
     <properties>
       <property name="violationSuppressXPath"
-                value="//ClassOrInterfaceDeclaration[@SimpleName='JavaAstVisitor']"/>
+                value="//ClassDeclaration[@SimpleName='JavaAstVisitor']"/>
+    </properties>
+  </rule>
+
+  <rule ref="category/java/design.xml/NPathComplexity">
+    <properties>
+      <property name="violationSuppressXPath"
+                value="//ClassDeclaration[@SimpleName='DescriptionExtractor']
+                      //MethodDeclaration[@Name='getDescriptionFromJavadoc']"/>
     </properties>
   </rule>
 </ruleset>
diff --git a/config/projects-to-test/openjdk-21-projects-to-test-on.config b/config/projects-to-test/openjdk-21-projects-to-test-on.config
new file mode 100644
index 00000000000..74c3d8d5bb3
--- /dev/null
+++ b/config/projects-to-test/openjdk-21-projects-to-test-on.config
@@ -0,0 +1,8 @@
+# List of GIT repositories to clone / pull for checking with Checkstyle
+# File format: REPO_NAME|[local|git|hg]|URL|[COMMIT_ID]|[EXCLUDE FOLDERS]
+# Please note that bash comments works in this file
+#
+# This file has been created to alleviate confusion in the contribution
+# repository's projects-to-test-on.properties file; these projects
+# must be used with special configurations.
+openjdk21|git|https://github.com/openjdk/jdk21u.git|master||
diff --git a/config/projects-to-test/openjdk17-excluded.files b/config/projects-to-test/openjdk17-excluded.files
index 0521da61f37..52cd88078bd 100644
--- a/config/projects-to-test/openjdk17-excluded.files
+++ b/config/projects-to-test/openjdk17-excluded.files
@@ -30,6 +30,9 @@
 </module>
 
 <!-- non-compilable -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TextBlockIllegalEscape.java$"/>
+</module>
 <module name="BeforeExecutionExclusionFileFilter">
   <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]SupplementaryJavaID1.java$"/>
 </module>
diff --git a/config/projects-to-test/openjdk19-excluded.files b/config/projects-to-test/openjdk19-excluded.files
index 0a1c56e3d17..c77f9a2101c 100644
--- a/config/projects-to-test/openjdk19-excluded.files
+++ b/config/projects-to-test/openjdk19-excluded.files
@@ -30,6 +30,9 @@
 </module>
 
 <!-- non-compilable -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TextBlockIllegalEscape.java$"/>
+</module>
 <module name="BeforeExecutionExclusionFileFilter">
   <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]Domination.java$"/>
 </module>
diff --git a/config/projects-to-test/openjdk20-excluded.files b/config/projects-to-test/openjdk20-excluded.files
index af32c19c861..499d5a265b5 100644
--- a/config/projects-to-test/openjdk20-excluded.files
+++ b/config/projects-to-test/openjdk20-excluded.files
@@ -30,6 +30,9 @@
 </module>
 
 <!-- non-compilable -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TextBlockIllegalEscape.java$"/>
+</module>
 <module name="BeforeExecutionExclusionFileFilter">
   <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ModuleDeclSbInModuleInfoJava.java$"/>
 </module>
diff --git a/config/projects-to-test/openjdk21-excluded.files b/config/projects-to-test/openjdk21-excluded.files
new file mode 100644
index 00000000000..50fd6c6d274
--- /dev/null
+++ b/config/projects-to-test/openjdk21-excluded.files
@@ -0,0 +1,602 @@
+<!-- This file was generated by script at https://github.com/checkstyle/checkstyle/issues/13402#issue-1806844349 -->
+<!-- Excluded due to exception; issues opened -->
+
+<!-- until https://github.com/checkstyle/checkstyle/issues/8654-->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]jdk[\\/]javadoc[\\/]doclet[\\/]testSupplementary[\\/]C.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]hotspot[\\/]jtreg[\\/]runtime[\\/]exceptionMsgs[\\/]methodPrinting[\\/]TestPrintingMethods.java$"/>
+</module>
+
+<!-- until https://github.com/checkstyle/checkstyle/issues/8650 -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]MethodParameters[\\/]UncommonParamNames.java$"/>
+</module>
+
+<!-- until https://github.com/checkstyle/checkstyle/issues/8655 -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]UnicodeAtEOL.java$"/>
+</module>
+
+<!-- until https://github.com/checkstyle/checkstyle/issues/8656 -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]UnicodeCommentDelimiter.java$"/>
+</module>
+
+<!-- until https://github.com/checkstyle/checkstyle/issues/8654 -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]FirstChar2.java$"/>
+</module>
+
+<!-- until https://github.com/checkstyle/checkstyle/issues/13987 -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]UnnamedClass.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]jdk[\\/]java[\\/]lang[\\/]Class[\\/]UnnamedClass[\\/]Unnamed.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unnamedclass[\\/]SourceLevelErrorPosition.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]processing[\\/]model[\\/]element[\\/]Anonymous.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unnamedclass[\\/]NestedEnum.java$"/>
+</module>
+
+<!-- Permanent suppression for text block templates, see reason at https://github.com/checkstyle/checkstyle/issues/14805#issue-2248064127. -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]jdk[\\/]java[\\/]lang[\\/]template[\\/]StringTemplateTest.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]jdk[\\/]java[\\/]lang[\\/]template[\\/]Basic.java$"/>
+</module>
+
+<!-- non-compilable -->
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TextBlockIllegalEscape.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]UnnamedClassNoMain.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]UnnamedClassBad-Filename.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unnamed[\\/]UnnamedClassRecovery.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]UnnamedErrors.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]UnnamedClassHasPackage.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]StringTemplateUnclosedString.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]StringTemplateUnclosedTextBlock.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]StringTemplateNoProcessor.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]StringTemplateRawProcessor.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]StringTemplateNotProcessor.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ModuleDeclSbInModuleInfoJava.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]jdk[\\/]javadoc[\\/]tool[\\/]T4994049[\\/]FileWithTabs.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]jdk[\\/]javadoc[\\/]tool[\\/]6964914[\\/]Error.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]jdk[\\/]javadoc[\\/]doclet[\\/]testUnnamedPackage[\\/]src1[\\/]BadSource.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]jdk[\\/]javadoc[\\/]doclet[\\/]testSourceTab[\\/]SingleTab[\\/]C.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]jdk[\\/]javadoc[\\/]doclet[\\/]testSourceTab[\\/]DoubleTab[\\/]C.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]enum[\\/]EnumAsIdentifier.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]enum[\\/]EnumMembersOrder.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T6882235.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]6440583[\\/]A.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T4994049[\\/]T4994049.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T8185983[\\/]RejectTypeArgsOnSelectTest.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T8286057.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]rawDiags[\\/]Error.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T8026963[\\/]TypeAnnotationsCrashWithErroneousTreeTest.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]lambda[\\/]lambdaExpression[\\/]InvalidExpression1.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]lambda[\\/]8131742[\\/]T8131742.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]lambda[\\/]funcInterfaces[\\/]LambdaTest1_neg1.java$"/>
+</module>
+
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]processing[\\/]6994946[\\/]SyntaxErrorTest.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]processing[\\/]errors[\\/]TestParseErrors[\\/]ParseErrors.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]IllegalAnnotation.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]ExtendArray.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]TripleQuote.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]SupplementaryJavaID4.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]SupplementaryJavaID3.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]SupplementaryJavaID2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]SupplementaryJavaID5.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]NonasciiDigit.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]SupplementaryJavaID1.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]unicode[\\/]SupplementaryJavaID6.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]DeconstructionPatternErrors.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]ForEachPatternsErrors.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]PatternCaseErrorRecovery.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]Digits.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]IndexArray.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]target[\\/]IncompleteArray.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]ForEachTestAllAnalyzers.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]NoModifiersOnBinding.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]SwitchErrors.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]target[\\/]DotClass.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]StaticFields.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]BadCast.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]AnnotatedPackage2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]AnnotatedClassExpr.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]IncompleteArray.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]AnnotatedImport.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]AnnotatedMethodSelectorTest.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]failures[\\/]OldArray.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]typeAnnotations[\\/]6967002[\\/]T6967002.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Z5.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]AnnComma.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Z9.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Z2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]NoDefault.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Z8.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]NoStatic.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Z3.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Z13.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]pkg[\\/]package-info.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Z14.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]annotations[\\/]neg[\\/]Syntax1.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalStartOfStmt.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]UnclosedStringLiteral.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]Expected3.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]VarAllOrNothing.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ForeachNotExhaustive.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]DefaultAllowedInIntfAnnotationMember.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ForeachBadInitialization.java$"/>
+</module>
+
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalArrayCreation.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ExpectedModule.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]TryWithResourcesExprNeedsVar.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]InitializerNotAllowed.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]MalformedFpLit.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]TextBlockCloseDelimiter.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalNonAsciiDigit.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]CatchWithoutTry.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ProcessorWrongType[\\/]ProcessorWrongType.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]InvalidBinaryNumber.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]InvalidHexNumber.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]EmptyCharLiteral.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]EnumsCantBeGeneric.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]RecordsCantDeclareComponentModifiers.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalChar.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]NotAllowedClass.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ArrayDimMissing.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalAnnotationDeclaration.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]EnumAsIdentifier2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ThisAsIdentifier.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]VarargsMustBeLast.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]CantExtendIntfAnno.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]RecordsComponentsCanNotDeclareCStyleArrays.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]AnnotationMustBeNameValue.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]NotAllowedVariable.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]VarargsAndReceiver.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]Orphaned.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalEscapeChar.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]UnclosedComment.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IntNumberTooLarge.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalUnderscore.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalDot.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]PrematureEOF.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]AssertAsIdentifier2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]UnclosedCharLiteral.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]TryWithoutCatchOrFinallyOrResource.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]CannotCreateArrayWithTypeArgs.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalLineEndInCharLit.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ExplicitImplicitLambda.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]EnumConstantExpected.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]VarInImplicitLambda.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]SwitchCaseUnexpectedStatement.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalStartOfExpr.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IllegalStartOfType.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IntfAnnotationsCantHaveParams.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]DefiniteAssignment[\\/]ConstantInfiniteWhile.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]SwitchMixingCaseTypes.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]DotClassExpected.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ElseWithoutIf.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IdentifierExpected.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IntfAnnotationsCantHaveTypeParams.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]FinallyWithoutTry.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IncorrectRecordDeclaration.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]EnumConstantNotExpected.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]CallMustBeFirst.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]AnnotationMissingElementValue.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]ThrowsNotAllowedInAnno.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]Expected2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]IntfAnnotationCantHaveTypeParams.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]EOI.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]quid[\\/]T6999438.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T8036019.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]Parens3.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]records[\\/]RecordDeclarationSyntaxTest.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]QualifiedAccess[\\/]QualifiedAccess_4.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]policy[\\/]test3[\\/]A.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]BadHexConstant.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]failover[\\/]FailOver01.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]failover[\\/]FailOver15.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]generics[\\/]6413682[\\/]T6413682.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]api[\\/]TestGetElementReferenceDataWithErrors.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]api[\\/]T6265137a.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TryWithResources[\\/]PlainTry.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TryWithResources[\\/]ResDeclOutsideTry.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TryWithResources[\\/]TwrForVariable2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]TryWithResources[\\/]BadTwrSyntax.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]var_implicit_lambda[\\/]VarInImplicitLambdaNegTest01.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]ImportUnnamed[\\/]foo[\\/]A.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T8175198[\\/]AnnotationsAndFormalParamsTest.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]parser[\\/]MissingClosingBrace.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]parser[\\/]SingleCommaAnnotationValueFail.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]parser[\\/]7157165[\\/]T7157165.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]parser[\\/]8081769[\\/]T8081769.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]literals[\\/]BadBinaryLiterals.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]literals[\\/]T6891079.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]literals[\\/]BadUnderscoreLiterals.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]incompleteStatements[\\/]T8000484.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]hotspot[\\/]jtreg[\\/]runtime[\\/]classFileParserBug[\\/]Bad_NCDFE_Msg.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]8245153[\\/]T8245153.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]ExtraneousEquals.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]parser[\\/]ErroneousParameters.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]parser[\\/]T4881269.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]switchextra[\\/]SwitchStatementBroken.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]switchextra[\\/]SwitchStatementBroken2.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]BadAnnotation.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]UncaughtOverflow.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]LabeledDeclaration.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]jdk[\\/]java[\\/]lang[\\/]template[\\/]T8313809.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]T8312163.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]PatternErrorRecovery.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]patterns[\\/]T8309054.java$"/>
+</module>
+<module name="BeforeExecutionExclusionFileFilter">
+  <property name="fileNamePattern" value="[\\/]test[\\/]langtools[\\/]tools[\\/]javac[\\/]diags[\\/]examples[\\/]GuardNotAllowed.java$"/>
+</module>
diff --git a/config/sevntu-suppressions.xml b/config/sevntu-suppressions.xml
index ab08ab33fda..90777a64cca 100644
--- a/config/sevntu-suppressions.xml
+++ b/config/sevntu-suppressions.xml
@@ -46,4 +46,8 @@
   <!-- Require for testing of util package -->
   <suppress checks="ForbidCertainImports" files="AnnotationUtilTest\.java"/>
   <suppress checks="ForbidCertainImports" files="CheckUtilTest\.java"/>
+
+  <!-- Required for reversing a list -->
+  <suppress checks="ForbidCertainImports" files="SiteUtil\.java"/>
+
 </suppressions>
diff --git a/config/signatures-test.txt b/config/signatures-test.txt
index ace91fffab5..0ed9e670775 100644
--- a/config/signatures-test.txt
+++ b/config/signatures-test.txt
@@ -1 +1,5 @@
 com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport#verify(com.puppycrawl.tools.checkstyle.api.Configuration, java.lang.String, java.lang.String[]) @ Use inline config parser instead.
+java.nio.file.Files#createTempFile(java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[]) @ Use of this method is forbidden, please use @TempDir for better temporary directory control
+java.io.File#createTempFile(java.lang.String,java.lang.String,java.io.File) @ Use of this method is forbidden, please use @TempDir for better temporary directory control
+java.nio.file.Files#createTempDirectory(java.lang.String,java.nio.file.attribute.FileAttribute[]) @ Use of this method is forbidden, please use @TempDir for better temporary directory control
+java.nio.file.Files#createTempFile(java.nio.file.Path,java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[]) @ Use of this method is forbidden, please use @TempDir for better temporary directory control
diff --git a/config/signatures.txt b/config/signatures.txt
index 2163c21c859..95071d4d798 100644
--- a/config/signatures.txt
+++ b/config/signatures.txt
@@ -3,3 +3,4 @@ com.puppycrawl.tools.checkstyle.DefaultConfiguration#getAttribute(java.lang.Stri
 com.puppycrawl.tools.checkstyle.DefaultConfiguration#addAttribute(java.lang.String,java.lang.String) @ Usage of deprecated API is forbidden. Please use DefaultConfiguration.addProperty(String name, String value) instead.
 com.puppycrawl.tools.checkstyle.api.AbstractCheck#log(int,int,java.lang.String,java.lang.Object[]) @ Use of this log method is forbidden, please use AbstractCheck#log(DetailAST ast, String key, Object... args)
 com.puppycrawl.tools.checkstyle.api.AbstractCheck#log(int,java.lang.String,java.lang.Object[]) @ Use of this log method is forbidden, please use AbstractCheck#log(DetailAST ast, String key, Object... args)
+java.net.URI#toString() @ This method can return garbage for non-ascii data, please use URI#toASCIIString()
diff --git a/config/spotbugs-exclude.xml b/config/spotbugs-exclude.xml
index d2e871c93b3..10bb57f3e31 100644
--- a/config/spotbugs-exclude.xml
+++ b/config/spotbugs-exclude.xml
@@ -164,7 +164,7 @@
   </Match>
   <Match>
     <!-- Check is broken and does not clearly report where the fault is.
-         Suppressed until https://github.com/mebigfatguy/fb-contrib/issues/408 -->
+         Suppressed until https://github.com/mebigfatguy/fb-contrib/issues/453 -->
     <Bug pattern="WOC_WRITE_ONLY_COLLECTION_FIELD"/>
   </Match>
   <Match>
@@ -288,4 +288,38 @@
     name="com.puppycrawl.tools.checkstyle.checks.header.AbstractHeaderCheck"/>
     <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
   </Match>
+  <Match>
+    <!-- until https://github.com/checkstyle/checkstyle/issues/14121 -->
+    <Class name="com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck"/>
+    <Method name="indentationLog"/>
+    <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+  </Match>
+  <Match>
+    <!-- there is strict order of method executions, call in misorder will result in failure -->
+    <Class name="com.puppycrawl.tools.checkstyle.AbstractAutomaticBean"/>
+    <Method name="setupChild"/>
+    <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+  </Match>
+  <Match>
+    <!-- until https://github.com/checkstyle/checkstyle/issues/14122 -->
+    <Or>
+      <Class name="com.puppycrawl.tools.checkstyle.DefaultLogger"/>
+      <Class name="com.puppycrawl.tools.checkstyle.PackageObjectFactory"/>
+      <Class name="com.puppycrawl.tools.checkstyle.SarifLogger"/>
+      <Class name="com.puppycrawl.tools.checkstyle.XMLLogger"/>
+      <Class name="com.puppycrawl.tools.checkstyle.XmlLoader"/>
+      <Class name="com.puppycrawl.tools.checkstyle.filters.XpathFilterElement"/>
+      <Class name="com.puppycrawl.tools.checkstyle.Checker"/>
+      <Class name="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/>
+      <Class name="com.puppycrawl.tools.checkstyle.filters.CsvFilterElement"/>
+    </Or>
+    <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+  </Match>
+  <Match>
+    <!-- variable is just being saved for further analysis and isn't the main decider
+         of the loop if it is done or not -->
+    <Class name="com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck"/>
+    <Method name="getBlockContainingLocalAnonInnerClass"/>
+    <Bug pattern="SLS_SUSPICIOUS_LOOP_SEARCH"/>
+  </Match>
 </FindBugsFilter>
diff --git a/config/suppressions.xml b/config/suppressions.xml
index 95cc26601f2..564a522ba6e 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -12,7 +12,7 @@
   <suppress id="lineLengthXml" files="[\\/]meta[\\/]"/>
 
   <suppress checks="FileLength"
-             files="TokenTypes.java|IndentationCheckTest.java"
+             files="TokenTypes.java|IndentationCheckTest.java|XdocsPagesTest|CheckerTest.java"
              lines="1"/>
 
   <!-- illegal words are part of Javadoc -->
@@ -60,6 +60,8 @@
   <suppress checks="MethodCount" files="[\\/]RequireThisCheck.java$"/>
   <!-- Apart from complex logic, there is a nested class which contains many methods.  -->
   <suppress checks="MethodCount" files="[\\/]UnusedLocalVariableCheck.java"/>
+  <!-- Utility class is combination of a lot of different methods .  -->
+  <suppress checks="MethodCount" files="[\\/]SiteUtil.java"/>
   <!-- parse method needs catching Exceptions to print context of execution -->
   <suppress checks="IllegalCatch" files="[\\/]src[\\/]test[\\/].*[\\/]InlineConfigParser\.java"/>
   <!-- exception maybe thrown while executing the static block -->
@@ -75,7 +77,7 @@
              files="(CheckerTest|AbstractModuleTestSupport|AbstractItModuleTestSupport|
                     |CheckstyleAntTaskTest|
                     |TranslationCheckTest|LocalizedMessageTest|AbstractFileSetCheckTest|
-                    |AbstractCheckTest)\.java"/>
+                    |AbstractCheckTest|InlineConfigParser)\.java"/>
   <suppress checks="ClassDataAbstractionCoupling"
              files="XpathFileGeneratorAuditListenerTest\.java"/>
   <suppress checks="ClassFanOutComplexity" files="[\\/]Main\.java"/>
@@ -192,4 +194,8 @@
   <!-- The file is generated -->
   <suppress checks="FileTabCharacter"
     files="src[\\/]xdocs[\\/]checks[\\/]whitespace[\\/]filetabcharacter\.xml"/>
+
+  <!-- Uses non-ascii symbols intentionally -->
+  <suppress id="checkASCII"
+            files="[\\/]src[\\/]test[\\/]java[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]ConfigurationLoaderTest.java"/>
 </suppressions>
diff --git a/pom.xml b/pom.xml
index 023214e1f6a..2955a6f7560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>com.puppycrawl.tools</groupId>
   <artifactId>checkstyle</artifactId>
-  <version>10.12.3</version>
+  <version>10.17.0</version>
   <packaging>jar</packaging>
 
   <name>checkstyle</name>
@@ -24,8 +24,8 @@
   <inceptionYear>2001</inceptionYear>
   <licenses>
     <license>
-      <name>LGPL-2.1+</name>
-      <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+      <name>LGPL-2.1-or-later</name>
+      <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
     </license>
   </licenses>
 
@@ -59,7 +59,7 @@
       </roles>
     </developer>
     <developer>
-      <id>nick-mancuso</id>
+      <id>nrmancuso</id>
       <name>Nick Mancuso</name>
       <roles>
         <role>developer</role>
@@ -206,43 +206,75 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <surefire.options />
     <projectVersion>${project.version}</projectVersion>
-    <antlr4.version>4.11.1</antlr4.version>
+    <antlr4.version>4.13.1</antlr4.version>
     <maven.site.plugin.version>3.12.1</maven.site.plugin.version>
-    <maven.spotbugs.plugin.version>4.7.3.0</maven.spotbugs.plugin.version>
-    <maven.pmd.plugin.version>3.21.0</maven.pmd.plugin.version>
-    <pmd.version>6.54.0</pmd.version>
-    <maven.jacoco.plugin.version>0.8.8</maven.jacoco.plugin.version>
+    <maven.spotbugs.plugin.version>4.8.5.0</maven.spotbugs.plugin.version>
+    <maven.pmd.plugin.version>3.22.0</maven.pmd.plugin.version>
+    <pmd.version>7.1.0</pmd.version>
+    <maven.jacoco.plugin.version>0.8.12</maven.jacoco.plugin.version>
     <mockito.version>5.2.0</mockito.version>
-    <saxon.version>12.3</saxon.version>
+    <saxon.version>12.4</saxon.version>
     <maven.checkstyle.plugin.version>3.2.0</maven.checkstyle.plugin.version>
     <maven.sevntu.checkstyle.plugin.version>1.44.1</maven.sevntu.checkstyle.plugin.version>
     <maven.sevntu-checkstyle-check.checkstyle.version>
       10.4
     </maven.sevntu-checkstyle-check.checkstyle.version>
-    <maven.versions.plugin.version>2.14.2</maven.versions.plugin.version>
-    <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
+    <maven.versions.plugin.version>2.16.2</maven.versions.plugin.version>
+    <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
     <java.version>11</java.version>
-    <pitest.plugin.version>1.14.1</pitest.plugin.version>
+    <maven.compiler.release>${java.version}</maven.compiler.release>
+    <pitest.plugin.version>1.16.1</pitest.plugin.version>
     <pitest.plugin.timeout.factor>10</pitest.plugin.timeout.factor>
     <pitest.plugin.output.formats>HTML,XML</pitest.plugin.output.formats>
     <pitest.plugin.timeout.constant>50000</pitest.plugin.timeout.constant>
     <pitest.plugin.threads>4</pitest.plugin.threads>
-    <pitest.junit5.plugin.version>1.1.2</pitest.junit5.plugin.version>
+    <pitest.junit5.plugin.version>1.2.1</pitest.junit5.plugin.version>
     <pitest.accelerator.junit5.plugin.version>1.0.6</pitest.accelerator.junit5.plugin.version>
     <sonar.test.exclusions>**/test/resources/**/*,**/it/resources/**/*</sonar.test.exclusions>
-    <junit.version>5.9.2</junit.version>
-    <forbiddenapis.version>3.4</forbiddenapis.version>
+    <junit.version>5.10.2</junit.version>
+    <forbiddenapis.version>3.7</forbiddenapis.version>
     <json-schema-validator.version>1.2.0</json-schema-validator.version>
-    <error-prone.version>2.18.0</error-prone.version>
-    <checkerframework.version>3.27.0</checkerframework.version>
+    <checkerframework.version>3.43.0</checkerframework.version>
+    <error-prone.version>2.27.1</error-prone.version>
+    <error-prone-support.version>0.15.0</error-prone-support.version>
     <doxia.version>1.12.0</doxia.version>
+    <error-prone.configuration-args>
+      -Xep:AmbiguousJsonCreator:ERROR
+      -Xep:AssertJIsNull:ERROR
+      -Xep:AutowiredConstructor:ERROR
+      -Xep:CanonicalAnnotationSyntax:ERROR
+      -Xep:DirectReturn:ERROR
+      -Xep:CollectorMutability:ERROR
+      -Xep:EmptyMethod:ERROR
+      -Xep:ExplicitEnumOrdering:ERROR
+      -Xep:FormatStringConcatenation:ERROR
+      -Xep:IsInstanceLambdaUsage:ERROR
+      -Xep:MockitoMockClassReference:ERROR
+      -Xep:MockitoStubbing:ERROR
+      -Xep:NestedOptionals:ERROR
+      -Xep:PrimitiveComparison:ERROR
+      -Xep:RedundantStringConversion:ERROR
+      -Xep:Slf4jLogStatement:ERROR
+      -Xep:StringJoin:ERROR
+      -Xep:TimeZoneUsage:ERROR
+      <!-- Reason at https://github.com/checkstyle/checkstyle/issues/8252. -->
+      -Xep:JUnitClassModifiers:OFF
+      <!-- Reason at https://github.com/checkstyle/checkstyle/issues/8252. -->
+      -Xep:JUnitMethodDeclaration:OFF
+      <!-- We prefer different style of writing tests. -->
+      -Xep:JUnitValueSource:OFF
+      <!-- Until https://github.com/checkstyle/checkstyle/issues/14194. -->
+      -Xep:LexicographicalAnnotationListing:OFF
+      <!-- We prefer to qualify all static method calls with class name. -->
+      -Xep:StaticImport:OFF
+    </error-prone.configuration-args>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>info.picocli</groupId>
       <artifactId>picocli</artifactId>
-      <version>4.7.4</version>
+      <version>4.7.6</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
@@ -257,7 +289,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.0.1-jre</version>
+      <version>33.2.0-jre</version>
       <exclusions>
         <exclusion>
           <groupId>org.checkerframework</groupId>
@@ -299,13 +331,13 @@
     <dependency>
       <groupId>org.junit-pioneer</groupId>
       <artifactId>junit-pioneer</artifactId>
-      <version>2.0.0</version>
+      <version>2.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.tngtech.archunit</groupId>
       <artifactId>archunit-junit5</artifactId>
-      <version>1.0.1</version>
+      <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -331,13 +363,13 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.3</version>
+      <version>1.4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>nl.jqno.equalsverifier</groupId>
       <artifactId>equalsverifier</artifactId>
-      <version>3.15.1</version>
+      <version>3.16.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -349,19 +381,19 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.13.0</version>
+      <version>2.16.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>6.9.0.202403050737-r</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.7</version>
+      <version>2.0.13</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -412,12 +444,22 @@
           <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.collections</groupId>
+          <artifactId>google-collections</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-module-xdoc</artifactId>
       <version>${doxia.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.collections</groupId>
+          <artifactId>google-collections</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
@@ -443,11 +485,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.7.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.6.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
@@ -459,7 +501,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -469,7 +511,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.5.3</version>
         </plugin>
         <plugin>
           <groupId>org.pitest</groupId>
@@ -491,7 +533,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.6.3</version>
           <configuration>
             <!-- Exclude generated sources. -->
             <excludePackageNames>
@@ -577,7 +619,7 @@
               <plugin>
                 <groupId>com.mebigfatguy.sb-contrib</groupId>
                 <artifactId>sb-contrib</artifactId>
-                <version>7.6.0</version>
+                <version>7.6.4</version>
               </plugin>
             </plugins>
           </configuration>
@@ -656,7 +698,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -674,7 +716,7 @@
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0</version>
         <executions>
           <execution>
             <goals>
@@ -686,7 +728,7 @@
       <plugin>
         <groupId>org.gaul</groupId>
         <artifactId>modernizer-maven-plugin</artifactId>
-        <version>2.5.0</version>
+        <version>2.9.0</version>
         <configuration>
           <javaVersion>${java.version}</javaVersion>
           <includeTestClasses>false</includeTestClasses>
@@ -705,13 +747,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2</version>
       </plugin>
 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tidy-maven-plugin</artifactId>
-        <version>1.2.0</version>
+        <version>1.3.0</version>
         <executions>
           <execution>
             <id>validate</id>
@@ -762,8 +804,6 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
           <compilerArgs>
             <arg>-Xpkginfo:always</arg>
           </compilerArgs>
@@ -773,7 +813,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
       </plugin>
 
       <plugin>
@@ -805,7 +845,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -902,6 +942,8 @@
                     <exclude>com.puppycrawl.tools.checkstyle.meta.ModuleDetails*</exclude>
                     <exclude>com.puppycrawl.tools.checkstyle.meta.JavadocMetadataScraper*</exclude>
                     <exclude>com.puppycrawl.tools.checkstyle.meta.XmlMeta*</exclude>
+                    <!-- OS specific utility providing class -->
+                    <exclude>com.puppycrawl.tools.checkstyle.utils.OsSpecificUtil</exclude>
                   </excludes>
                   <limits>
                     <limit>
@@ -1113,12 +1155,12 @@
                     <limit>
                       <counter>LINE</counter>
                       <value>COVEREDRATIO</value>
-                      <minimum>0.81</minimum>
+                      <minimum>0.82</minimum>
                     </limit>
                     <limit>
                       <counter>BRANCH</counter>
                       <value>COVEREDRATIO</value>
-                      <minimum>0.79</minimum>
+                      <minimum>0.75</minimum>
                     </limit>
                   </limits>
                 </rule>
@@ -1316,7 +1358,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <id>enforce-versions</id>
@@ -1329,7 +1371,7 @@
                   <version>${java.version}</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
-                  <version>3.3.9</version>
+                  <version>3.6.3</version>
                 </requireMavenVersion>
                 <!-- doxia-core has a dependency convergence within itself and doxia-module-xdoc -->
                 <dependencyConvergence>
@@ -1390,7 +1432,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -1470,7 +1512,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.5</version>
         <configuration>
           <includes>
             <include>com/google/**/*.java</include>
@@ -1497,9 +1539,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.5</version>
         <configuration>
-          <argLine>-Dfile.encoding=UTF-8 @{surefire.options}</argLine>
+          <argLine>-Dfile.encoding=UTF-8 ${surefire.options}</argLine>
           <systemPropertyVariables>
             <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
             <!-- Virtual AWT driver for GUI unit tests -->
@@ -1545,13 +1587,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.1</version>
         <configuration>
           <archive>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
               <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>${project.groupId}.${project.artifactId}</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
           <excludes>
             <exclude>**/Input*.*</exclude>
@@ -1812,22 +1857,8 @@
                 <!-- due to https://github.com/checkstyle/checkstyle/pull/13193 All the code needs to be in single line -->
                 <exclude>**/OneStatementPerLineCheckTest.class</exclude>
 
-                <!-- all bellow until https://github.com/checkstyle/checkstyle/issues/11446 -->
-
-                <!-- usage of custom internal module, 'execute' method should be used -->
-                <exclude>**/FileSetCheckTest.class</exclude>
-                <exclude>**/AbstractFileSetCheckTest.class</exclude>
-
-                <exclude>**/DetailAstImplTest.class</exclude>
-
-                <exclude>**/TreeWalkerTest.class</exclude>
-
-                <exclude>**/CheckerTest.class</exclude>
-
-                <exclude>**/AllBlockCommentsTest.class</exclude>
-
-                <!-- test needs to be updated -->
-                <exclude>**/SuppressionCommentFilterTest.class</exclude>
+                <!-- this class contain forbidden verify method -->
+                <exclude>**/AbstractModuleTestSupport.class</exclude>
 
                 <!-- due to https://github.com/checkstyle/checkstyle/issues/11846 -->
                 <exclude>**/EmptyLineSeparatorCheckTest.class</exclude>
@@ -1837,17 +1868,8 @@
                 <!-- content header is conflicting with Input inline header -->
                 <exclude>**/RegexpHeaderCheckTest.class</exclude>
 
-                <!-- test should be updated -->
-                <exclude>**/AbstractCheckTest.class</exclude>
-
-                <!-- tests need to be updated -->
-                <exclude>**/SuppressWithNearbyCommentFilterTest.class</exclude>
-
-                <!-- this class contain forbidden verify method -->
-                <exclude>**/AbstractModuleTestSupport.class</exclude>
-
-                <!-- tests should be updated -->
-                <exclude>**/AbstractJavadocCheckTest.class</exclude>
+                <!-- all bellow until https://github.com/checkstyle/checkstyle/issues/11446 -->
+                <exclude>**/CheckerTest.class</exclude>
               </excludes>
             </configuration>
           </execution>
@@ -1856,7 +1878,7 @@
       <plugin>
         <groupId>edu.illinois</groupId>
         <artifactId>nondex-maven-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.7</version>
       </plugin>
 
       <plugin>
@@ -1875,7 +1897,7 @@
           <validations>
             <validation>
               <directory>${basedir}/src/test/resources/com/puppycrawl/tools/checkstyle/sariflogger</directory>
-              <jsonSchema>https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Documents/CommitteeSpecifications/2.1.0/sarif-schema-2.1.0.json</jsonSchema>
+              <jsonSchema>https://raw.githubusercontent.com/oasis-tcs/sarif-spec/main/sarif-2.1/schema/sarif-schema-2.1.0.json</jsonSchema>
               <includes>
                 <include>**/*.sarif</include>
               </includes>
@@ -1890,7 +1912,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.4.5</version>
+        <version>3.5.0</version>
       </plugin>
 
       <plugin>
@@ -1917,7 +1939,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.5</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -1930,7 +1952,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.2</version>
       </plugin>
 
       <plugin>
@@ -2119,9 +2141,6 @@
             <excludedLink>https://www.w3.org/TR/*</excludedLink>
             <!-- very frequent SocketTimeoutException : Read timed out -->
             <excludedLink>https://maven.apache.org/*</excludedLink>
-            <!-- very frequent SocketTimeoutException : Read timed out -->
-            <excludedLink>https://www.bountysource.com/*</excludedLink>
-            <excludedLink>https://api.bountysource.com/*</excludedLink>
             <!-- This URL become to require to log in first to see content -->
             <excludedLink>https://bitbucket.org/atlassian/bamboo-checkstyle-plugin</excludedLink>
             <!-- link works but plugin's request always result in 404 -->
@@ -2148,6 +2167,7 @@
             <!-- permanent 403 -->
             <excludedLink>https://www.ej-technologies.com/*</excludedLink>
             <excludedLink>https://travis-ci.com/</excludedLink>
+            <excludedLink>https://stackoverflow.com/questions/*</excludedLink>
             <!-- permanent 403 -->
             <excludedLink>https://docs.github.com/en/rest/checks</excludedLink>
             <excludedLink>https://www.ietf.org/rfc/rfc4627.txt</excludedLink>
@@ -2391,13 +2411,11 @@
                 </goals>
                 <configuration>
                   <failOnError>false</failOnError>
-                  <source>${java.version}</source>
-                  <target>${java.version}</target>
                   <compilerArgs>
                     <arg>-Xpkginfo:always</arg>
                     <arg>-XDcompilePolicy=simple</arg>
                     <arg>
-                      -Xplugin:ErrorProne
+                      -Xplugin:ErrorProne ${error-prone.configuration-args}
                     </arg>
                   </compilerArgs>
                   <annotationProcessorPaths>
@@ -2406,6 +2424,11 @@
                       <artifactId>error_prone_core</artifactId>
                       <version>${error-prone.version}</version>
                     </path>
+                    <path>
+                      <groupId>tech.picnic.error-prone-support</groupId>
+                      <artifactId>error-prone-contrib</artifactId>
+                      <version>${error-prone-support.version}</version>
+                    </path>
                   </annotationProcessorPaths>
                 </configuration>
               </execution>
@@ -2443,14 +2466,13 @@
                 </goals>
                 <configuration>
                   <failOnError>false</failOnError>
-                  <source>${java.version}</source>
-                  <target>${java.version}</target>
                   <compilerArgs>
                     <arg>-Xpkginfo:always</arg>
                     <arg>-XDcompilePolicy=simple</arg>
                     <arg>
                       -Xplugin:ErrorProne \
-                      -XepExcludedPaths:.*[\\/]resources[\\/].*
+                      -XepExcludedPaths:.*[\\/]resources[\\/].* \
+                      ${error-prone.configuration-args}
                     </arg>
                   </compilerArgs>
                   <annotationProcessorPaths>
@@ -2459,6 +2481,11 @@
                       <artifactId>error_prone_core</artifactId>
                       <version>${error-prone.version}</version>
                     </path>
+                    <path>
+                      <groupId>tech.picnic.error-prone-support</groupId>
+                      <artifactId>error-prone-contrib</artifactId>
+                      <version>${error-prone-support.version}</version>
+                    </path>
                   </annotationProcessorPaths>
                 </configuration>
               </execution>
@@ -2476,7 +2503,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.4</version>
             <configuration>
               <gpgArguments>
                 <arg>--pinentry-mode</arg>
@@ -2499,9 +2526,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -2558,9 +2585,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -2617,9 +2644,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -2675,9 +2702,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -2732,9 +2759,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -2790,9 +2817,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -2850,9 +2877,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -2909,9 +2936,9 @@
             <configuration>
               <!-- Must fork or else JVM arguments are ignored. -->
               <fork>true</fork>
-              <failOnError>false</failOnError>
+              <failOnError>true</failOnError>
               <meminitial>1024m</meminitial>
-              <maxmem>4048m</maxmem>
+              <maxmem>8192m</maxmem>
               <compilerArguments>
                 <Xmaxerrs>10000</Xmaxerrs>
                 <Xmaxwarns>10000</Xmaxwarns>
@@ -3045,6 +3072,9 @@
                 <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
                 <avoidCallsTo>org.apache.commons.logging</avoidCallsTo>
               </avoidCallsTo>
+              <features>
+                <feature>+funmodifiablecollection</feature>
+              </features>
               <excludedMethods>
                 <!-- destroy method was added in case module had to free up resources
                 before ending, but currently it does ThreadLocal cleanup,
@@ -3234,6 +3264,7 @@
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.AvoidDoubleBraceInitializationCheck*</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.AvoidInlineConditionalsCheck*</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.AvoidNoArgumentSuperConstructorCallCheck*</param>
+                <param>com.puppycrawl.tools.checkstyle.checks.coding.ConstructorsDeclarationGroupingCheck*</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck*</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheck*</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheck*</param>
@@ -3258,6 +3289,7 @@
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.AvoidDoubleBraceInitializationCheckTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.AvoidInlineConditionalsCheckTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.AvoidNoArgumentSuperConstructorCallCheckTest</param>
+                <param>com.puppycrawl.tools.checkstyle.checks.coding.ConstructorsDeclarationGroupingCheckTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheckTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheckTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheckTest</param>
@@ -3282,6 +3314,9 @@
               <avoidCallsTo>
                 <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
               </avoidCallsTo>
+              <features>
+                <feature>+funmodifiablecollection</feature>
+              </features>
               <excludedTestClasses>
                 <param>*.Input*</param>
               </excludedTestClasses>
@@ -3642,6 +3677,7 @@
               <targetClasses>
                 <param>com.puppycrawl.tools.checkstyle.checks.imports.*</param>
               </targetClasses>
+              <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
               <targetTests>
                 <param>com.puppycrawl.tools.checkstyle.checks.imports.*</param>
               </targetTests>
@@ -3753,6 +3789,9 @@
                 <!-- JavadocMetadataScraper extends AbstractJavadocCheck -->
                 <param>com.puppycrawl.tools.checkstyle.meta.JavadocMetadataScraperTest</param>
               </targetTests>
+              <avoidCallsTo>
+                <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
+              </avoidCallsTo>
               <excludedTestClasses>
                 <param>*.Input*</param>
               </excludedTestClasses>
@@ -4321,6 +4360,7 @@
                 <param>com.puppycrawl.tools.checkstyle.Checker*</param>
                 <param>com.puppycrawl.tools.checkstyle.ThreadModeSettings*</param>
                 <param>com.puppycrawl.tools.checkstyle.grammar.CrAwareLexerSimulator*</param>
+                <param>com.puppycrawl.tools.checkstyle.grammar.CompositeLexerContextCache*</param>
                 <!-- interfaces -->
                 <param>com.puppycrawl.tools.checkstyle.AuditEventFormatter*</param>
                 <param>com.puppycrawl.tools.checkstyle.XdocsPropertyType*</param>
@@ -4352,15 +4392,33 @@
                 <param>com.puppycrawl.tools.checkstyle.ThreadModeSettingsTest</param>
                 <param>com.puppycrawl.tools.checkstyle.grammar.CrAwareLexerSimulatorTest</param>
                 <param>com.puppycrawl.tools.checkstyle.grammar.javadoc.JavadocParseTreeTest</param>
+                <!-- this test is required for CompositeLexerContextCache -->
+                <param>com.puppycrawl.tools.checkstyle.grammar.java21.Java21AstRegressionTest</param>
                 <!-- this test is required for Checker -->
                 <param>com.puppycrawl.tools.checkstyle.filefilters.BeforeExecutionExclusionFileFilterTest</param>
+                <param>com.puppycrawl.tools.checkstyle.checks.TranslationCheckTest</param>
                 <!-- This test is the primary user of metadataGeneratorLogger -->
                 <param>com.puppycrawl.tools.checkstyle.meta.MetadataGeneratorUtilTest</param>
                 <!-- kills mutation in AbstractAutomaticBean -->
                 <param>com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheckTest</param>
                 <!-- kills mutation in AbstractAutomaticBean -->
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheckTest</param>
+                <!-- kills mutation in ConfigurationLoader -->
+                <param>com.sun.checkstyle.test.chapter5comments.rule52documentationcomments.InvalidJavadocPositionTest</param>
               </targetTests>
+              <avoidCallsTo>
+                <avoidCallsTo>org.apache.commons.logging</avoidCallsTo>
+                <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
+              </avoidCallsTo>
+              <excludedMethods>
+                <!-- caching of search results, big performance optimization -->
+                <param>lazyLoad</param>
+                <!-- performance optimization -->
+                <param>initStringBuilderWithOptimalBuffer</param>
+              </excludedMethods>
+              <features>
+                <feature>+funmodifiablecollection</feature>
+              </features>
               <coverageThreshold>100</coverageThreshold>
               <mutationThreshold>96</mutationThreshold>
               <timeoutFactor>${pitest.plugin.timeout.factor}</timeoutFactor>
@@ -4434,6 +4492,9 @@
                 <!-- cause of https://github.com/checkstyle/checkstyle/issues/3605 -->
                 <param>setFeaturesBySystemProperty</param>
               </excludedMethods>
+              <features>
+                <feature>+funmodifiablecollection</feature>
+              </features>
               <avoidCallsTo>
                 <!-- cause of https://github.com/checkstyle/checkstyle/issues/3605 -->
                 <avoidCallsTo>
@@ -4501,7 +4562,7 @@
               <targetTests>
                 <param>com.puppycrawl.tools.checkstyle.MainTest</param>
               </targetTests>
-              <coverageThreshold>100</coverageThreshold>
+              <coverageThreshold>99</coverageThreshold>
               <mutationThreshold>99</mutationThreshold>
               <timeoutFactor>${pitest.plugin.timeout.factor}</timeoutFactor>
               <timeoutConstant>${pitest.plugin.timeout.constant}</timeoutConstant>
@@ -4672,6 +4733,8 @@
                 <param>com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheckTest</param>
                 <!-- 1% mutation in CheckUtil -->
                 <param>com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheckTest</param>
+                <param>com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheckTest</param>
+                <param>com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheckTest</param>
                 <param>org.checkstyle.suppressionxpathfilter.XpathRegressionUnusedLocalVariableTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheckTest</param>
                 <param>org.checkstyle.suppressionxpathfilter.XpathRegressionJavadocMethodTest</param>
@@ -4679,7 +4742,11 @@
                 <param>com.puppycrawl.tools.checkstyle.filters.SuppressWithPlainTextCommentFilterTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheckTest</param>
                 <param>com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheckTest</param>
+                <param>com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheckTest</param>
               </targetTests>
+              <avoidCallsTo>
+                <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
+              </avoidCallsTo>
               <excludedTestClasses>
                 <param>*.Input*</param>
               </excludedTestClasses>
@@ -4755,6 +4822,9 @@
               <avoidCallsTo>
                 <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
               </avoidCallsTo>
+              <features>
+                <feature>+funmodifiablecollection</feature>
+              </features>
               <excludedTestClasses>
                 <param>*.Input*</param>
               </excludedTestClasses>
@@ -4818,6 +4888,7 @@
                 <param>isFileExists</param>
               </excludedMethods>
               <excludedClasses>
+                <class>com.puppycrawl.tools.checkstyle.utils.OsSpecificUtil</class>
                 <class>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</class>
               </excludedClasses>
               <targetTests>
@@ -4842,10 +4913,6 @@
                 <param>
                   com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheckTest
                 </param>
-                <!-- 35% coverage, 29% mutation in CodePointUtil -->
-                <param>
-                  com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheckTest
-                </param>
                 <!-- 2% mutation in ScopeUtil -->
                 <param>
                   com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheckTest
@@ -4910,6 +4977,9 @@
                   com.puppycrawl.tools.checkstyle.checks.FinalParametersCheckTest
                 </param>
               </targetTests>
+              <avoidCallsTo>
+                <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
+              </avoidCallsTo>
               <excludedTestClasses>
                 <param>*.Input*</param>
               </excludedTestClasses>
@@ -4974,7 +5044,7 @@
         <dependency>
           <groupId>org.eclipse.jdt</groupId>
           <artifactId>org.eclipse.jdt.annotation</artifactId>
-          <version>2.2.700</version>
+          <version>2.3.0</version>
         </dependency>
       </dependencies>
       <build>
@@ -5044,7 +5114,14 @@
                 <param>com.puppycrawl.tools.checkstyle.xpath.*</param>
                 <param>com.puppycrawl.tools.checkstyle.XpathFileGeneratorAuditListenerTest</param>
                 <param>com.puppycrawl.tools.checkstyle.XpathFileGeneratorAstFilterTest</param>
+                <param>com.puppycrawl.tools.checkstyle.filters.*</param>
               </targetTests>
+              <avoidCallsTo>
+                <avoidCallsTo>com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil</avoidCallsTo>
+              </avoidCallsTo>
+              <features>
+                <feature>+funmodifiablecollection</feature>
+              </features>
               <excludedTestClasses>
                 <param>*.Input*</param>
               </excludedTestClasses>
diff --git a/src/it/java/com/google/checkstyle/test/base/AbstractGoogleModuleTestSupport.java b/src/it/java/com/google/checkstyle/test/base/AbstractGoogleModuleTestSupport.java
index 83bf78b4f1f..d2ba4e1b0c3 100644
--- a/src/it/java/com/google/checkstyle/test/base/AbstractGoogleModuleTestSupport.java
+++ b/src/it/java/com/google/checkstyle/test/base/AbstractGoogleModuleTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java b/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java
index 614c4f19e5f..a645b71a952 100644
--- a/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java
+++ b/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java
index 56574c009ff..18f0b58772f 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule21filename/OuterTypeFilenameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java
index 7cf939ac9ab..2d15ffe04ea 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule231filetab/FileTabCharacterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java
index 022da759ac0..4c8df34d564 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule232specialescape/IllegalTokenTextTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java
index b3a91c81bbe..e50a72f15b3 100644
--- a/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter2filebasic/rule233nonascii/AvoidEscapedUnicodeCharactersTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java
index 41dd17fee20..c9cf7873147 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule32packagestate/LineLengthTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java
index f175afadc0d..b6b813d9db8 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule331nowildcard/AvoidStarImportTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java
index 849a45bcb09..a215ea8f47c 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/NoLineWrapTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java
index 34808921e68..33c05bf04d1 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule333orderingandspacing/CustomImportOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java
index 6513572e0e4..b72a69ba282 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule341onetoplevel/OneTopLevelClassTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java
index 68898174558..1a69c1403a3 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/OverloadMethodsDeclarationOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,7 @@
 import com.google.checkstyle.test.base.AbstractGoogleModuleTestSupport;
 import com.puppycrawl.tools.checkstyle.api.Configuration;
 import com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
 public class OverloadMethodsDeclarationOrderTest extends AbstractGoogleModuleTestSupport {
 
@@ -52,4 +53,16 @@ public void testOverloadMethods() throws Exception {
         verify(checkConfig, filePath, expected, warnList);
     }
 
+    @Test
+    public void testOverloadMethodsDeclarationOrderPrivateAndStaticMethods() throws Exception {
+
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        final Configuration checkConfig = getModuleConfig("OverloadMethodsDeclarationOrder");
+        final String filePath = getPath(
+                "InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java");
+
+        verify(checkConfig, filePath, expected);
+    }
+
 }
diff --git a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java
index 34039889f20..4cf5ee96d6e 100644
--- a/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter3filestructure/rule3sourcefile/EmptyLineSeparatorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java
index 504f04502fd..f4896183daa 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule411bracesareused/NeedBracesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java
index 8ec50466459..dc400954856 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/LeftCurlyTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java
index 09b95f90bcc..b58872a5e26 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -130,4 +130,19 @@ public void testRightCurlySwitch() throws Exception {
         final Integer[] warnList = getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
     }
+
+    @Test
+    public void testRightCurlySwitchCases() throws Exception {
+        final String[] expected = {
+            "25:13: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 13),
+            "34:28: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 28),
+            "57:33: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 33),
+        };
+
+        final Configuration checkConfig = createTreeWalkerConfig(getModuleConfigsByIds(MODULES));
+        final String filePath = getPath("InputRightCurlySwitchCasesBlocks.java");
+
+        final Integer[] warnList = getLinesWithWarn(filePath);
+        verify(checkConfig, filePath, expected, warnList);
+    }
 }
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java
index 02f53beb249..2c6662319c9 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyBlockTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java
index 4bfa8a0fda0..434cd9a5dda 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule413emptyblocks/EmptyCatchBlockTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java
index eab34f87772..2c846379fb6 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule43onestatement/OneStatementPerLineTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java
index 0eafab9589d..fa64460c463 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule44columnlimit/LineLengthTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java
index 304d15475ed..0012db57e7b 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/MethodParamPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java
index 0b5d52d6840..aed66303fd8 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/OperatorWrapTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java
index fdf0505a81c..4ca8bd5a3bc 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule451wheretobreak/SeparatorWrapTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java
index db402357298..31e71dc18c1 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule461verticalwhitespace/EmptyLineSeparatorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
index 5a369793745..462e4ccd1f1 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -54,6 +54,7 @@ public void testWhitespaceAroundGenerics() throws Exception {
             "14:46: " + getCheckMessage(messages, msgPreceded, ">"),
             "15:33: " + getCheckMessage(messages, msgFollowed, "<"),
             "15:33: " + getCheckMessage(messages, msgPreceded, "<"),
+            "15:46: " + getCheckMessage(messages, msgFollowed, ">"),
             "15:46: " + getCheckMessage(messages, msgPreceded, ">"),
             "20:39: " + getCheckMessage(messages, msgFollowed, "<"),
             "20:39: " + getCheckMessage(messages, msgPreceded, "<"),
@@ -81,6 +82,7 @@ public void testGenericWhitespace() throws Exception {
             "16:24: " + getCheckMessage(messages, msgPreceded, ">"),
             "16:44: " + getCheckMessage(messages, msgFollowed, "<"),
             "16:44: " + getCheckMessage(messages, msgPreceded, "<"),
+            "16:54: " + getCheckMessage(messages, msgFollowed, ">"),
             "16:54: " + getCheckMessage(messages, msgPreceded, ">"),
             "17:14: " + getCheckMessage(messages, msgFollowed, "<"),
             "17:14: " + getCheckMessage(messages, msgPreceded, "<"),
@@ -95,6 +97,7 @@ public void testGenericWhitespace() throws Exception {
             "17:60: " + getCheckMessage(messages, msgPreceded, "<"),
             "17:70: " + getCheckMessage(messages, msgFollowed, ">"),
             "17:70: " + getCheckMessage(messages, msgPreceded, ">"),
+            "17:72: " + getCheckMessage(messages, msgFollowed, ">"),
             "17:72: " + getCheckMessage(messages, msgPreceded, ">"),
             "30:18: " + getCheckMessage(messages, msgNotPreceded, "<"),
             "30:20: " + getCheckMessage(messages, msgIllegalFollow, ">"),
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java
index 0476a578fb6..12a50f59eeb 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/MethodParamPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeCaseDefaultColonTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeCaseDefaultColonTest.java
index 04c134293c0..8f99451a218 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeCaseDefaultColonTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeCaseDefaultColonTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeTest.java
index 254d94f4ac8..6ef455675a3 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/NoWhitespaceBeforeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java
index 50f241fd2b7..f8456de7180 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/ParenPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java
index 54904778b57..f0d15d1e027 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAfterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
index eede67bf966..596d9828d8d 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
index 9775197fdd5..4c41fb98c1d 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java
index 777c5699c2c..9a7b318d71c 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/VariableDeclarationUsageDistanceTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,6 +43,7 @@ public void testArrayTypeStyle() throws Exception {
             "219:9: " + getCheckMessage(clazz, msgExt, "t", 5, 3),
             "483:9: " + getCheckMessage(clazz, msgExt, "myOption", 7, 3),
             "495:9: " + getCheckMessage(clazz, msgExt, "myOption", 6, 3),
+            "508:9: " + getCheckMessage(clazz, msgExt, "count", 4, 3),
         };
 
         final Configuration checkConfig =
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
index a93e3e9e50f..470a83e67e4 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java
index 350dd5b536a..46f208d254b 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4841indentation/IndentationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
index e89cee33826..28e418711d6 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
index bbf5760986b..c0504ef0ed9 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
index 3d050947f69..e91ac726fe4 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java
index 4b83c054247..3a05c2cee4a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
index 98452995a4c..7821b400f7a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
index 8bb5b343a4d..b31ac50c418 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java
index 953d1c2f301..e3a5c7c6e25 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule51identifiernames/CatchParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java
index bbe6d44d40d..2dc25dfc17b 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule521packagenames/PackageNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java
index af5d81b856c..e83451e47a9 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule522typenames/TypeNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java
index bde7a5443b2..31eff07410b 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule523methodnames/MethodNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java
index d6f3d5afb9d..dd40934b531 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule525nonconstantfieldnames/MemberNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/LambdaParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/LambdaParameterNameTest.java
index f8fc270b35b..5ecb5ff2c89 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/LambdaParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/LambdaParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java
index 5b0e91729b8..ece44e4c786 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/ParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/RecordComponentNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/RecordComponentNameTest.java
index 7c2772d8f49..78ea9d78f2b 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/RecordComponentNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule526parameternames/RecordComponentNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java
index ad4abba5aef..8baf3012699 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/LocalVariableNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/PatternVariableNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/PatternVariableNameTest.java
index 3d3e5cc548c..e8feb183d5c 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/PatternVariableNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/PatternVariableNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/ClassTypeParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/ClassTypeParameterNameTest.java
index 8b1b898084d..73389ad4720 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/ClassTypeParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/ClassTypeParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InterfaceTypeParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InterfaceTypeParameterNameTest.java
index d658b382871..ff9da3782f8 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InterfaceTypeParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InterfaceTypeParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/MethodTypeParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/MethodTypeParameterNameTest.java
index b33d3fe72b7..c8d84726ebc 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/MethodTypeParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/MethodTypeParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/RecordTypeParameterNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/RecordTypeParameterNameTest.java
index df6d3f7a6dd..d6e34a3c51a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/RecordTypeParameterNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/RecordTypeParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
index e47f33968ee..99f77c0b4d2 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java
index 8490c25d204..2c77b3e748a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule62donotignoreexceptions/EmptyBlockTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java
index 6f91a306b80..2745c4869e6 100644
--- a/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter6programpractice/rule64finalizers/NoFinalizerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/InvalidJavadocPositionTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/InvalidJavadocPositionTest.java
index 4d18ff3c114..731d38a7dc7 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/InvalidJavadocPositionTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/InvalidJavadocPositionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java
index 3c2f12f63a4..fa401699d3a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule711generalform/SingleLineJavadocTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java
index ed4c2fe6d9b..3b0131b3c14 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/JavadocParagraphTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/RequireEmptyLineBeforeBlockTagGroupTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/RequireEmptyLineBeforeBlockTagGroupTest.java
index b4880825322..aff67627252 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/RequireEmptyLineBeforeBlockTagGroupTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule712paragraphs/RequireEmptyLineBeforeBlockTagGroupTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/AtclauseOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/AtclauseOrderTest.java
index 398e5ecc52a..e3f6c5abfc5 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/AtclauseOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/AtclauseOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/JavadocTagContinuationIndentationTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/JavadocTagContinuationIndentationTest.java
index 5cc693a4c1a..affc1d159ab 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/JavadocTagContinuationIndentationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/JavadocTagContinuationIndentationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/NonEmptyAtclauseDescriptionTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/NonEmptyAtclauseDescriptionTest.java
index 0c071c0e925..8deb29179c2 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/NonEmptyAtclauseDescriptionTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule713atclauses/NonEmptyAtclauseDescriptionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule72thesummaryfragment/SummaryJavadocTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule72thesummaryfragment/SummaryJavadocTest.java
index b44bb4d843f..b53f21b4e0a 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule72thesummaryfragment/SummaryJavadocTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule72thesummaryfragment/SummaryJavadocTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java
index d83254e1bc1..02ed495d1e0 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/JavadocMethodTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/MissingJavadocMethodTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/MissingJavadocMethodTest.java
index 7c440a3457c..3baccd20950 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/MissingJavadocMethodTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule731selfexplanatory/MissingJavadocMethodTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule734nonrequiredjavadoc/InvalidJavadocPositionTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule734nonrequiredjavadoc/InvalidJavadocPositionTest.java
index 061b7d04dd7..dc061470195 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule734nonrequiredjavadoc/InvalidJavadocPositionTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule734nonrequiredjavadoc/InvalidJavadocPositionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule73wherejavadocrequired/MissingJavadocTypeTest.java b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule73wherejavadocrequired/MissingJavadocTypeTest.java
index 50db5cd3a04..6387720f56f 100644
--- a/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule73wherejavadocrequired/MissingJavadocTypeTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter7javadoc/rule73wherejavadocrequired/MissingJavadocTypeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/sun/checkstyle/test/base/AbstractSunModuleTestSupport.java b/src/it/java/com/sun/checkstyle/test/base/AbstractSunModuleTestSupport.java
index 3f62cd1d47e..3dbdf47fbf6 100644
--- a/src/it/java/com/sun/checkstyle/test/base/AbstractSunModuleTestSupport.java
+++ b/src/it/java/com/sun/checkstyle/test/base/AbstractSunModuleTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/sun/checkstyle/test/chapter5comments/rule52documentationcomments/InvalidJavadocPositionTest.java b/src/it/java/com/sun/checkstyle/test/chapter5comments/rule52documentationcomments/InvalidJavadocPositionTest.java
index fdaf7270dba..80bbd15f576 100644
--- a/src/it/java/com/sun/checkstyle/test/chapter5comments/rule52documentationcomments/InvalidJavadocPositionTest.java
+++ b/src/it/java/com/sun/checkstyle/test/chapter5comments/rule52documentationcomments/InvalidJavadocPositionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/MultipleVariableDeclarationsTest.java b/src/it/java/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/MultipleVariableDeclarationsTest.java
index 0ed7926eb23..b3b11ccbee8 100644
--- a/src/it/java/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/MultipleVariableDeclarationsTest.java
+++ b/src/it/java/com/sun/checkstyle/test/chapter6declarations/rule61numberperline/MultipleVariableDeclarationsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/org/checkstyle/base/AbstractCheckstyleModuleTestSupport.java b/src/it/java/org/checkstyle/base/AbstractCheckstyleModuleTestSupport.java
index 5ffa8010614..283cd3501a9 100644
--- a/src/it/java/org/checkstyle/base/AbstractCheckstyleModuleTestSupport.java
+++ b/src/it/java/org/checkstyle/base/AbstractCheckstyleModuleTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java b/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java
index c5d1eb5d628..38b1d14447a 100644
--- a/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java
+++ b/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/org/checkstyle/checks/imports/ImportOrderTest.java b/src/it/java/org/checkstyle/checks/imports/ImportOrderTest.java
index 76bd726cc96..e83e006fcd7 100644
--- a/src/it/java/org/checkstyle/checks/imports/ImportOrderTest.java
+++ b/src/it/java/org/checkstyle/checks/imports/ImportOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java b/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java
index be3e706d9e0..c9d904dade5 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,9 +25,9 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.Locale;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -56,7 +56,7 @@ public abstract class AbstractXpathTestSupport extends AbstractCheckstyleModuleT
      * The temporary folder to hold intermediate files.
      */
     @TempDir
-    public Path temporaryFolder;
+    public File temporaryFolder;
 
     /**
      * Returns name of the check.
@@ -120,9 +120,10 @@ private static void verifyXpathQueries(List<String> generatedXpathQueries,
     private String createSuppressionsXpathConfigFile(String checkName,
                                                      List<String> xpathQueries)
             throws Exception {
-        final Path suppressionsXpathConfigPath =
-                Files.createTempFile(temporaryFolder, "", "");
-        try (Writer bw = Files.newBufferedWriter(suppressionsXpathConfigPath,
+        final String uniqueFileName =
+                "suppressions_xpath_config_" + UUID.randomUUID() + ".xml";
+        final File suppressionsXpathConfigPath = new File(temporaryFolder, uniqueFileName);
+        try (Writer bw = Files.newBufferedWriter(suppressionsXpathConfigPath.toPath(),
                 StandardCharsets.UTF_8)) {
             bw.write("<?xml version=\"1.0\"?>\n");
             bw.write("<!DOCTYPE suppressions PUBLIC\n");
@@ -191,16 +192,24 @@ private static ViolationPosition extractLineAndColumnNumber(String... expectedVi
      *
      * @param moduleConfig module configuration.
      * @param fileToProcess input class file.
-     * @param expectedViolations expected violation messages.
+     * @param expectedViolation expected violation message.
      * @param expectedXpathQueries expected generated xpath queries.
      * @throws Exception if an error occurs
+     * @throws IllegalArgumentException if length of expectedViolation is more than 1
      */
     protected void runVerifications(DefaultConfiguration moduleConfig,
                                   File fileToProcess,
-                                  String[] expectedViolations,
+                                  String[] expectedViolation,
                                   List<String> expectedXpathQueries) throws Exception {
+        if (expectedViolation.length != 1) {
+            throw new IllegalArgumentException(
+                    "Expected violations should contain exactly one element."
+                            + " Multiple violations are not supported."
+            );
+        }
+
         final ViolationPosition position =
-                extractLineAndColumnNumber(expectedViolations);
+                extractLineAndColumnNumber(expectedViolation);
         final List<String> generatedXpathQueries =
                 generateXpathQueries(fileToProcess, position);
 
@@ -211,7 +220,7 @@ protected void runVerifications(DefaultConfiguration moduleConfig,
                 generatedXpathQueries));
 
         final Integer[] warnList = getLinesWithWarn(fileToProcess.getPath());
-        verify(moduleConfig, fileToProcess.getPath(), expectedViolations, warnList);
+        verify(moduleConfig, fileToProcess.getPath(), expectedViolation, warnList);
         verifyXpathQueries(generatedXpathQueries, expectedXpathQueries);
         verify(treeWalkerConfigWithXpath, fileToProcess.getPath(), CommonUtil.EMPTY_STRING_ARRAY);
     }
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbbreviationAsWordInNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbbreviationAsWordInNameTest.java
index 341faa4ae84..b1e77d45b0a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbbreviationAsWordInNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbbreviationAsWordInNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testAnnotation() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation.java"));
+                "InputXpathAbbreviationAsWordInNameAnnotation.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -52,7 +52,7 @@ public void testAnnotation() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameAnnotation']]"
                     + "/OBJBLOCK/ANNOTATION_DEF/IDENT[@text='ANNOTATION']"
         );
 
@@ -63,7 +63,7 @@ public void testAnnotation() throws Exception {
     @Test
     public void testAnnotationField() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField.java"));
+                "InputXpathAbbreviationAsWordInNameAnnotationField.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -75,7 +75,7 @@ public void testAnnotationField() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/ANNOTATION_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameAnnotationField']]"
                     + "/OBJBLOCK/ANNOTATION_FIELD_DEF/IDENT[@text='ANNOTATION_FIELD']"
         );
 
@@ -86,7 +86,7 @@ public void testAnnotationField() throws Exception {
     @Test
     public void testClass() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameClass.java"));
+                "InputXpathAbbreviationAsWordInNameClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -98,7 +98,7 @@ public void testClass() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameClass']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameClass']]"
                     + "/OBJBLOCK/CLASS_DEF/IDENT[@text='CLASS']"
         );
 
@@ -109,7 +109,7 @@ public void testClass() throws Exception {
     @Test
     public void testEnum() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameEnum.java"));
+                "InputXpathAbbreviationAsWordInNameEnum.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -121,7 +121,7 @@ public void testEnum() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameEnum']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameEnum']]"
                     + "/OBJBLOCK/ENUM_DEF/IDENT[@text='ENUMERATION']"
         );
 
@@ -132,7 +132,7 @@ public void testEnum() throws Exception {
     @Test
     public void testField() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameField.java"));
+                "InputXpathAbbreviationAsWordInNameField.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -144,7 +144,7 @@ public void testField() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameField']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameField']]"
                     + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='FIELD']"
         );
 
@@ -155,7 +155,7 @@ public void testField() throws Exception {
     @Test
     public void testInterface() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameInterface.java"));
+                "InputXpathAbbreviationAsWordInNameInterface.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -167,7 +167,7 @@ public void testInterface() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameInterface']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameInterface']]"
                     + "/OBJBLOCK/INTERFACE_DEF/IDENT[@text='INTERFACE']"
         );
 
@@ -178,7 +178,7 @@ public void testInterface() throws Exception {
     @Test
     public void testMethod() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameMethod.java"));
+                "InputXpathAbbreviationAsWordInNameMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -190,7 +190,7 @@ public void testMethod() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameMethod']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameMethod']]"
                     + "/OBJBLOCK/METHOD_DEF/IDENT[@text='METHOD']"
         );
 
@@ -201,7 +201,7 @@ public void testMethod() throws Exception {
     @Test
     public void testParameter() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameParameter.java"));
+                "InputXpathAbbreviationAsWordInNameParameter.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -213,7 +213,7 @@ public void testParameter() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameParameter']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameParameter']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
                     + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='PARAMETER']"
         );
@@ -225,7 +225,7 @@ public void testParameter() throws Exception {
     @Test
     public void testVariable() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameVariable.java"));
+                "InputXpathAbbreviationAsWordInNameVariable.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -237,7 +237,7 @@ public void testVariable() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameVariable']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameVariable']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
                     + "/SLIST/VARIABLE_DEF/IDENT[@text='VARIABLE']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbstractClassNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbstractClassNameTest.java
index 85533e76f0d..a3dad7eb76a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbstractClassNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAbstractClassNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testClassNameTop() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionAbstractClassNameTop.java"));
+                new File(getPath("InputXpathAbstractClassNameTop.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbstractClassNameCheck.class);
@@ -48,17 +48,17 @@ public void testClassNameTop() throws Exception {
         final String[] expectedViolation = {
             "3:1: " + getCheckMessage(AbstractClassNameCheck.class,
                 AbstractClassNameCheck.MSG_ILLEGAL_ABSTRACT_CLASS_NAME,
-                    "SuppressionXpathRegressionAbstractClassNameTop", "^Abstract.+$"),
+                    "InputXpathAbstractClassNameTop", "^Abstract.+$"),
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAbstractClassNameTop']]",
+                        + "[./IDENT[@text='InputXpathAbstractClassNameTop']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAbstractClassNameTop']]"
+                        + "[./IDENT[@text='InputXpathAbstractClassNameTop']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAbstractClassNameTop']]"
+                        + "[./IDENT[@text='InputXpathAbstractClassNameTop']]"
                         + "/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -69,7 +69,7 @@ public void testClassNameTop() throws Exception {
     @Test
     public void testClassNameInner() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionAbstractClassNameInner.java"));
+                new File(getPath("InputXpathAbstractClassNameInner.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbstractClassNameCheck.class);
@@ -82,13 +82,13 @@ public void testClassNameInner() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAbstractClassNameInner']]"
+                        + "[./IDENT[@text='InputXpathAbstractClassNameInner']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='MyClass']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAbstractClassNameInner']]"
+                        + "[./IDENT[@text='InputXpathAbstractClassNameInner']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='MyClass']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAbstractClassNameInner']]"
+                        + "[./IDENT[@text='InputXpathAbstractClassNameInner']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='MyClass']]/MODIFIERS/ABSTRACT"
         );
 
@@ -99,7 +99,7 @@ public void testClassNameInner() throws Exception {
     @Test
     public void testClassNameNoModifier() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionAbstractClassNameNoModifier.java"));
+                new File(getPath("InputXpathAbstractClassNameNoModifier.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbstractClassNameCheck.class);
@@ -112,13 +112,13 @@ public void testClassNameNoModifier() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAbstractClassNameNoModifier']]"
+                        + "InputXpathAbstractClassNameNoModifier']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='AbstractMyClass']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAbstractClassNameNoModifier']]"
+                        + "InputXpathAbstractClassNameNoModifier']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='AbstractMyClass']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAbstractClassNameNoModifier']]"
+                        + "InputXpathAbstractClassNameNoModifier']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='AbstractMyClass']]/LITERAL_CLASS"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationLocationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationLocationTest.java
index 8e8fbf78e16..96042a77977 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationLocationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationLocationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testClass() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationLocationClass.java"));
+                "InputXpathAnnotationLocationClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationLocationCheck.class);
@@ -52,15 +52,15 @@ public void testClass() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]",
+                        + "[./IDENT[@text='InputXpathAnnotationLocationClass']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationClass']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationClass']]/"
                         + "MODIFIERS/ANNOTATION[./IDENT[@text='ClassAnnotation']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationClass']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationClass']]/"
                         + "MODIFIERS/ANNOTATION[./IDENT[@text='ClassAnnotation']]/AT"
         );
 
@@ -71,7 +71,7 @@ public void testClass() throws Exception {
     @Test
     public void testInterface() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationLocationInterface.java"));
+                "InputXpathAnnotationLocationInterface.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationLocationCheck.class);
@@ -84,16 +84,16 @@ public void testInterface() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/INTERFACE_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegression"
-                    + "AnnotationLocationInterface']]",
+                    + "[./IDENT[@text='"
+                    + "InputXpathAnnotationLocationInterface']]",
             "/COMPILATION_UNIT/INTERFACE_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationInterface'"
+                    + "[./IDENT[@text='InputXpathAnnotationLocationInterface'"
                     + "]]/MODIFIERS",
             "/COMPILATION_UNIT/INTERFACE_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationInterface']]"
+                    + "[./IDENT[@text='InputXpathAnnotationLocationInterface']]"
                     + "/MODIFIERS/ANNOTATION[./IDENT[@text='InterfaceAnnotation']]",
             "/COMPILATION_UNIT/INTERFACE_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationInterface']]"
+                    + "[./IDENT[@text='InputXpathAnnotationLocationInterface']]"
                     + "/MODIFIERS/ANNOTATION[./IDENT[@text='InterfaceAnnotation']]/AT"
         );
 
@@ -104,7 +104,7 @@ public void testInterface() throws Exception {
     @Test
     public void testEnum() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationLocationEnum.java"));
+                "InputXpathAnnotationLocationEnum.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationLocationCheck.class);
@@ -116,16 +116,16 @@ public void testEnum() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-                "/COMPILATION_UNIT/ENUM_DEF[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationEnum']]",
+                "/COMPILATION_UNIT/ENUM_DEF[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationEnum']]",
                 "/COMPILATION_UNIT/ENUM_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationEnum']]"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationEnum']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/ENUM_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationEnum']]"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationEnum']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='EnumAnnotation']]",
                 "/COMPILATION_UNIT/ENUM_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationEnum']]"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationEnum']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='EnumAnnotation']]/AT"
         );
 
@@ -137,7 +137,7 @@ public void testEnum() throws Exception {
     @Test
     public void testMethod() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationLocationMethod.java"));
+                "InputXpathAnnotationLocationMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationLocationCheck.class);
@@ -151,17 +151,17 @@ public void testMethod() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationMethod']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationMethod']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationMethod']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/MODIFIERS/"
                         + "ANNOTATION[./IDENT[@text='MethodAnnotation']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationMethod']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationMethod']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/MODIFIERS/"
                         + "ANNOTATION[./IDENT[@text='MethodAnnotation']]/AT"
         );
@@ -174,7 +174,7 @@ public void testMethod() throws Exception {
     @Test
     public void testVariable() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationLocationVariable.java"));
+                "InputXpathAnnotationLocationVariable.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationLocationCheck.class);
@@ -188,17 +188,17 @@ public void testVariable() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationVariable']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationVariable']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationVariable']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]/MODIFIERS/"
                         + "ANNOTATION[./IDENT[@text='VariableAnnotation']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationLocationVariable']]/"
+                        + "[./IDENT[@text='InputXpathAnnotationLocationVariable']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]/MODIFIERS/"
                         + "ANNOTATION[./IDENT[@text='VariableAnnotation']]/AT"
         );
@@ -211,7 +211,7 @@ public void testVariable() throws Exception {
     @Test
     public void testConstructor() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationLocationCTOR.java"));
+                "InputXpathAnnotationLocationCTOR.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationLocationCheck.class);
@@ -224,23 +224,23 @@ public void testConstructor() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]",
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]/MODIFIERS",
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]/"
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
+                        + "[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
+                        + "[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
+                        + "[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]/"
                         + "MODIFIERS/ANNOTATION[./IDENT[@text='CTORAnnotation']]",
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegression"
-                        + "AnnotationLocationCTOR']]/"
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]/OBJBLOCK/CTOR_DEF"
+                        + "[./IDENT[@text='"
+                        + "InputXpathAnnotationLocationCTOR']]/"
                         + "MODIFIERS/ANNOTATION[./IDENT[@text='CTORAnnotation']]/AT"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationOnSameLineTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationOnSameLineTest.java
index 556b26f222b..d44229ee044 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationOnSameLineTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationOnSameLineTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     public void testOne() throws Exception {
         final File fileToProcess =
                 new File(getPath(
-                        "SuppressionXpathRegressionAnnotationOnSameLineOne.java"));
+                        "InputXpathAnnotationOnSameLineMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationOnSameLineCheck.class);
@@ -60,17 +60,17 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]/MODIFIERS"
                         + "/ANNOTATION[./IDENT[@text='Deprecated']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]/AT"
         );
@@ -83,7 +83,7 @@ public void testOne() throws Exception {
     public void testTwo() throws Exception {
         final File fileToProcess =
                 new File(getPath(
-                        "SuppressionXpathRegressionAnnotationOnSameLineTwo.java"));
+                        "InputXpathAnnotationOnSameLineField.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationOnSameLineCheck.class);
@@ -96,17 +96,17 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineField']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineField']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineField']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]/MODIFIERS"
                         + "/ANNOTATION[./IDENT[@text='Deprecated']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]"
+                        + "[./IDENT[@text='InputXpathAnnotationOnSameLineField']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]/MODIFIERS"
                         + "/ANNOTATION[./IDENT[@text='Deprecated']]/AT"
         );
@@ -119,7 +119,7 @@ public void testTwo() throws Exception {
     public void testThree() throws Exception {
         final File fileToProcess =
                 new File(getPath(
-                        "SuppressionXpathRegressionAnnotationOnSameLineThree.java"));
+                        "InputXpathAnnotationOnSameLineInterface.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationOnSameLineCheck.class);
@@ -136,15 +136,15 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/INTERFACE_DEF["
-                        + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]",
+                        + "./IDENT[@text='InputXpathAnnotationOnSameLineInterface']]",
                 "/COMPILATION_UNIT/INTERFACE_DEF["
-                        + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]"
+                        + "./IDENT[@text='InputXpathAnnotationOnSameLineInterface']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/INTERFACE_DEF["
-                        + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]"
+                        + "./IDENT[@text='InputXpathAnnotationOnSameLineInterface']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]",
                 "/COMPILATION_UNIT/INTERFACE_DEF["
-                        + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]"
+                        + "./IDENT[@text='InputXpathAnnotationOnSameLineInterface']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]/AT"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationUseStyleTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationUseStyleTest.java
index a008f1d3ca7..c6622f42498 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationUseStyleTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationUseStyleTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleOne.java"));
+                "InputXpathAnnotationUseStyleOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -54,10 +54,10 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleOne']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleOne']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleOne']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleOne']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]/AT"
         );
 
@@ -68,7 +68,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleTwo.java"));
+                "InputXpathAnnotationUseStyleTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -84,15 +84,15 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleTwo']]",
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleTwo']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleTwo']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleTwo']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleTwo']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleTwo']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleTwo']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleTwo']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]/AT"
         );
 
@@ -103,7 +103,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleThree.java"));
+                "InputXpathAnnotationUseStyleThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -118,17 +118,17 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleThree']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleThree']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleThree']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/MODIFIERS"
                         + "/ANNOTATION[./IDENT[@text='SuppressWarnings']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleThree']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/MODIFIERS"
                         + "/ANNOTATION[./IDENT[@text='SuppressWarnings']]/AT"
         );
@@ -140,7 +140,7 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleFour.java"));
+                "InputXpathAnnotationUseStyleFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -156,7 +156,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleFour']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleFour']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]"
                         + "/ANNOTATION_ARRAY_INIT/RCURLY"
         );
@@ -168,7 +168,7 @@ public void testFour() throws Exception {
     @Test
     public void testFive() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleFive.java"));
+                "InputXpathAnnotationUseStyleFive.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -185,15 +185,15 @@ public void testFive() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleFive']]",
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleFive']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleFive']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleFive']]"
                          + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleFive']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleFive']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleFive']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleFive']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]/AT"
         );
 
@@ -204,7 +204,7 @@ public void testFive() throws Exception {
     @Test
     public void testSix() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleSix.java"));
+                "InputXpathAnnotationUseStyleSix.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -221,15 +221,15 @@ public void testSix() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleSix']]",
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleSix']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleSix']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleSix']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleSix']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleSix']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleSix']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleSix']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]/AT"
         );
 
@@ -240,7 +240,7 @@ public void testSix() throws Exception {
     @Test
     public void testSeven() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleSeven.java"));
+                "InputXpathAnnotationUseStyleSeven.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -253,10 +253,10 @@ public void testSeven() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleSeven']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleSeven']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleSeven']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleSeven']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]/AT"
         );
 
@@ -267,7 +267,7 @@ public void testSeven() throws Exception {
     @Test
     public void testEight() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAnnotationUseStyleEight.java"));
+                "InputXpathAnnotationUseStyleEight.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnnotationUseStyleCheck.class);
@@ -283,7 +283,7 @@ public void testEight() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnnotationUseStyleEight']]"
+                        + "[./IDENT[@text='InputXpathAnnotationUseStyleEight']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='SuppressWarnings']]"
                         + "/ANNOTATION_ARRAY_INIT/COMMA"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnonInnerLengthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnonInnerLengthTest.java
index 73c79b4deb4..0c89c9af45c 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnonInnerLengthTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnonInnerLengthTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testDefault() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionAnonInnerLengthDefault.java"));
+            new File(getPath("InputXpathAnonInnerLengthDefault.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(AnonInnerLengthCheck.class);
@@ -52,12 +52,12 @@ public void testDefault() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionAnonInnerLengthDefault']]"
+                + "[./IDENT[@text='InputXpathAnonInnerLengthDefault']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='runnable']]"
                 + "/ASSIGN/EXPR",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionAnonInnerLengthDefault']]"
+                + "[./IDENT[@text='InputXpathAnonInnerLengthDefault']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='runnable']]"
                 + "/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='Runnable']]"
@@ -71,7 +71,7 @@ public void testDefault() throws Exception {
     public void testMaxLength() throws Exception {
         final int maxLen = 5;
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionAnonInnerLength.java"));
+                new File(getPath("InputXpathAnonInnerLength.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AnonInnerLengthCheck.class);
@@ -84,11 +84,11 @@ public void testMaxLength() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnonInnerLength']]"
+                        + "[./IDENT[@text='InputXpathAnonInnerLength']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='compare']]/SLIST"
                         + "/VARIABLE_DEF[./IDENT[@text='comp']]/ASSIGN/EXPR",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAnonInnerLength']]"
+                        + "[./IDENT[@text='InputXpathAnonInnerLength']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='compare']]/SLIST"
                         + "/VARIABLE_DEF[./IDENT[@text='comp']]/ASSIGN/EXPR"
                         + "/LITERAL_NEW[./IDENT[@text='Comparator']]"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTrailingCommaTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTrailingCommaTest.java
index cfb90ed0166..ef481fbef70 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTrailingCommaTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTrailingCommaTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionArrayTrailingCommaOne.java"));
+                new File(getPath("InputXpathArrayTrailingCommaLinear.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ArrayTrailingCommaCheck.class);
@@ -53,11 +53,11 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionArrayTrailingCommaOne']]"
+                + "[./IDENT[@text='InputXpathArrayTrailingCommaLinear']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a2']]/ASSIGN/EXPR/LITERAL_NEW"
                 + "/ARRAY_INIT/EXPR[./NUM_INT[@text='3']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionArrayTrailingCommaOne']]"
+                + "[./IDENT[@text='InputXpathArrayTrailingCommaLinear']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a2']]/ASSIGN/EXPR/LITERAL_NEW"
                 + "/ARRAY_INIT/EXPR/NUM_INT[@text='3']"
         );
@@ -69,7 +69,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionArrayTrailingCommaTwo.java"));
+                new File(getPath("InputXpathArrayTrailingCommaMatrix.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ArrayTrailingCommaCheck.class);
@@ -81,7 +81,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionArrayTrailingCommaTwo']]"
+                + "[./IDENT[@text='InputXpathArrayTrailingCommaMatrix']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='d2']]/ASSIGN/EXPR/LITERAL_NEW"
                 + "/ARRAY_INIT/ARRAY_INIT[./EXPR/NUM_INT[@text='5']]"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTypeStyleTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTypeStyleTest.java
index c458489bc76..e49232f3039 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTypeStyleTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionArrayTypeStyleTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,7 @@ protected String getCheckName() {
     @Test
     public void testVariable() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionArrayTypeStyleVariable.java"));
+                new File(getPath("InputXpathArrayTypeStyleVariable.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ArrayTypeStyleCheck.class);
@@ -49,7 +49,7 @@ public void testVariable() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionArrayTypeStyleVariable']]"
+                        + "[./IDENT[@text='InputXpathArrayTypeStyleVariable']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='strings']]/TYPE["
                         + "./IDENT[@text='String']]/ARRAY_DECLARATOR"
         );
@@ -61,7 +61,7 @@ public void testVariable() throws Exception {
     @Test
     public void testMethodDef() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionArrayTypeStyleMethodDef.java"));
+                new File(getPath("InputXpathArrayTypeStyleMethodDef.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ArrayTypeStyleCheck.class);
@@ -72,7 +72,7 @@ public void testMethodDef() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionArrayTypeStyleMethodDef']]"
+                    + "[./IDENT[@text='InputXpathArrayTypeStyleMethodDef']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getData']]/TYPE/ARRAY_DECLARATOR"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java
index b58f566f6aa..ceb996630c2 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testClassFields() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionAvoidDoubleBraceInitialization.java"));
+            getPath("InputXpathAvoidDoubleBraceInitializationClassFields.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -51,11 +51,11 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionAvoidDoubleBraceInitialization']]"
+                + "[./IDENT[@text='InputXpathAvoidDoubleBraceInitializationClassFields']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='list']]/ASSIGN/EXPR/"
                 + "LITERAL_NEW[./IDENT[@text='ArrayList']]/OBJBLOCK",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionAvoidDoubleBraceInitialization']]"
+                + "[./IDENT[@text='InputXpathAvoidDoubleBraceInitializationClassFields']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='list']]/ASSIGN/EXPR/"
                 + "LITERAL_NEW[./IDENT[@text='ArrayList']]/OBJBLOCK/LCURLY"
         );
@@ -64,9 +64,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testMethodDef() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java"));
+            getPath("InputXpathAvoidDoubleBraceInitializationMethodDef.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -76,12 +76,12 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo']]"
+                    + "'InputXpathAvoidDoubleBraceInitializationMethodDef']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='HashSet']]"
                 + "/OBJBLOCK",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo']]"
+                    + "'InputXpathAvoidDoubleBraceInitializationMethodDef']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='HashSet']]"
                 + "/OBJBLOCK/LCURLY"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java
index b8664a98f7c..56bec5bc969 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testDefault() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java"));
+            "InputXpathAvoidEscapedUnicodeCharactersDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class);
@@ -52,11 +52,11 @@ public void testDefault() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault']]"
+                + "[@text='InputXpathAvoidEscapedUnicodeCharactersDefault']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev2']]"
                 + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault']]"
+                + "[@text='InputXpathAvoidEscapedUnicodeCharactersDefault']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev2']]"
                 + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']"
         );
@@ -68,7 +68,7 @@ public void testDefault() throws Exception {
     @Test
     public void testControlCharacters() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java")
+            "InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -82,12 +82,12 @@ public void testControlCharacters() throws Exception {
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[."
                 + "/IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters']]"
+                    + "'InputXpathAvoidEscapedUnicodeCharactersControlCharacters']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                 + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]",
             "/COMPILATION_UNIT/CLASS_DEF[."
                 + "/IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters']]"
+                    + "'InputXpathAvoidEscapedUnicodeCharactersControlCharacters']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                 + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']"
         );
@@ -99,7 +99,7 @@ public void testControlCharacters() throws Exception {
     @Test
     public void testTailComment() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java"));
+            "InputXpathAvoidEscapedUnicodeCharactersTailComment.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class);
@@ -112,12 +112,12 @@ public void testTailComment() throws Exception {
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[."
                 + "/IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment']]"
+                    + "'InputXpathAvoidEscapedUnicodeCharactersTailComment']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                 + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]",
             "/COMPILATION_UNIT/CLASS_DEF[."
                 + "/IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment']]"
+                    + "'InputXpathAvoidEscapedUnicodeCharactersTailComment']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                 + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']"
         );
@@ -129,7 +129,7 @@ public void testTailComment() throws Exception {
     @Test
     public void testAllCharactersEscaped() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java"));
+            "InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class);
@@ -142,12 +142,12 @@ public void testAllCharactersEscaped() throws Exception {
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[."
                     + "/IDENT[@text="
-                        + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped']]"
+                        + "'InputXpathAvoidEscapedUnicodeCharactersAllEscaped']]"
                     + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                     + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]",
                 "/COMPILATION_UNIT/CLASS_DEF[."
                     + "/IDENT[@text="
-                        + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped']]"
+                        + "'InputXpathAvoidEscapedUnicodeCharactersAllEscaped']]"
                     + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                     + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']"
         );
@@ -159,7 +159,7 @@ public void testAllCharactersEscaped() throws Exception {
     @Test
     public void testNonPrintableCharacters() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java"));
+            "InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class);
@@ -172,12 +172,12 @@ public void testNonPrintableCharacters() throws Exception {
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[."
                 + "/IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable']]"
+                    + "'InputXpathAvoidEscapedUnicodeCharactersNonPrintable']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                 + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]",
             "/COMPILATION_UNIT/CLASS_DEF[."
                 + "/IDENT[@text="
-                    + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable']]"
+                    + "'InputXpathAvoidEscapedUnicodeCharactersNonPrintable']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]"
                 + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java
index 8a488bfc591..da04e7a6bd8 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@ protected String getCheckName() {
     @Test
     public void testInlineConditionalsVariableDef() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java"));
+                getPath("InputXpathAvoidInlineConditionalsVariableDef.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidInlineConditionalsCheck.class);
@@ -51,11 +51,11 @@ public void testInlineConditionalsVariableDef() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAvoidInlineConditionalsVariableDef']]"
+                        + "InputXpathAvoidInlineConditionalsVariableDef']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='substring']]/SLIST"
                         + "/VARIABLE_DEF[./IDENT[@text='b']]/ASSIGN/EXPR",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAvoidInlineConditionalsVariableDef']]"
+                        + "InputXpathAvoidInlineConditionalsVariableDef']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='substring']]/SLIST"
                         + "/VARIABLE_DEF[./IDENT[@text='b']]/ASSIGN/EXPR/QUESTION"
         );
@@ -67,7 +67,7 @@ public void testInlineConditionalsVariableDef() throws Exception {
     @Test
     public void testInlineConditionalsAssign() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionAvoidInlineConditionalsAssign.java"));
+                getPath("InputXpathAvoidInlineConditionalsAssign.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidInlineConditionalsCheck.class);
@@ -79,7 +79,7 @@ public void testInlineConditionalsAssign() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAvoidInlineConditionalsAssign']]"
+                        + "InputXpathAvoidInlineConditionalsAssign']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setB']]/SLIST"
                         + "/EXPR/ASSIGN[./IDENT[@text='b']]/QUESTION"
         );
@@ -91,7 +91,7 @@ public void testInlineConditionalsAssign() throws Exception {
     @Test
     public void testInlineConditionalsAssert() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionAvoidInlineConditionalsAssert.java"));
+                getPath("InputXpathAvoidInlineConditionalsAssert.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidInlineConditionalsCheck.class);
@@ -103,11 +103,11 @@ public void testInlineConditionalsAssert() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAvoidInlineConditionalsAssert']]"
+                        + "InputXpathAvoidInlineConditionalsAssert']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='assertA']]/SLIST"
                         + "/LITERAL_ASSERT/EXPR[./QUESTION/METHOD_CALL/DOT/IDENT[@text='a']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='"
-                        + "SuppressionXpathRegressionAvoidInlineConditionalsAssert']]"
+                        + "InputXpathAvoidInlineConditionalsAssert']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='assertA']]/SLIST"
                         + "/LITERAL_ASSERT/EXPR/QUESTION"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java
index 1e68266aba2..e14606d97ef 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@ protected String getCheckName() {
     @Test
     public void testEmpty() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionAvoidNestedBlocksEmpty.java"));
+                getPath("InputXpathAvoidNestedBlocksEmpty.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidNestedBlocksCheck.class);
@@ -51,7 +51,7 @@ public void testEmpty() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksEmpty']]"
+                        + "[./IDENT[@text='InputXpathAvoidNestedBlocksEmpty']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='empty']]/SLIST/SLIST"
         );
 
@@ -62,7 +62,7 @@ public void testEmpty() throws Exception {
     @Test
     public void testVariableAssignment() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionAvoidNestedBlocksVariable.java"));
+                getPath("InputXpathAvoidNestedBlocksVariable.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidNestedBlocksCheck.class);
@@ -74,7 +74,7 @@ public void testVariableAssignment() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksVariable']]"
+                        + "[./IDENT[@text='InputXpathAvoidNestedBlocksVariable']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='varAssign']]/SLIST/SLIST"
         );
 
@@ -84,8 +84,8 @@ public void testVariableAssignment() throws Exception {
 
     @Test
     public void testSwitchAllowInSwitchCaseFalse() throws Exception {
-        final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionAvoidNestedBlocksSwitch1.java"));
+        final File fileToProcess = new File(getPath(
+                "InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidNestedBlocksCheck.class);
@@ -93,21 +93,17 @@ public void testSwitchAllowInSwitchCaseFalse() throws Exception {
         final String[] expectedViolation = {
             "9:21: " + getCheckMessage(AvoidNestedBlocksCheck.class,
                     AvoidNestedBlocksCheck.MSG_KEY_BLOCK_NESTED),
-            "16:13: " + getCheckMessage(AvoidNestedBlocksCheck.class,
-                    AvoidNestedBlocksCheck.MSG_KEY_BLOCK_NESTED),
-            "20:21: " + getCheckMessage(AvoidNestedBlocksCheck.class,
-                    AvoidNestedBlocksCheck.MSG_KEY_BLOCK_NESTED),
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksSwitch1']]"
-                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH"
-                        + "/CASE_GROUP/SLIST",
+                        + "[./IDENT[@text='InputXpathAvoidNestedBlocksNotAllowedInSwitchCase"
+                        + "']]/OBJBLOCK/METHOD_DEF"
+                        + "[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksSwitch1']]"
-                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH"
-                        + "/CASE_GROUP/SLIST/SLIST"
+                        + "[./IDENT[@text='InputXpathAvoidNestedBlocksNotAllowedInSwitchCase"
+                        + "']]/OBJBLOCK/METHOD_DEF"
+                        + "[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/SLIST"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -117,28 +113,50 @@ public void testSwitchAllowInSwitchCaseFalse() throws Exception {
     @Test
     public void testSwitchAllowInSwitchCaseTrue() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionAvoidNestedBlocksSwitch2.java"));
+                getPath("InputXpathAvoidNestedBlocksAllowedInSwitchCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AvoidNestedBlocksCheck.class);
         moduleConfig.addProperty("allowInSwitchCase", "true");
 
         final String[] expectedViolation = {
-            "9:21: " + getCheckMessage(AvoidNestedBlocksCheck.class,
+            "11:13: " + getCheckMessage(AvoidNestedBlocksCheck.class,
                     AvoidNestedBlocksCheck.MSG_KEY_BLOCK_NESTED),
-            "16:13: " + getCheckMessage(AvoidNestedBlocksCheck.class,
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathAvoidNestedBlocksAllowedInSwitchCase"
+                        + "']]/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]"
+                        + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/SLIST"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testSwitchWithBreakOutside() throws Exception {
+        final File fileToProcess = new File(
+                getPath("InputXpathAvoidNestedBlocksBreakOutside.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(AvoidNestedBlocksCheck.class);
+
+        final String[] expectedViolation = {
+            "8:21: " + getCheckMessage(AvoidNestedBlocksCheck.class,
                     AvoidNestedBlocksCheck.MSG_KEY_BLOCK_NESTED),
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-                "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksSwitch2']]"
-                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH"
-                        + "/CASE_GROUP/SLIST",
-                "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksSwitch2']]"
-                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH"
-                        + "/CASE_GROUP/SLIST/SLIST"
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathAvoidNestedBlocksBreakOutside']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]"
+                        + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathAvoidNestedBlocksBreakOutside']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]"
+                        + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/SLIST"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNoArgumentSuperConstructorCallTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNoArgumentSuperConstructorCallTest.java
index 6b752793f6a..42741bf3241 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNoArgumentSuperConstructorCallTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNoArgumentSuperConstructorCallTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     @Test
     public void testDefault() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall.java"));
+            "InputXpathAvoidNoArgumentSuperConstructorCallDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CLASS);
@@ -54,9 +54,9 @@ public void testDefault() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall']]"
+                    + "[@text='InputXpathAvoidNoArgumentSuperConstructorCallDefault']]"
                     + "/OBJBLOCK/CTOR_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall']]"
+                    + "@text='InputXpathAvoidNoArgumentSuperConstructorCallDefault']]"
                     + "/SLIST/SUPER_CTOR_CALL"
         );
 
@@ -66,7 +66,7 @@ public void testDefault() throws Exception {
     @Test
     public void testInnerClass() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCallInnerClass.java"
+            "InputXpathAvoidNoArgumentSuperConstructorCallInnerClass.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -79,7 +79,7 @@ public void testInnerClass() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                + "'SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCallInnerClass']]"
+                + "'InputXpathAvoidNoArgumentSuperConstructorCallInnerClass']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/CLASS_DEF[./IDENT[@text='Inner']]"
                 + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='Inner']]"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStarImportTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStarImportTest.java
index 8a567e4d6fa..3ff7b2b80ad 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStarImportTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStarImportTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidStarImport1.java"));
+            "InputXpathAvoidStarImportOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CLASS);
@@ -62,7 +62,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidStarImport2.java"));
+            "InputXpathAvoidStarImportTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CLASS);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStaticImportTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStaticImportTest.java
index 275abbf413a..82b63e30a63 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStaticImportTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidStaticImportTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidStaticImport1.java"));
+            "InputXpathAvoidStaticImportOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CLASS);
@@ -62,7 +62,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionAvoidStaticImport2.java"));
+            "InputXpathAvoidStaticImportTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CLASS);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionBooleanExpressionComplexityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionBooleanExpressionComplexityTest.java
new file mode 100644
index 00000000000..75badfd2c7d
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionBooleanExpressionComplexityTest.java
@@ -0,0 +1,110 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.metrics.BooleanExpressionComplexityCheck;
+
+public class XpathRegressionBooleanExpressionComplexityTest
+        extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+        return BooleanExpressionComplexityCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testCatchBlock() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathBooleanExpressionComplexityCatchBlock.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(BooleanExpressionComplexityCheck.class);
+
+        final String[] expectedViolationMessages = {
+            "10:23: " + getCheckMessage(BooleanExpressionComplexityCheck.class,
+                    BooleanExpressionComplexityCheck.MSG_KEY, 11, 3),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathBooleanExpressionComplexityCatchBlock']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodOne']]/SLIST"
+                        + "/LITERAL_TRY/LITERAL_CATCH/SLIST/VARIABLE_DEF"
+                        + "[./IDENT[@text='d']]/ASSIGN"
+        );
+
+        runVerifications(moduleConfig, fileToProcess,
+                expectedViolationMessages, expectedXpathQueries);
+    }
+
+    @Test
+    public void testClassFields() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathBooleanExpressionComplexityClassFields.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(BooleanExpressionComplexityCheck.class);
+
+        final String[] expectedViolationMessages = {
+            "9:19: " + getCheckMessage(BooleanExpressionComplexityCheck.class,
+                    BooleanExpressionComplexityCheck.MSG_KEY, 11, 3),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathBooleanExpressionComplexityClassFields']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodTwo']]/SLIST/VARIABLE_DEF"
+                        + "[./IDENT[@text='d']]/ASSIGN"
+        );
+
+        runVerifications(moduleConfig, fileToProcess,
+                expectedViolationMessages, expectedXpathQueries);
+    }
+
+    @Test
+    public void testConditionals() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathBooleanExpressionComplexityConditionals.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(BooleanExpressionComplexityCheck.class);
+
+        final String[] expectedViolationMessages = {
+            "9:9: " + getCheckMessage(BooleanExpressionComplexityCheck.class,
+                    BooleanExpressionComplexityCheck.MSG_KEY, 4, 3),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathBooleanExpressionComplexityConditionals']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodThree']]/SLIST/LITERAL_IF"
+        );
+
+        runVerifications(moduleConfig, fileToProcess,
+                expectedViolationMessages, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCatchParameterNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCatchParameterNameTest.java
new file mode 100644
index 00000000000..5908fc5111b
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCatchParameterNameTest.java
@@ -0,0 +1,230 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck;
+
+public class XpathRegressionCatchParameterNameTest extends AbstractXpathTestSupport {
+    private final String checkName = CatchParameterNameCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testSimple() throws Exception {
+        final String pattern = "^(e|t|ex|[a-z][a-z][a-zA-Z]+)$";
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(CatchParameterNameCheck.class);
+
+        final File fileToProcess =
+                new File(getPath("InputXpathCatchParameterNameSimple.java"));
+
+        final String[] expectedViolation = {
+            "6:28: " + getCheckMessage(CatchParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "e1", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathCatchParameterNameSimple']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                + "/SLIST/LITERAL_TRY/LITERAL_CATCH/PARAMETER_DEF/IDENT[@text='e1']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testNested() throws Exception {
+        final String pattern = "^(e|t|ex|[a-z][a-z][a-zA-Z]+)$";
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(CatchParameterNameCheck.class);
+
+        final File fileToProcess =
+                new File(getPath("InputXpathCatchParameterNameNested.java"));
+
+        final String[] expectedViolation = {
+            "9:40: " + getCheckMessage(CatchParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "i", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathCatchParameterNameNested']]"
+                + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='NestedClass']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                + "/SLIST/LITERAL_IF/SLIST"
+                + "/LITERAL_TRY/SLIST/LITERAL_TRY/LITERAL_CATCH/PARAMETER_DEF/IDENT[@text='i']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testStaticInit() throws Exception {
+        final String pattern = "^[a-z][a-zA-Z0-9]+$";
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(CatchParameterNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+
+        final File fileToProcess =
+                new File(getPath("InputXpathCatchParameterNameStaticInit.java"));
+
+        final String[] expectedViolation = {
+            "7:32: " + getCheckMessage(CatchParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "Ex", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathCatchParameterNameStaticInit']]"
+                + "/OBJBLOCK/STATIC_INIT/SLIST"
+                + "/LITERAL_DO/SLIST/LITERAL_TRY/LITERAL_CATCH/PARAMETER_DEF/IDENT[@text='Ex']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testAnonymous() throws Exception {
+        final String pattern = "^[a-z][a-zA-Z0-9]+$";
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(CatchParameterNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+
+        final File fileToProcess =
+                new File(getPath("InputXpathCatchParameterNameAnonymous.java"));
+
+        final String[] expectedViolation = {
+            "12:40: " + getCheckMessage(CatchParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "E1", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathCatchParameterNameAnonymous']]"
+                + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]"
+                + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='InnerClass']]"
+                + "/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='Runnable']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='run']]"
+                + "/SLIST/LITERAL_TRY/LITERAL_CATCH/PARAMETER_DEF/IDENT[@text='E1']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testLambda() throws Exception {
+        final String pattern = "^[A-Z][a-z]+$";
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(CatchParameterNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+
+        final File fileToProcess =
+                new File(getPath("InputXpathCatchParameterNameLambda.java"));
+
+        final String[] expectedViolation = {
+            "12:32: " + getCheckMessage(CatchParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "e", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathCatchParameterNameLambda']]"
+                + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='lambdaFunction']]"
+                + "/ASSIGN/LAMBDA[./IDENT[@text='a']]"
+                + "/SLIST/LITERAL_FOR/SLIST/LITERAL_TRY/LITERAL_CATCH"
+                + "/PARAMETER_DEF/IDENT[@text='e']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testEnum() throws Exception {
+        final String pattern = "^[A-Z][a-z]+$";
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(CatchParameterNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+
+        final File fileToProcess =
+                new File(getPath("InputXpathCatchParameterNameEnum.java"));
+
+        final String[] expectedViolation = {
+            "10:40: " + getCheckMessage(CatchParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "eX", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/ENUM_DEF"
+                + "[./IDENT[@text='InputXpathCatchParameterNameEnum']]"
+                + "/OBJBLOCK/ENUM_CONSTANT_DEF[./IDENT[@text='VALUE']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/LITERAL_TRY/LITERAL_CATCH/"
+                + "PARAMETER_DEF/IDENT[@text='eX']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testInterface() throws Exception {
+        final String pattern = "^[A-Z][a-z]+$";
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(CatchParameterNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+
+        final File fileToProcess =
+                new File(getPath("InputXpathCatchParameterNameInterface.java"));
+
+        final String[] expectedViolation = {
+            "7:32: " + getCheckMessage(CatchParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "EX", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/INTERFACE_DEF"
+                + "[./IDENT[@text='InputXpathCatchParameterNameInterface']]"
+                + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='InnerInterface']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                + "/SLIST/LITERAL_TRY/LITERAL_CATCH/PARAMETER_DEF/IDENT[@text='EX']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionClassMemberImpliedModifierTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionClassMemberImpliedModifierTest.java
index d4a45d223f0..a4885bac3ca 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionClassMemberImpliedModifierTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionClassMemberImpliedModifierTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testInterface() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionClassMemberImpliedModifierOne.java"));
+                new File(getPath("InputXpathClassMemberImpliedModifierInterface.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ClassMemberImpliedModifierCheck.class);
@@ -52,13 +52,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionClassMemberImpliedModifierOne']]"
+                        + "@text='InputXpathClassMemberImpliedModifierInterface']]"
                         + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Foo']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionClassMemberImpliedModifierOne']]"
+                        + "@text='InputXpathClassMemberImpliedModifierInterface']]"
                         + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Foo']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionClassMemberImpliedModifierOne']]"
+                        + "@text='InputXpathClassMemberImpliedModifierInterface']]"
                         + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Foo']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -67,9 +67,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testEnum() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionClassMemberImpliedModifierTwo.java"));
+                new File(getPath("InputXpathClassMemberImpliedModifierEnum.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ClassMemberImpliedModifierCheck.class);
@@ -81,13 +81,13 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionClassMemberImpliedModifierTwo']]"
+                    + "[./IDENT[@text='InputXpathClassMemberImpliedModifierEnum']]"
                     + "/OBJBLOCK/ENUM_DEF[./IDENT[@text='Count']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionClassMemberImpliedModifierTwo']]"
+                    + "[./IDENT[@text='InputXpathClassMemberImpliedModifierEnum']]"
                     + "/OBJBLOCK/ENUM_DEF[./IDENT[@text='Count']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionClassMemberImpliedModifierTwo']]"
+                    + "[./IDENT[@text='InputXpathClassMemberImpliedModifierEnum']]"
                     + "/OBJBLOCK/ENUM_DEF[./IDENT[@text='Count']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCommentsIndentationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCommentsIndentationTest.java
index 3ea2c23d246..8431f8641d5 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCommentsIndentationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCommentsIndentationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,8 +40,7 @@ protected String getCheckName() {
     @Test
     public void testSingleLine() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "SingleLine.java"));
+                new File(getPath("InputXpathCommentsIndentationSingleLine.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -53,7 +52,7 @@ public void testSingleLine() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationSingleLine']]"
+                + "[@text='InputXpathCommentsIndentationSingleLine']]"
                 + "/OBJBLOCK/SINGLE_LINE_COMMENT[./COMMENT_CONTENT[@text=' Comment // warn\\n']]"
         );
 
@@ -64,8 +63,7 @@ public void testSingleLine() throws Exception {
     @Test
     public void testBlock() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "Block.java"));
+                new File(getPath("InputXpathCommentsIndentationBlock.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -77,7 +75,7 @@ public void testBlock() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationBlock']]/OBJBLOCK/"
+                + "[@text='InputXpathCommentsIndentationBlock']]/OBJBLOCK/"
                 + "VARIABLE_DEF[./IDENT[@text='f']]/TYPE/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT"
                 + "[@text=' // warn\\n           * Javadoc comment\\n           ']]"
         );
@@ -89,8 +87,7 @@ public void testBlock() throws Exception {
     @Test
     public void testSeparator() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "Separator.java"));
+                new File(getPath("InputXpathCommentsIndentationSeparator.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -102,7 +99,7 @@ public void testSeparator() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationSeparator']]"
+                + "[@text='InputXpathCommentsIndentationSeparator']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/MODIFIERS/SINGLE_LINE_COMMENT"
                 + "[./COMMENT_CONTENT[@text='///////////// Comment separator // warn\\n']]"
         );
@@ -114,8 +111,7 @@ public void testSeparator() throws Exception {
     @Test
     public void testDistributedStatement() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "DistributedStatement.java"));
+                new File(getPath("InputXpathCommentsIndentationDistributedStatement.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -127,7 +123,7 @@ public void testDistributedStatement() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationDistributedStatement']]"
+                + "[@text='InputXpathCommentsIndentationDistributedStatement']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/SLIST/SINGLE_LINE_COMMENT"
                 + "[./COMMENT_CONTENT[@text=' Comment // warn\\n']]"
         );
@@ -139,8 +135,7 @@ public void testDistributedStatement() throws Exception {
     @Test
     public void testSingleLineBlock() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "SingleLineBlock.java"));
+                new File(getPath("InputXpathCommentsIndentationSingleLineBlock.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -152,7 +147,7 @@ public void testSingleLineBlock() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationSingleLineBlock']]"
+                + "[@text='InputXpathCommentsIndentationSingleLineBlock']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/SLIST/SINGLE_LINE_COMMENT"
                 + "[./COMMENT_CONTENT[@text=' block Comment // warn\\n']]"
         );
@@ -164,8 +159,7 @@ public void testSingleLineBlock() throws Exception {
     @Test
     public void testNonEmptyCase() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "NonEmptyCase.java"));
+                new File(getPath("InputXpathCommentsIndentationNonEmptyCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -177,7 +171,7 @@ public void testNonEmptyCase() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationNonEmptyCase']]"
+                + "[@text='InputXpathCommentsIndentationNonEmptyCase']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/SLIST/LITERAL_SWITCH/"
                 + "CASE_GROUP/SINGLE_LINE_COMMENT[./COMMENT_CONTENT[@text=' Comment // warn\\n']]"
         );
@@ -189,8 +183,7 @@ public void testNonEmptyCase() throws Exception {
     @Test
     public void testEmptyCase() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "EmptyCase.java"));
+                new File(getPath("InputXpathCommentsIndentationEmptyCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -202,7 +195,7 @@ public void testEmptyCase() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationEmptyCase']]"
+                + "[@text='InputXpathCommentsIndentationEmptyCase']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/SLIST/LITERAL_SWITCH/"
                 + "CASE_GROUP/SINGLE_LINE_COMMENT[./COMMENT_CONTENT[@text=' Comment // warn\\n']]"
         );
@@ -214,8 +207,7 @@ public void testEmptyCase() throws Exception {
     @Test
     public void testWithinBlockStatement() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCommentsIndentation"
-                                        + "WithinBlockStatement.java"));
+                new File(getPath("InputXpathCommentsIndentationWithinBlockStatement.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CommentsIndentationCheck.class);
@@ -227,7 +219,7 @@ public void testWithinBlockStatement() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionCommentsIndentationWithinBlockStatement']]"
+                + "[@text='InputXpathCommentsIndentationWithinBlockStatement']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF"
                 + "[./IDENT[@text='s']]/ASSIGN/EXPR/PLUS[./STRING_LITERAL[@text='O']]"
                 + "/SINGLE_LINE_COMMENT[./COMMENT_CONTENT[@text=' Comment // warn\\n']]"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionConstantNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionConstantNameTest.java
index 8e2009add36..01db1dafd08 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionConstantNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionConstantNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,7 @@ protected String getCheckName() {
     @Test
     public void testLowercase() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionConstantNameLowercase.java"));
+            getPath("InputXpathConstantNameLowercase.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
 
@@ -54,7 +54,7 @@ public void testLowercase() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionConstantNameLowercase']]"
+                + "[@text='InputXpathConstantNameLowercase']]"
                 + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='number']"
         );
 
@@ -65,7 +65,7 @@ public void testLowercase() throws Exception {
     @Test
     public void testCamelCase() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionConstantNameCamelCase.java"));
+            new File(getPath("InputXpathConstantNameCamelCase.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
 
@@ -76,7 +76,7 @@ public void testCamelCase() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionConstantNameCamelCase']]"
+                + "[./IDENT[@text='InputXpathConstantNameCamelCase']]"
                 + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='badConstant']"
         );
 
@@ -87,7 +87,7 @@ public void testCamelCase() throws Exception {
     @Test
     public void testWithBeginningUnderscore() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionConstantNameWithBeginningUnderscore.java"));
+            getPath("InputXpathConstantNameWithBeginningUnderscore.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
 
@@ -97,7 +97,7 @@ public void testWithBeginningUnderscore() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionConstantNameWithBeginningUnderscore']]"
+                + "[@text='InputXpathConstantNameWithBeginningUnderscore']]"
                 + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='_CONSTANT']"
         );
 
@@ -108,7 +108,7 @@ public void testWithBeginningUnderscore() throws Exception {
     @Test
     public void testWithTwoUnderscores() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionConstantNameWithTwoUnderscores.java"));
+            getPath("InputXpathConstantNameWithTwoUnderscores.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
 
@@ -118,7 +118,7 @@ public void testWithTwoUnderscores() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionConstantNameWithTwoUnderscores']]"
+                + "[@text='InputXpathConstantNameWithTwoUnderscores']]"
                 + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='BAD__NAME']"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionConstructorsDeclarationGroupingTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionConstructorsDeclarationGroupingTest.java
new file mode 100644
index 00000000000..6d054d2388c
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionConstructorsDeclarationGroupingTest.java
@@ -0,0 +1,138 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.ConstructorsDeclarationGroupingCheck;
+
+public class XpathRegressionConstructorsDeclarationGroupingTest extends AbstractXpathTestSupport {
+
+    private final Class<ConstructorsDeclarationGroupingCheck> clazz =
+            ConstructorsDeclarationGroupingCheck.class;
+
+    @Override
+    protected String getCheckName() {
+        return clazz.getSimpleName();
+    }
+
+    @Test
+    public void testClass() throws Exception {
+        final File fileToProcess = new File(
+                getPath("InputXpathConstructorsDeclarationGroupingClass.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
+
+        final String[] expectedViolation = {
+            "10:5: " + getCheckMessage(clazz,
+                    ConstructorsDeclarationGroupingCheck.MSG_KEY, 6),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingClass']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingClass']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingClass']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingClass']]"
+                        + "/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingClass']]"
+                        + "/OBJBLOCK/CTOR_DEF/IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingClass']"
+
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testEnum() throws Exception {
+        final File fileToProcess = new File(
+                getPath("InputXpathConstructorsDeclarationGroupingEnum.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
+
+        final String[] expectedViolation = {
+            "12:5: " + getCheckMessage(clazz,
+                    ConstructorsDeclarationGroupingCheck.MSG_KEY, 8),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/ENUM_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingEnum']]"
+                        + "/OBJBLOCK/CTOR_DEF"
+                        + "[./IDENT[@text='InputXpathConstructorsDeclarationGroupingEnum']]",
+
+                "/COMPILATION_UNIT/ENUM_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingEnum']]"
+                        + "/OBJBLOCK/CTOR_DEF"
+                        + "[./IDENT[@text='InputXpathConstructorsDeclarationGroupingEnum']]"
+                        + "/MODIFIERS",
+
+                "/COMPILATION_UNIT/ENUM_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingEnum']]"
+                        + "/OBJBLOCK/CTOR_DEF/IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingEnum']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testRecords() throws Exception {
+        final File fileToProcess = new File(
+                getNonCompilablePath("InputXpathConstructorsDeclarationGroupingRecords.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
+
+        final String[] expectedViolation = {
+            "14:5: " + getCheckMessage(clazz,
+                    ConstructorsDeclarationGroupingCheck.MSG_KEY, 8),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingRecords']]"
+                        + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]"
+                        + "/OBJBLOCK/COMPACT_CTOR_DEF[./IDENT[@text='MyRecord']]",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingRecords']]"
+                        + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]"
+                        + "/OBJBLOCK/COMPACT_CTOR_DEF[./IDENT[@text='MyRecord']]/MODIFIERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathConstructorsDeclarationGroupingRecords']]"
+                        + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]"
+                        + "/OBJBLOCK/COMPACT_CTOR_DEF[./IDENT[@text='MyRecord']]"
+                        + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCovariantEqualsTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCovariantEqualsTest.java
index 21e30330219..2029104a0b7 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCovariantEqualsTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCovariantEqualsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testCovariantEqualsInClass() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCovariantEqualsInClass.java"));
+                new File(getPath("InputXpathCovariantEqualsInClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CovariantEqualsCheck.class);
@@ -52,7 +52,7 @@ public void testCovariantEqualsInClass() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionCovariantEqualsInClass']]"
+                + "[./IDENT[@text='InputXpathCovariantEqualsInClass']]"
                 + "/OBJBLOCK/METHOD_DEF/IDENT[@text='equals']"
         );
 
@@ -63,7 +63,7 @@ public void testCovariantEqualsInClass() throws Exception {
     @Test
     public void testCovariantEqualsInEnum() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCovariantEqualsInEnum.java"));
+                new File(getPath("InputXpathCovariantEqualsInEnum.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CovariantEqualsCheck.class);
@@ -75,7 +75,7 @@ public void testCovariantEqualsInEnum() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/ENUM_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionCovariantEqualsInEnum']]"
+                + "[./IDENT[@text='InputXpathCovariantEqualsInEnum']]"
                         + "/OBJBLOCK/METHOD_DEF/IDENT[@text='equals']");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -86,7 +86,7 @@ public void testCovariantEqualsInEnum() throws Exception {
     public void testCovariantEqualsInRecord() throws Exception {
         final File fileToProcess =
                 new File(getNonCompilablePath(
-                        "SuppressionXpathRegressionCovariantEqualsInRecord.java"));
+                        "InputXpathCovariantEqualsInRecord.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CovariantEqualsCheck.class);
@@ -98,7 +98,7 @@ public void testCovariantEqualsInRecord() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/RECORD_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionCovariantEqualsInRecord']]"
+                + "[./IDENT[@text='InputXpathCovariantEqualsInRecord']]"
                         + "/OBJBLOCK/METHOD_DEF/IDENT[@text='equals']");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCustomImportOrderTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCustomImportOrderTest.java
index cc7ddc77497..24f8b28bd79 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCustomImportOrderTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCustomImportOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCustomImportOrderOne.java"));
+                new File(getPath("InputXpathCustomImportOrderOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CustomImportOrderCheck.class);
@@ -64,7 +64,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCustomImportOrderTwo.java"));
+                new File(getPath("InputXpathCustomImportOrderTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CustomImportOrderCheck.class);
@@ -86,7 +86,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCustomImportOrderThree.java"));
+                new File(getPath("InputXpathCustomImportOrderThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CustomImportOrderCheck.class);
@@ -108,7 +108,7 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCustomImportOrderFour.java"));
+                new File(getPath("InputXpathCustomImportOrderFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CustomImportOrderCheck.class);
@@ -131,7 +131,7 @@ public void testFour() throws Exception {
     @Test
     public void testFive() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCustomImportOrderFive.java"));
+                new File(getPath("InputXpathCustomImportOrderFive.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CustomImportOrderCheck.class);
@@ -154,7 +154,7 @@ public void testFive() throws Exception {
     @Test
     public void testSix() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCustomImportOrderSix.java"));
+                new File(getPath("InputXpathCustomImportOrderSix.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CustomImportOrderCheck.class);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCyclomaticComplexityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCyclomaticComplexityTest.java
index 164c8bf8cb0..185ec51f9fd 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCyclomaticComplexityTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionCyclomaticComplexityTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,10 +38,10 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testConditionals() throws Exception {
 
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCyclomaticComplexityOne.java"));
+                new File(getPath("InputXpathCyclomaticComplexityConditionals.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CyclomaticComplexityCheck.class);
@@ -54,13 +54,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionCyclomaticComplexityOne']]"
+                + "[./IDENT[@text='InputXpathCyclomaticComplexityConditionals']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionCyclomaticComplexityOne']]"
+                + "[./IDENT[@text='InputXpathCyclomaticComplexityConditionals']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionCyclomaticComplexityOne']]"
+                + "[./IDENT[@text='InputXpathCyclomaticComplexityConditionals']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS/LITERAL_PUBLIC"
                 );
 
@@ -69,9 +69,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testSwitchBlock() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionCyclomaticComplexityTwo.java"));
+                new File(getPath("InputXpathCyclomaticComplexitySwitchBlock.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(CyclomaticComplexityCheck.class);
@@ -84,13 +84,13 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionCyclomaticComplexityTwo']]"
+                    + "[./IDENT[@text='InputXpathCyclomaticComplexitySwitchBlock']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo2']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionCyclomaticComplexityTwo']]"
+                    + "[./IDENT[@text='InputXpathCyclomaticComplexitySwitchBlock']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo2']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionCyclomaticComplexityTwo']]"
+                    + "[./IDENT[@text='InputXpathCyclomaticComplexitySwitchBlock']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo2']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDeclarationOrderTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDeclarationOrderTest.java
index f82e1149182..a6ee5c07cd0 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDeclarationOrderTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDeclarationOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testNonStatic() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionDeclarationOrderOne.java"));
+                new File(getPath("InputXpathDeclarationOrderNonStatic.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(DeclarationOrderCheck.class);
@@ -52,13 +52,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionDeclarationOrderOne']]"
+                        + "[./IDENT[@text='InputXpathDeclarationOrderNonStatic']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='name']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionDeclarationOrderOne']]"
+                        + "[./IDENT[@text='InputXpathDeclarationOrderNonStatic']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='name']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionDeclarationOrderOne']]"
+                        + "[./IDENT[@text='InputXpathDeclarationOrderNonStatic']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='name']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -67,9 +67,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testStatic() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionDeclarationOrderTwo.java"));
+                new File(getPath("InputXpathDeclarationOrderStatic.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(DeclarationOrderCheck.class);
@@ -81,13 +81,13 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionDeclarationOrderTwo']]"
+                        + "[./IDENT[@text='InputXpathDeclarationOrderStatic']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='MAX']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionDeclarationOrderTwo']]"
+                        + "[./IDENT[@text='InputXpathDeclarationOrderStatic']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='MAX']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionDeclarationOrderTwo']]"
+                        + "[./IDENT[@text='InputXpathDeclarationOrderStatic']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='MAX']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDefaultComesLastTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDefaultComesLastTest.java
index 3a52491eb56..0891f104119 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDefaultComesLastTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionDefaultComesLastTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testNonEmptyCase() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionDefaultComesLastOne.java"));
+                new File(getPath("InputXpathDefaultComesLastNonEmptyCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(DefaultComesLastCheck.class);
@@ -53,11 +53,11 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionDefaultComesLastOne']]/OBJBLOCK"
+                + "[@text='InputXpathDefaultComesLastNonEmptyCase']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/CASE_GROUP["
                 + "./SLIST/EXPR/ASSIGN/IDENT[@text='id']]",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionDefaultComesLastOne']]/OBJBLOCK"
+                + "[@text='InputXpathDefaultComesLastNonEmptyCase']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/CASE_GROUP"
                 + "/LITERAL_DEFAULT"
         );
@@ -67,9 +67,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testEmptyCase() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionDefaultComesLastTwo.java"));
+                new File(getPath("InputXpathDefaultComesLastEmptyCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(DefaultComesLastCheck.class);
@@ -82,7 +82,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionDefaultComesLastTwo']]/OBJBLOCK"
+                + "[@text='InputXpathDefaultComesLastEmptyCase']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/CASE_GROUP"
                 + "/LITERAL_DEFAULT"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyBlockTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyBlockTest.java
index 1c95b4622b9..2cd42ebaf2c 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyBlockTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyBlockTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@ protected String getCheckName() {
     @Test
     public void testEmptyForLoopEmptyBlock() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionEmptyBlockEmpty.java"));
+                new File(getPath("InputXpathEmptyBlockEmpty.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyBlockCheck.class);
         moduleConfig.addProperty("option", "TEXT");
@@ -49,7 +49,7 @@ public void testEmptyForLoopEmptyBlock() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                    + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyBlockEmpty']]"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathEmptyBlockEmpty']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='emptyLoop']]"
                     + "/SLIST/LITERAL_FOR/SLIST"
         );
@@ -60,7 +60,7 @@ public void testEmptyForLoopEmptyBlock() throws Exception {
     @Test
     public void testEmptyForLoopEmptyStatement() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionEmptyBlockEmpty.java"));
+                new File(getPath("InputXpathEmptyBlockEmpty.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyBlockCheck.class);
         final String[] expectedViolation = {
@@ -69,7 +69,7 @@ public void testEmptyForLoopEmptyStatement() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                        + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyBlockEmpty']]"
+                        + "/CLASS_DEF[./IDENT[@text='InputXpathEmptyBlockEmpty']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='emptyLoop']]"
                         + "/SLIST/LITERAL_FOR/SLIST"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyCatchBlockTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyCatchBlockTest.java
index e26bc3190c2..6b08ddc02b0 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyCatchBlockTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyCatchBlockTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionEmptyCatchBlock1.java"));
+            getPath("InputXpathEmptyCatchBlockOne.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -51,7 +51,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionEmptyCatchBlock1']]"
+                + "[./IDENT[@text='InputXpathEmptyCatchBlockOne']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]"
                 + "/SLIST/LITERAL_TRY/LITERAL_CATCH/SLIST"
         );
@@ -62,7 +62,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionEmptyCatchBlock2.java"));
+            getPath("InputXpathEmptyCatchBlockTwo.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -72,7 +72,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionEmptyCatchBlock2']]"
+                + "[./IDENT[@text='InputXpathEmptyCatchBlockTwo']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]"
                 + "/SLIST/LITERAL_TRY/LITERAL_CATCH/SLIST"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForInitializerPadTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForInitializerPadTest.java
index e04ef88d854..6806f0f2eb6 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForInitializerPadTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForInitializerPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testPreceded() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionEmptyForInitializerPadPreceded.java"));
+                getPath("InputXpathEmptyForInitializerPadPreceded.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyForInitializerPadCheck.class);
@@ -53,10 +53,10 @@ public void testPreceded() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionEmptyForInitializerPadPreceded']]"
+                    + "[./IDENT[@text='InputXpathEmptyForInitializerPadPreceded']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/FOR_INIT",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionEmptyForInitializerPadPreceded']]"
+                    + "[./IDENT[@text='InputXpathEmptyForInitializerPadPreceded']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/SEMI[1]"
         );
 
@@ -67,7 +67,7 @@ public void testPreceded() throws Exception {
     @Test
     public void testNotPreceded() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionEmptyForInitializerPadNotPreceded.java"));
+            getPath("InputXpathEmptyForInitializerPadNotPreceded.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyForInitializerPadCheck.class);
@@ -80,10 +80,10 @@ public void testNotPreceded() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionEmptyForInitializerPadNotPreceded']]"
+                + "@text='InputXpathEmptyForInitializerPadNotPreceded']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/FOR_INIT",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionEmptyForInitializerPadNotPreceded']]"
+                + "@text='InputXpathEmptyForInitializerPadNotPreceded']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/SEMI[1]"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForIteratorPadTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForIteratorPadTest.java
index 99b4048c89b..0e22571d42c 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForIteratorPadTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyForIteratorPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionEmptyForIteratorPadFollowed.java"));
+                new File(getPath("InputXpathEmptyForIteratorPadFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyForIteratorPadCheck.class);
@@ -53,10 +53,10 @@ public void testFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionEmptyForIteratorPadFollowed']]/OBJBLOCK"
+                + "@text='InputXpathEmptyForIteratorPadFollowed']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/FOR_ITERATOR",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionEmptyForIteratorPadFollowed']]/OBJBLOCK"
+                + "@text='InputXpathEmptyForIteratorPadFollowed']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/RPAREN"
         );
 
@@ -67,7 +67,7 @@ public void testFollowed() throws Exception {
     @Test
     public void testNotFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionEmptyForIteratorPadNotFollowed.java"));
+                new File(getPath("InputXpathEmptyForIteratorPadNotFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyForIteratorPadCheck.class);
@@ -80,10 +80,10 @@ public void testNotFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionEmptyForIteratorPadNotFollowed']]/OBJBLOCK"
+                + "@text='InputXpathEmptyForIteratorPadNotFollowed']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/FOR_ITERATOR",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionEmptyForIteratorPadNotFollowed']]/OBJBLOCK"
+                + "@text='InputXpathEmptyForIteratorPadNotFollowed']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_FOR/RPAREN"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java
index ea4e149f93a..52c1d88a4f6 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionEmptyLineSeparator1.java")
+                getPath("InputXpathEmptyLineSeparatorOne.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -61,7 +61,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionEmptyLineSeparator2.java")
+                getPath("InputXpathEmptyLineSeparatorTwo.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -83,7 +83,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionEmptyLineSeparator3.java")
+                getPath("InputXpathEmptyLineSeparatorThree.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -97,16 +97,16 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator3']]"
+                        + "[./IDENT[@text='InputXpathEmptyLineSeparatorThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator3']]"
+                        + "[./IDENT[@text='InputXpathEmptyLineSeparatorThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]"
                         + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator3']]"
+                        + "[./IDENT[@text='InputXpathEmptyLineSeparatorThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]"
                         + "/MODIFIERS/LITERAL_PUBLIC"
         );
@@ -117,7 +117,7 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionEmptyLineSeparator4.java")
+                getPath("InputXpathEmptyLineSeparatorFour.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -131,7 +131,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator4']]"
+                        + "[./IDENT[@text='InputXpathEmptyLineSeparatorFour']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/SLIST/RCURLY"
         );
 
@@ -141,7 +141,7 @@ public void testFour() throws Exception {
     @Test
     public void testFive() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionEmptyLineSeparator5.java")
+                getPath("InputXpathEmptyLineSeparatorFive.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -156,7 +156,7 @@ public void testFive() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator5']]"
+                        + "[./IDENT[@text='InputXpathEmptyLineSeparatorFive']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/SLIST/LITERAL_TRY/SLIST"
                         + "/SINGLE_LINE_COMMENT/COMMENT_CONTENT[@text=' warn\\n']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyStatementTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyStatementTest.java
index 593ede78668..9f4d38731cb 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyStatementTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyStatementTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testForLoopEmptyStatement() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionEmptyStatement1.java"));
+                new File(getPath("InputXpathEmptyStatementLoops.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyStatementCheck.class);
         final String[] expectedViolation = {
@@ -48,7 +48,7 @@ public void testForLoopEmptyStatement() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                        + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyStatement1']]"
+                        + "/CLASS_DEF[./IDENT[@text='InputXpathEmptyStatementLoops']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                         + "/SLIST/LITERAL_FOR/EMPTY_STAT"
         );
@@ -59,7 +59,7 @@ public void testForLoopEmptyStatement() throws Exception {
     @Test
     public void testIfBlockEmptyStatement() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionEmptyStatement2.java"));
+                new File(getPath("InputXpathEmptyStatementConditionals.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(EmptyStatementCheck.class);
         final String[] expectedViolation = {
@@ -67,7 +67,7 @@ public void testIfBlockEmptyStatement() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                        + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyStatement2']]"
+                        + "/CLASS_DEF[./IDENT[@text='InputXpathEmptyStatementConditionals']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                         + "/SLIST/LITERAL_IF/EMPTY_STAT"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java
index 38ce994e931..6417509dde8 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testEquals() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionEqualsAvoidNull.java"));
+            getPath("InputXpathEqualsAvoidNull.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -51,10 +51,10 @@ public void testEquals() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionEqualsAvoidNull']]"
+                        + "[@text='InputXpathEqualsAvoidNull']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionEqualsAvoidNull']]"
+                        + "[@text='InputXpathEqualsAvoidNull']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR/METHOD_CALL");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
@@ -63,7 +63,7 @@ public void testEquals() throws Exception {
     @Test
     public void testEqualsIgnoreCase() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java"));
+            getPath("InputXpathEqualsAvoidNullIgnoreCase.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -74,10 +74,10 @@ public void testEqualsIgnoreCase() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionEqualsAvoidNullIgnoreCase']]"
+                        + "[@text='InputXpathEqualsAvoidNullIgnoreCase']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionEqualsAvoidNullIgnoreCase']]"
+                        + "[@text='InputXpathEqualsAvoidNullIgnoreCase']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR/METHOD_CALL");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsHashCodeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsHashCodeTest.java
new file mode 100644
index 00000000000..c7def594c13
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsHashCodeTest.java
@@ -0,0 +1,121 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck;
+
+public class XpathRegressionEqualsHashCodeTest extends AbstractXpathTestSupport {
+    @Override
+    protected String getCheckName() {
+        return EqualsHashCodeCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testEqualsOnly() throws Exception {
+        final File fileToProcess = new File(
+            getPath("InputXpathEqualsHashCodeEqualsOnly.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(EqualsHashCodeCheck.class);
+
+        final String[] expectedViolation = {
+            "4:5: " + getCheckMessage(EqualsHashCodeCheck.class,
+                    EqualsHashCodeCheck.MSG_KEY_HASHCODE),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeEqualsOnly']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeEqualsOnly']]/OBJBLOCK/"
+                        + "METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeEqualsOnly']]/OBJBLOCK/"
+                        + "METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testHashCodeOnly() throws Exception {
+        final File fileToProcess = new File(
+            getPath("InputXpathEqualsHashCodeHashCodeOnly.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(EqualsHashCodeCheck.class);
+
+        final String[] expectedViolation = {
+            "4:5: " + getCheckMessage(EqualsHashCodeCheck.class,
+                    EqualsHashCodeCheck.MSG_KEY_EQUALS),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeHashCodeOnly']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='hashCode']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeHashCodeOnly']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='hashCode']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeHashCodeOnly']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='hashCode']]/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testNestedCase() throws Exception {
+        final File fileToProcess = new File(
+            getPath("InputXpathEqualsHashCodeNestedCase.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(EqualsHashCodeCheck.class);
+
+        final String[] expectedViolation = {
+            "5:9: " + getCheckMessage(EqualsHashCodeCheck.class,
+                    EqualsHashCodeCheck.MSG_KEY_HASHCODE),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeNestedCase']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeNestedCase']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathEqualsHashCodeNestedCase']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]"
+                        + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExecutableStatementCountTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExecutableStatementCountTest.java
new file mode 100644
index 00000000000..4be48e8325c
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExecutableStatementCountTest.java
@@ -0,0 +1,134 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.sizes.ExecutableStatementCountCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.sizes.ExecutableStatementCountCheck;
+
+public class XpathRegressionExecutableStatementCountTest extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+        return ExecutableStatementCountCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testDefaultConfig() throws Exception {
+        final String filePath =
+                getPath("InputXpathExecutableStatementCountDefault.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(ExecutableStatementCountCheck.class);
+
+        moduleConfig.addProperty("max", "0");
+
+        final String[] expectedViolations = {
+            "4:5: " + getCheckMessage(ExecutableStatementCountCheck.class, MSG_KEY, 3, 0),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountDefault']]"
+            + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='ElseIfLadder']]",
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountDefault']]"
+            + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='ElseIfLadder']]"
+            + "/MODIFIERS",
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountDefault']]"
+            + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='ElseIfLadder']]"
+            + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+
+    }
+
+    @Test
+    public void testCustomMax() throws Exception {
+        final String filePath =
+                getPath("InputXpathExecutableStatementCountCustomMax.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(ExecutableStatementCountCheck.class);
+
+        moduleConfig.addProperty("max", "0");
+        moduleConfig.addProperty("tokens", "CTOR_DEF");
+
+        final String[] expectedViolations = {
+            "4:5: " + getCheckMessage(ExecutableStatementCountCheck.class, MSG_KEY, 2, 0),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountCustomMax']]"
+            + "/OBJBLOCK/CTOR_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountCustomMax']]",
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountCustomMax']]"
+            + "/OBJBLOCK/CTOR_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountCustomMax']]"
+            + "/MODIFIERS",
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountCustomMax']]"
+            + "/OBJBLOCK/CTOR_DEF[./IDENT["
+            + "@text='InputXpathExecutableStatementCountCustomMax']]"
+            + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testLambdas() throws Exception {
+        final String filePath =
+                getPath("InputXpathExecutableStatementCountLambdas.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(ExecutableStatementCountCheck.class);
+
+        moduleConfig.addProperty("max", "1");
+        moduleConfig.addProperty("tokens", "LAMBDA");
+
+        final String[] expectedViolations = {
+            "7:22: " + getCheckMessage(ExecutableStatementCountCheck.class, MSG_KEY, 2, 1),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathExecutableStatementCountLambdas']]"
+                        + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='c']]/ASSIGN/LAMBDA"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java
index 48cfdc88cf4..c95696cf7d4 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testPrimitiveType() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionExplicitInitializationOne.java"));
+                new File(getPath("InputXpathExplicitInitializationPrimitiveType.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ExplicitInitializationCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionExplicitInitializationOne']]"
+                        + "[./IDENT[@text='InputXpathExplicitInitializationPrimitiveType']]"
                         + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='a']"
         );
 
@@ -61,9 +61,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testObjectType() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionExplicitInitializationTwo.java"));
+                new File(getPath("InputXpathExplicitInitializationObjectType.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ExplicitInitializationCheck.class);
@@ -75,7 +75,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionExplicitInitializationTwo']]"
+                        + "[./IDENT[@text='InputXpathExplicitInitializationObjectType']]"
                         + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='bar']"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java
index c773982bf69..592814097e4 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testFallThrough() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionFallThroughOne.java"));
+                new File(getPath("InputXpathFallThrough.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(FallThroughCheck.class);
@@ -51,11 +51,11 @@ public void testOne() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughOne']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThrough']]"
                 + "/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/CASE_GROUP["
                 + "./LITERAL_CASE/EXPR/NUM_INT[@text='2']]",
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughOne']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThrough']]"
                 + "/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/CASE_GROUP/LITERAL_CASE"
         );
@@ -65,9 +65,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testDefaultCase() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionFallThroughTwo.java"));
+                new File(getPath("InputXpathFallThroughDefaultCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(FallThroughCheck.class);
@@ -79,11 +79,11 @@ public void testTwo() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughTwo']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThroughDefaultCase']]"
                 + "/OBJBLOCK/METHOD_DEF["
                 + "./IDENT[@text='methodFallThruCustomWords']]/SLIST/LITERAL_WHILE/SLIST"
                 + "/LITERAL_SWITCH/CASE_GROUP[./SLIST/EXPR/POST_INC/IDENT[@text='i']]",
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughTwo']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThroughDefaultCase']]"
                 + "/OBJBLOCK/METHOD_DEF["
                 + "./IDENT[@text='methodFallThruCustomWords']]/SLIST/LITERAL_WHILE/SLIST"
                 + "/LITERAL_SWITCH/CASE_GROUP/LITERAL_DEFAULT"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java
index b10d5d101c0..98373ba9592 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,25 +37,25 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionFinalClass1.java"));
+                "InputXpathFinalClassDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(FinalClassCheck.class);
 
         final String[] expectedViolation = {
             "3:1: " + getCheckMessage(FinalClassCheck.class,
-                    FinalClassCheck.MSG_KEY, "SuppressionXpathRegressionFinalClass1"),
+                    FinalClassCheck.MSG_KEY, "InputXpathFinalClassDefault"),
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionFinalClass1']]",
+                        + "@text='InputXpathFinalClassDefault']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionFinalClass1']]/MODIFIERS",
+                        + "@text='InputXpathFinalClassDefault']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionFinalClass1']]/MODIFIERS/LITERAL_PUBLIC"
+                        + "@text='InputXpathFinalClassDefault']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -63,9 +63,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testInnerClass() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionFinalClass2.java"));
+                "InputXpathFinalClassInnerClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(FinalClassCheck.class);
@@ -77,13 +77,13 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionFinalClass2']]"
+                        + "@text='InputXpathFinalClassInnerClass']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionFinalClass2']]"
+                        + "@text='InputXpathFinalClassInnerClass']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionFinalClass2']]"
+                        + "@text='InputXpathFinalClassInnerClass']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/LITERAL_CLASS"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalLocalVariableTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalLocalVariableTest.java
new file mode 100644
index 00000000000..3173b554d63
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalLocalVariableTest.java
@@ -0,0 +1,243 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.FinalLocalVariableCheck;
+
+public class XpathRegressionFinalLocalVariableTest extends AbstractXpathTestSupport {
+
+    private final String checkName = FinalLocalVariableCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testMethodDef() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableMethodDef.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+
+        final String[] expectedViolation = {
+            "5:13: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "x"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalLocalVariableMethodDef']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod']]"
+                        + "/SLIST/VARIABLE_DEF/IDENT[@text='x']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testForLoop() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableForLoop.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+
+        final String[] expectedViolation = {
+            "6:17: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "x"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalLocalVariableForLoop']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method2']]/SLIST/"
+                    + "LITERAL_FOR/SLIST/VARIABLE_DEF/IDENT[@text='x']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testSwitchCase() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableSwitchCase.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+
+        final String[] expectedViolation = {
+            "8:25: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "foo"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalLocalVariableSwitchCase']]"
+                    + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/"
+                    + "LITERAL_SWITCH/CASE_GROUP/SLIST/VARIABLE_DEF/IDENT[@text='foo']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testInnerClass() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableInnerClass.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+
+        final String[] expectedViolation = {
+            "7:17: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "shouldBeFinal"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalLocalVariableInnerClass']]"
+                    + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test1']]"
+                    + "/SLIST/VARIABLE_DEF/IDENT[@text='shouldBeFinal']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testParameterDef() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableParameterDef.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+        moduleConfig.addProperty("tokens", "PARAMETER_DEF");
+
+        final String[] expectedViolation = {
+            "4:28: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "aArg"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalLocalVariableParameterDef']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                    + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='aArg']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testEnhancedFor() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableEnhancedFor.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+        moduleConfig.addProperty("validateEnhancedForLoopVariable", "true");
+
+        final String[] expectedViolation = {
+            "8:20: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "a"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF"
+                    + "[./IDENT[@text='InputXpathFinalLocalVariableEnhancedFor']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method1']]"
+                    + "/SLIST/LITERAL_FOR/FOR_EACH_CLAUSE/VARIABLE_DEF/IDENT[@text='a']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testCtor() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableCtor.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+        moduleConfig.addProperty("tokens", "PARAMETER_DEF");
+
+        final String[] expectedViolation = {
+            "4:42: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "a"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF"
+                    + "[./IDENT[@text='InputXpathFinalLocalVariableCtor']]"
+                    + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                    + "[@text='InputXpathFinalLocalVariableCtor']]"
+                    + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='a']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testTryBlock() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableTryBlock.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+
+        final String[] expectedViolation = {
+            "6:17: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "start"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalLocalVariableTryBlock']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkCodeBlock']]"
+                    + "/SLIST/LITERAL_TRY/SLIST/VARIABLE_DEF/IDENT[@text='start']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testConditionals() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathFinalLocalVariableConditionals.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(FinalLocalVariableCheck.class);
+
+        final String[] expectedViolation = {
+            "11:25: " + getCheckMessage(FinalLocalVariableCheck.class,
+                    FinalLocalVariableCheck.MSG_KEY, "body"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+            "/COMPILATION_UNIT/CLASS_DEF"
+                    + "[./IDENT[@text='InputXpathFinalLocalVariableConditionals']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkCodeBlock']]/SLIST/LITERAL_TRY"
+                    + "/SLIST/LITERAL_IF/LITERAL_ELSE/LITERAL_IF"
+                    + "/SLIST/VARIABLE_DEF/IDENT[@text='body']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalParametersTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalParametersTest.java
new file mode 100644
index 00000000000..baa3d9970b4
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalParametersTest.java
@@ -0,0 +1,190 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck;
+
+public class XpathRegressionFinalParametersTest extends AbstractXpathTestSupport {
+
+    private final String checkName = FinalParametersCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testMethod() throws Exception {
+        final File fileToProcess =
+                  new File(getPath("InputXpathFinalParametersMethod.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(FinalParametersCheck.class);
+
+        final String[] expectedViolation = {
+            "5:24: " + getCheckMessage(FinalParametersCheck.class,
+                    FinalParametersCheck.MSG_KEY, "argOne"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalParametersMethod']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                    + "/PARAMETERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalParametersMethod']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                    + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalParametersMethod']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                    + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]/MODIFIERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalParametersMethod']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                    + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]/TYPE",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                    + "[@text='InputXpathFinalParametersMethod']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                    + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]/TYPE/LITERAL_INT"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testCtor() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathFinalParametersCtor.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(FinalParametersCheck.class);
+
+        moduleConfig.addProperty("tokens", "CTOR_DEF");
+
+        final String[] expectedViolation = {
+            "5:42: " + getCheckMessage(FinalParametersCheck.class,
+                        FinalParametersCheck.MSG_KEY, "argOne"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersCtor']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT["
+                        + "@text='InputXpathFinalParametersCtor']]"
+                        + "/PARAMETERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersCtor']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT["
+                        + "@text='InputXpathFinalParametersCtor']]"
+                        + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersCtor']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT["
+                        + "@text='InputXpathFinalParametersCtor']]"
+                        + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]/MODIFIERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersCtor']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT["
+                        + "@text='InputXpathFinalParametersCtor']]"
+                        + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]/TYPE",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersCtor']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT["
+                        + "@text='InputXpathFinalParametersCtor']]"
+                        + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='argOne']]/TYPE/LITERAL_INT"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testAnonymous() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathFinalParametersAnonymous.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(FinalParametersCheck.class);
+
+        moduleConfig.addProperty("ignorePrimitiveTypes", "true");
+
+        final String[] expectedViolation = {
+            "11:32: " + getCheckMessage(FinalParametersCheck.class,
+                    FinalParametersCheck.MSG_KEY, "argOne"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersAnonymous']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='createClass']]/SLIST/"
+                        + "VARIABLE_DEF[./IDENT[@text='obj']]/ASSIGN/EXPR"
+                        + "/LITERAL_NEW[./IDENT[@text='AnonymousClass']]/OBJBLOCK"
+                        + "/METHOD_DEF[./IDENT[@text='method']]/PARAMETERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersAnonymous']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='createClass']]/SLIST/"
+                        + "VARIABLE_DEF[./IDENT[@text='obj']]/ASSIGN/EXPR"
+                        + "/LITERAL_NEW[./IDENT[@text='AnonymousClass']]/OBJBLOCK"
+                        + "/METHOD_DEF[./IDENT[@text='method']]/PARAMETERS"
+                        + "/PARAMETER_DEF[./IDENT[@text='argOne']]",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersAnonymous']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='createClass']]/SLIST/"
+                        + "VARIABLE_DEF[./IDENT[@text='obj']]/ASSIGN/EXPR"
+                        + "/LITERAL_NEW[./IDENT[@text='AnonymousClass']]/OBJBLOCK"
+                        + "/METHOD_DEF[./IDENT[@text='method']]/PARAMETERS"
+                        + "/PARAMETER_DEF[./IDENT[@text='argOne']]/MODIFIERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersAnonymous']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='createClass']]/SLIST/"
+                        + "VARIABLE_DEF[./IDENT[@text='obj']]/ASSIGN/EXPR"
+                        + "/LITERAL_NEW[./IDENT[@text='AnonymousClass']]/OBJBLOCK"
+                        + "/METHOD_DEF[./IDENT[@text='method']]/PARAMETERS"
+                        + "/PARAMETER_DEF[./IDENT[@text='argOne']]/TYPE[./IDENT[@text='String']]",
+
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathFinalParametersAnonymous']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='createClass']]/SLIST/"
+                        + "VARIABLE_DEF[./IDENT[@text='obj']]/ASSIGN/EXPR"
+                        + "/LITERAL_NEW[./IDENT[@text='AnonymousClass']]/OBJBLOCK"
+                        + "/METHOD_DEF[./IDENT[@text='method']]/PARAMETERS"
+                        + "/PARAMETER_DEF[./IDENT[@text='argOne']]/TYPE/IDENT[@text='String']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionGenericWhitespaceTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionGenericWhitespaceTest.java
index 22b86a9cae1..796325a6412 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionGenericWhitespaceTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionGenericWhitespaceTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testProcessEnd() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceEnd.java"));
+                getPath("InputXpathGenericWhitespaceEnd.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -53,7 +53,7 @@ public void testProcessEnd() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionGenericWhitespaceEnd']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathGenericWhitespaceEnd']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='bad']]"
                 + "/PARAMETERS/PARAMETER_DEF[./IDENT[@text='cls']]"
                 + "/TYPE[./IDENT[@text='Class']]/TYPE_ARGUMENTS/GENERIC_END"
@@ -66,7 +66,7 @@ public void testProcessEnd() throws Exception {
     @Test
     public void testProcessNestedGenericsOne() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceNestedGenericsOne.java"));
+                getPath("InputXpathGenericWhitespaceNestedOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -78,7 +78,7 @@ public void testProcessNestedGenericsOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionGenericWhitespaceNestedGenericsOne']]"
+                + "@text='InputXpathGenericWhitespaceNestedOne']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS"
                 + "/TYPE_PARAMETER[./IDENT[@text='E']]"
                 + "/TYPE_UPPER_BOUNDS[./IDENT[@text='Enum']]/TYPE_ARGUMENTS/GENERIC_END"
@@ -91,7 +91,7 @@ public void testProcessNestedGenericsOne() throws Exception {
     @Test
     public void testProcessNestedGenericsTwo() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceNestedGenericsTwo.java"));
+                getPath("InputXpathGenericWhitespaceNestedTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -103,7 +103,7 @@ public void testProcessNestedGenericsTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionGenericWhitespaceNestedGenericsTwo']]"
+                + "@text='InputXpathGenericWhitespaceNestedTwo']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS"
                 + "/TYPE_PARAMETER[./IDENT[@text='E']]"
                 + "/TYPE_UPPER_BOUNDS[./IDENT[@text='Enum']]/TYPE_ARGUMENTS/GENERIC_END"
@@ -116,7 +116,7 @@ public void testProcessNestedGenericsTwo() throws Exception {
     @Test
     public void testProcessNestedGenericsThree() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceNestedGenericsThree.java"));
+                getPath("InputXpathGenericWhitespaceNestedThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -128,7 +128,7 @@ public void testProcessNestedGenericsThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionGenericWhitespaceNestedGenericsThree']]"
+                + "@text='InputXpathGenericWhitespaceNestedThree']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS"
                 + "/TYPE_PARAMETER[./IDENT[@text='E']]"
                 + "/TYPE_UPPER_BOUNDS[./IDENT[@text='Enum']]/TYPE_ARGUMENTS/GENERIC_END"
@@ -141,7 +141,7 @@ public void testProcessNestedGenericsThree() throws Exception {
     @Test
     public void testProcessSingleGenericOne() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceSingleGenericOne.java"));
+                getPath("InputXpathGenericWhitespaceSingleOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -153,7 +153,7 @@ public void testProcessSingleGenericOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionGenericWhitespaceSingleGenericOne']]"
+                + "@text='InputXpathGenericWhitespaceSingleOne']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR/METHOD_CALL"
                 + "/DOT[./IDENT[@text='Collections']]"
                 + "/TYPE_ARGUMENTS/GENERIC_END"
@@ -166,7 +166,7 @@ public void testProcessSingleGenericOne() throws Exception {
     @Test
     public void testProcessSingleGenericTwo() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceSingleGenericTwo.java"));
+                getPath("InputXpathGenericWhitespaceSingleTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -178,7 +178,7 @@ public void testProcessSingleGenericTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionGenericWhitespaceSingleGenericTwo']]"
+                + "@text='InputXpathGenericWhitespaceSingleTwo']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS/GENERIC_END"
         );
 
@@ -189,7 +189,7 @@ public void testProcessSingleGenericTwo() throws Exception {
     @Test
     public void testProcessStartOne() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceStartOne.java"));
+                getPath("InputXpathGenericWhitespaceStartOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -201,10 +201,10 @@ public void testProcessStartOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionGenericWhitespaceStartOne']]"
+                    + "[@text='InputXpathGenericWhitespaceStartOne']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionGenericWhitespaceStartOne']]"
+                    + "[@text='InputXpathGenericWhitespaceStartOne']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS/GENERIC_START"
         );
 
@@ -215,7 +215,7 @@ public void testProcessStartOne() throws Exception {
     @Test
     public void testProcessStartTwo() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceStartTwo.java"));
+                getPath("InputXpathGenericWhitespaceStartTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -227,12 +227,12 @@ public void testProcessStartTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionGenericWhitespaceStartTwo']]"
+                + "[@text='InputXpathGenericWhitespaceStartTwo']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/PARAMETERS"
                 + "/PARAMETER_DEF[./IDENT[@text='consumer']]"
                 + "/TYPE[./IDENT[@text='Consumer']]/TYPE_ARGUMENTS",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionGenericWhitespaceStartTwo']]"
+                + "[@text='InputXpathGenericWhitespaceStartTwo']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/PARAMETERS"
                 + "/PARAMETER_DEF[./IDENT[@text='consumer']]"
                 + "/TYPE[./IDENT[@text='Consumer']]/TYPE_ARGUMENTS/GENERIC_START"
@@ -245,7 +245,7 @@ public void testProcessStartTwo() throws Exception {
     @Test
     public void testProcessStartThree() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionGenericWhitespaceStartThree.java"));
+                getPath("InputXpathGenericWhitespaceStartThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(GenericWhitespaceCheck.class);
@@ -257,16 +257,16 @@ public void testProcessStartThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionGenericWhitespaceStartThree']]"
+                + "[@text='InputXpathGenericWhitespaceStartThree']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionGenericWhitespaceStartThree']]"
+                + "[@text='InputXpathGenericWhitespaceStartThree']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionGenericWhitespaceStartThree']]"
+                + "[@text='InputXpathGenericWhitespaceStartThree']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionGenericWhitespaceStartThree']]"
+                + "[@text='InputXpathGenericWhitespaceStartThree']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bad']]/TYPE_PARAMETERS/GENERIC_START"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionHiddenFieldTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionHiddenFieldTest.java
index ad5d6dae131..59e846a9279 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionHiddenFieldTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionHiddenFieldTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testLambdaExpInMethodCall() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionHiddenFieldOne.java"));
+                new File(getPath("InputXpathHiddenFieldLambdaExpInMethodCall.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(HiddenFieldCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionHiddenFieldOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathHiddenFieldLambdaExpInMethodCall']]/OBJBLOCK"
                 + "/INSTANCE_INIT/SLIST/EXPR/METHOD_CALL/ELIST/LAMBDA/PARAMETERS"
                 + "/PARAMETER_DEF/IDENT[@text='value']"
         );
@@ -62,9 +62,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testMethodParam() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionHiddenFieldTwo.java"));
+                new File(getPath("InputXpathHiddenFieldMethodParam.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(HiddenFieldCheck.class);
@@ -76,7 +76,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionHiddenFieldTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathHiddenFieldMethodParam']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='method']]/PARAMETERS/PARAMETER_DEF"
                 + "/IDENT[@text='other']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalCatchTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalCatchTest.java
index b6452250ab1..75c5988f867 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalCatchTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalCatchTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalCatchOne.java"));
+                new File(getPath("InputXpathIllegalCatchOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalCatchCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionIllegalCatchOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathIllegalCatchOne']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='fun']]/SLIST"
                 + "/LITERAL_TRY/LITERAL_CATCH"
         );
@@ -64,7 +64,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalCatchTwo.java"));
+                new File(getPath("InputXpathIllegalCatchTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalCatchCheck.class);
@@ -76,7 +76,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionIllegalCatchTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathIllegalCatchTwo']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='methodTwo']]/SLIST"
                 + "/LITERAL_TRY/LITERAL_CATCH"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java
index 5fc2d0dd1e3..63282740728 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-            "SuppressionXpathRegressionIllegalIdentifierNameTestOne.java"));
+            "InputXpathIllegalIdentifierNameOne.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(IllegalIdentifierNameCheck.class);
@@ -55,7 +55,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/RECORD_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionIllegalIdentifierNameTestOne'"
+                + "[./IDENT[@text='InputXpathIllegalIdentifierNameOne'"
                 + "]]/RECORD_COMPONENTS/RECORD_COMPONENT_DEF/IDENT[@text='yield']"
         );
 
@@ -66,7 +66,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-            "SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java"));
+            "InputXpathIllegalIdentifierNameTwo.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(IllegalIdentifierNameCheck.class);
@@ -80,7 +80,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionIllegalIdentifierNameTestTwo']"
+                + "[./IDENT[@text='InputXpathIllegalIdentifierNameTwo']"
                 + "]/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/PARAMETERS/PARAMETER_DEF"
                 + "/IDENT[@text='yield']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalImportTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalImportTest.java
index 22cab115cbf..ac8e5490479 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalImportTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalImportTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalImportOne.java"));
+                new File(getPath("InputXpathIllegalImportDefault.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalImportCheck.class);
         moduleConfig.addProperty("illegalPkgs", "java.util");
@@ -57,9 +57,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testStatic() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalImportTwo.java"));
+                new File(getPath("InputXpathIllegalImportStatic.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalImportCheck.class);
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java
new file mode 100644
index 00000000000..90fd3c93a3b
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java
@@ -0,0 +1,128 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalInstantiationCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.IllegalInstantiationCheck;
+
+public class XpathRegressionIllegalInstantiationTest extends AbstractXpathTestSupport {
+    @Override
+    protected String getCheckName() {
+        return IllegalInstantiationCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testSimple() throws Exception {
+        final String fileName = "InputXpathIllegalInstantiationSimple.java";
+        final File fileToProcess = new File(getNonCompilablePath(fileName));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(IllegalInstantiationCheck.class);
+        moduleConfig.addProperty("classes", "java.lang.Boolean");
+
+        final String[] expectedViolation = {
+            "8:21: " + getCheckMessage(IllegalInstantiationCheck.class, MSG_KEY,
+                    "java.lang.Boolean"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathIllegalInstantiationSimple']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/"
+                + "VARIABLE_DEF[./IDENT[@text='x']]/ASSIGN/EXPR",
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathIllegalInstantiationSimple']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/VARIABLE_DEF"
+                + "[./IDENT[@text='x']]/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='Boolean']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testAnonymous() throws Exception {
+        final String fileName = "InputXpathIllegalInstantiationAnonymous.java";
+        final File fileToProcess = new File(getNonCompilablePath(fileName));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(IllegalInstantiationCheck.class);
+        moduleConfig.addProperty("classes", "java.lang.Integer");
+
+        final String[] expectedViolation = {
+            "10:25: " + getCheckMessage(IllegalInstantiationCheck.class, MSG_KEY,
+                    "java.lang.Integer"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathIllegalInstantiationAnonymous']]"
+                + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]/OBJBLOCK/METHOD_DEF"
+                + "[./IDENT[@text='test']]/SLIST/VARIABLE_DEF[./IDENT[@text='e']]/ASSIGN/EXPR",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathIllegalInstantiationAnonymous']]"
+                + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]/OBJBLOCK/METHOD_DEF"
+                + "[./IDENT[@text='test']]/SLIST/VARIABLE_DEF[./IDENT[@text='e']]"
+                + "/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='Integer']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testInterface() throws Exception {
+        final String fileName = "InputXpathIllegalInstantiationInterface.java";
+        final File fileToProcess = new File(getNonCompilablePath(fileName));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(IllegalInstantiationCheck.class);
+        moduleConfig.addProperty("classes", "java.lang.String");
+
+        final String[] expectedViolation = {
+            "10:24: " + getCheckMessage(IllegalInstantiationCheck.class, MSG_KEY,
+                    "java.lang.String"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathIllegalInstantiationInterface']]"
+                + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Inner']]/"
+                + "OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/"
+                + "VARIABLE_DEF[./IDENT[@text='s']]/ASSIGN/EXPR",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathIllegalInstantiationInterface']]"
+                + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Inner']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/VARIABLE_DEF"
+                + "[./IDENT[@text='s']]/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='String']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalThrowsTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalThrowsTest.java
index d71a6f13595..da8feb51f90 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalThrowsTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalThrowsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testRuntimeException() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalThrowsOne.java"));
+                new File(getPath("InputXpathIllegalThrowsRuntimeException.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalThrowsCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionIllegalThrowsOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathIllegalThrowsRuntimeException']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='sayHello']]/LITERAL_THROWS"
                 + "/IDENT[@text='RuntimeException']"
         );
@@ -62,9 +62,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testError() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalThrowsTwo.java"));
+                new File(getPath("InputXpathIllegalThrowsError.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalThrowsCheck.class);
@@ -76,7 +76,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionIllegalThrowsTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathIllegalThrowsError']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='methodTwo']]/LITERAL_THROWS"
                 + "/DOT[./IDENT[@text='Error']]"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTokenTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTokenTest.java
index 92a87f290d9..beeff2252a4 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTokenTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTokenTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testLabel() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalToken1.java"));
+                new File(getPath("InputXpathIllegalTokenLabel.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
         final String[] expectedViolation = {
@@ -49,7 +49,7 @@ public void testOne() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                    + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionIllegalToken1']]"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTokenLabel']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myTest']]"
                     + "/SLIST/LABELED_STAT[./IDENT[@text='outer']]"
         );
@@ -59,9 +59,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testNative() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIllegalToken2.java"));
+                new File(getPath("InputXpathIllegalTokenNative.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
 
@@ -73,7 +73,7 @@ public void testTwo() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                        + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionIllegalToken2']]"
+                        + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTokenNative']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myTest']]"
                         + "/MODIFIERS/LITERAL_NATIVE"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTokenTextTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTokenTextTest.java
new file mode 100644
index 00000000000..7f53a95c913
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTokenTextTest.java
@@ -0,0 +1,119 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenTextCheck;
+
+public class XpathRegressionIllegalTokenTextTest extends AbstractXpathTestSupport {
+
+    private final String checkName = IllegalTokenTextCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testField() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathIllegalTokenTextField.java"));
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(IllegalTokenTextCheck.class);
+        moduleConfig.addProperty("format", "12345");
+        moduleConfig.addProperty("tokens", "NUM_INT");
+        final String[] expectedViolation = {
+            "4:33: " + getCheckMessage(IllegalTokenTextCheck.class,
+                        IllegalTokenTextCheck.MSG_KEY, "12345"),
+        };
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTokenTextField']]"
+                    + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='illegalNumber']]"
+                    + "/ASSIGN/EXPR[./NUM_INT[@text='12345']]",
+                "/COMPILATION_UNIT"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTokenTextField']]"
+                    + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='illegalNumber']]"
+                    + "/ASSIGN/EXPR/NUM_INT[@text='12345']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testMethod() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathIllegalTokenTextMethod.java"));
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(IllegalTokenTextCheck.class);
+        moduleConfig.addProperty("format", "forbiddenText");
+        moduleConfig.addProperty("tokens", "STRING_LITERAL");
+        final String[] expectedViolation = {
+            "5:32: " + getCheckMessage(IllegalTokenTextCheck.class,
+                        IllegalTokenTextCheck.MSG_KEY, "forbiddenText"),
+        };
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTokenTextMethod']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myMethod']]"
+                    + "/SLIST/VARIABLE_DEF[./IDENT[@text='illegalString']]"
+                    + "/ASSIGN/EXPR[./STRING_LITERAL[@text='forbiddenText']]",
+                "/COMPILATION_UNIT"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTokenTextMethod']]"
+                    + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myMethod']]"
+                    + "/SLIST/VARIABLE_DEF[./IDENT[@text='illegalString']]"
+                    + "/ASSIGN/EXPR/STRING_LITERAL[@text='forbiddenText']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testInterface() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathIllegalTokenTextInterface.java"));
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(IllegalTokenTextCheck.class);
+        moduleConfig.addProperty("format", "invalidIdentifier");
+        moduleConfig.addProperty("tokens", "IDENT");
+        final String[] expectedViolation = {
+            "4:10: " + getCheckMessage(IllegalTokenTextCheck.class,
+                        IllegalTokenTextCheck.MSG_KEY, "invalidIdentifier"),
+        };
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT"
+                    + "/INTERFACE_DEF[./IDENT[@text='InputXpathIllegalTokenTextInterface']]"
+                    + "/OBJBLOCK/METHOD_DEF/IDENT[@text='invalidIdentifier']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java
index 53118cecaf8..c05e828be7b 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionIllegalTypeOne.java"));
+            new File(getPath("InputXpathIllegalTypeOne.java"));
         final DefaultConfiguration moduleConfig =
             createModuleConfig(IllegalTypeCheck.class);
         moduleConfig.addProperty("tokens", "METHOD_DEF");
@@ -50,7 +50,7 @@ public void testOne() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT"
-                + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionIllegalTypeOne']]"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTypeOne']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='typeParam']]/TYPE_PARAMETERS/TYPE_PARAMETER"
                 + "[./IDENT[@text='T']]/TYPE_UPPER_BOUNDS/DOT"
                 + "[./IDENT[@text='HashSet']]/DOT/IDENT[@text='java']"
@@ -63,7 +63,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionIllegalTypeTwo.java"));
+            new File(getPath("InputXpathIllegalTypeTwo.java"));
         final DefaultConfiguration moduleConfig =
             createModuleConfig(IllegalTypeCheck.class);
 
@@ -74,7 +74,7 @@ public void testTwo() throws Exception {
                                       IllegalTypeCheck.MSG_KEY, "Boolean"),
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionIllegalTypeTwo']"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathIllegalTypeTwo']"
                 + "]/OBJBLOCK/METHOD_DEF[./IDENT[@text='typeParam']]/TYPE_PARAMETERS/"
                 + "TYPE_PARAMETER[./IDENT[@text='T']]/TYPE_UPPER_BOUNDS/IDENT[@text='Boolean']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportControlTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportControlTest.java
index 58415f33fcf..7f41212dd2e 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportControlTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportControlTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,12 +41,12 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportControlOne.java"));
+                new File(getPath("InputXpathImportControlOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportControlCheck.class);
         moduleConfig.addProperty("file", getPath(
-                "SuppressionXpathRegressionImportControlOne.xml"));
+                "InputXpathImportControlOne.xml"));
 
         final String[] expectedViolation = {
             "3:1: " + getCheckMessage(ImportControlCheck.class,
@@ -64,12 +64,12 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportControlTwo.java"));
+                new File(getPath("InputXpathImportControlTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportControlCheck.class);
         moduleConfig.addProperty("file", getPath(
-                "SuppressionXpathRegressionImportControlTwo.xml"));
+                "InputXpathImportControlTwo.xml"));
 
         final String[] expectedViolation = {
             "1:1: " + getCheckMessage(ImportControlCheck.class,
@@ -87,7 +87,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportControlThree.java"));
+                new File(getPath("InputXpathImportControlThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportControlCheck.class);
@@ -108,12 +108,12 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportControlFour.java"));
+                new File(getPath("InputXpathImportControlFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportControlCheck.class);
         moduleConfig.addProperty("file",
-                getPath("SuppressionXpathRegressionImportControlFour.xml"));
+                getPath("InputXpathImportControlFour.xml"));
 
         final String[] expectedViolation = {
             "4:1: " + getCheckMessage(ImportControlCheck.class,
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportOrderTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportOrderTest.java
index 27dd8182258..ee4139168cb 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportOrderTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionImportOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportOrderOne.java"));
+                new File(getPath("InputXpathImportOrderOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportOrderCheck.class);
@@ -61,7 +61,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportOrderTwo.java"));
+                new File(getPath("InputXpathImportOrderTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportOrderCheck.class);
@@ -82,7 +82,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportOrderThree.java"));
+                new File(getPath("InputXpathImportOrderThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportOrderCheck.class);
@@ -105,7 +105,7 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportOrderFour.java"));
+                new File(getPath("InputXpathImportOrderFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportOrderCheck.class);
@@ -127,7 +127,7 @@ public void testFour() throws Exception {
     @Test
     public void testFive() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionImportOrderFive.java"));
+                new File(getPath("InputXpathImportOrderFive.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ImportOrderCheck.class);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIndentationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIndentationTest.java
index 56e463cc59c..1abe2690d49 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIndentationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIndentationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIndentationTestOne.java"));
+                new File(getPath("InputXpathIndentationDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IndentationCheck.class);
@@ -52,19 +52,19 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestOne']]"
+                    + "[./IDENT[@text='InputXpathIndentationDefault']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='wrongIntend']]",
 
              "/COMPILATION_UNIT/CLASS_DEF"
-                     + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestOne']]"
+                     + "[./IDENT[@text='InputXpathIndentationDefault']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='wrongIntend']]/MODIFIERS",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestOne']]"
+                    + "[./IDENT[@text='InputXpathIndentationDefault']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='wrongIntend']]/TYPE",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestOne']]"
+                    + "[./IDENT[@text='InputXpathIndentationDefault']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='wrongIntend']]/TYPE/LITERAL_VOID"
         );
 
@@ -75,7 +75,7 @@ public void testOne() throws Exception {
     @Test
     public void testBasicOffset() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIndentationTestTwo.java"));
+                new File(getPath("InputXpathIndentationBasicOffset.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IndentationCheck.class);
@@ -95,19 +95,19 @@ public void testBasicOffset() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestTwo']]"
+                    + "[./IDENT[@text='InputXpathIndentationBasicOffset']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestTwo']]"
+                    + "[./IDENT[@text='InputXpathIndentationBasicOffset']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestTwo']]"
+                    + "[./IDENT[@text='InputXpathIndentationBasicOffset']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestTwo']]"
+                    + "[./IDENT[@text='InputXpathIndentationBasicOffset']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE/LITERAL_VOID"
         );
 
@@ -118,7 +118,7 @@ public void testBasicOffset() throws Exception {
     @Test
     public void testCaseIndent() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIndentationTestThree.java"));
+                new File(getPath("InputXpathIndentationSwitchCase.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IndentationCheck.class);
@@ -138,12 +138,12 @@ public void testCaseIndent() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestThree']]"
+                    + "[./IDENT[@text='InputXpathIndentationSwitchCase']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/"
                     + "CASE_GROUP",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationTestThree']]"
+                    + "[./IDENT[@text='InputXpathIndentationSwitchCase']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/"
                     + "CASE_GROUP/LITERAL_CASE"
         );
@@ -153,9 +153,9 @@ public void testCaseIndent() throws Exception {
     }
 
     @Test
-    public void testLambda() throws Exception {
+    public void testLambdaOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIndentationLambdaTest1.java"));
+                new File(getPath("InputXpathIndentationLambdaOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IndentationCheck.class);
@@ -175,7 +175,7 @@ public void testLambda() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationLambdaTest1"
+                    + "[./IDENT[@text='InputXpathIndentationLambdaOne"
                     + "']]/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/VARIABLE_DEF"
                     + "[./IDENT[@text='getA']]/ASSIGN/LAMBDA/LPAREN"
         );
@@ -185,9 +185,9 @@ public void testLambda() throws Exception {
     }
 
     @Test
-    public void testLambda2() throws Exception {
+    public void testLambdaTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIndentationLambdaTest2.java"));
+                new File(getPath("InputXpathIndentationLambdaTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IndentationCheck.class);
@@ -207,7 +207,7 @@ public void testLambda2() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationLambdaTest2']]"
+                    + "[./IDENT[@text='InputXpathIndentationLambdaTwo']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/VARIABLE_DEF["
                     + "./IDENT[@text='div']]/ASSIGN/LAMBDA/SLIST/LITERAL_RETURN"
         );
@@ -219,7 +219,7 @@ public void testLambda2() throws Exception {
     @Test
     public void testIfWithNoCurlies() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionIndentationIfWithoutCurly.java"));
+            new File(getPath("InputXpathIndentationIfWithoutCurly.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IndentationCheck.class);
@@ -240,7 +240,7 @@ public void testIfWithNoCurlies() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationIfWithoutCurly']]"
+                    + "[./IDENT[@text='InputXpathIndentationIfWithoutCurly']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_IF/EXPR/"
                     + "METHOD_CALL/IDENT[@text='e']"
         );
@@ -252,7 +252,7 @@ public void testIfWithNoCurlies() throws Exception {
     @Test
     public void testElseWithNoCurlies() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionIndentationElseWithoutCurly.java"));
+                new File(getPath("InputXpathIndentationElseWithoutCurly.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IndentationCheck.class);
@@ -273,7 +273,7 @@ public void testElseWithNoCurlies() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionIndentationElseWithoutCurly']]"
+                    + "[./IDENT[@text='InputXpathIndentationElseWithoutCurly']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_IF/LITERAL_ELSE"
                     + "/EXPR/METHOD_CALL/IDENT[@text='exp']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerAssignmentTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerAssignmentTest.java
new file mode 100644
index 00000000000..603c6de0855
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerAssignmentTest.java
@@ -0,0 +1,87 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck;
+
+public class XpathRegressionInnerAssignmentTest extends AbstractXpathTestSupport {
+
+    private final String checkName = InnerAssignmentCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testInnerAssignment() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathInnerAssignment.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(InnerAssignmentCheck.class);
+
+        final String[] expectedViolation = {
+            "7:15: " + getCheckMessage(InnerAssignmentCheck.class, InnerAssignmentCheck.MSG_KEY),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT"
+                        + "/CLASS_DEF[./IDENT[@text='InputXpathInnerAssignment']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod']]"
+                        + "/SLIST/EXPR/ASSIGN[./IDENT[@text='a']]/ASSIGN[./IDENT[@text='b']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testArrays() throws Exception {
+        final File fileToProcess = new
+                File(getPath("InputXpathInnerAssignmentArrays.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(InnerAssignmentCheck.class);
+
+        final String[] expectedViolation = {
+            "6:55: " + getCheckMessage(InnerAssignmentCheck.class, InnerAssignmentCheck.MSG_KEY),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathInnerAssignmentArrays']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod']]"
+                + "/SLIST/VARIABLE_DEF[./IDENT[@text='doubleArray']]"
+                + "/ASSIGN/EXPR/LITERAL_NEW/ARRAY_INIT/EXPR[./ASSIGN/IDENT[@text='myDouble']]",
+                "/COMPILATION_UNIT"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathInnerAssignmentArrays']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod']]/"
+                + "SLIST/VARIABLE_DEF[./IDENT[@text='doubleArray']]"
+                + "/ASSIGN/EXPR/LITERAL_NEW/ARRAY_INIT/EXPR/ASSIGN[./IDENT[@text='myDouble']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerTypeLastTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerTypeLastTest.java
new file mode 100644
index 00000000000..0aef626e054
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerTypeLastTest.java
@@ -0,0 +1,141 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck;
+
+public class XpathRegressionInnerTypeLastTest extends AbstractXpathTestSupport {
+
+    private final String checkName = InnerTypeLastCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testOne() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathInnerTypeLastOne.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(InnerTypeLastCheck.class);
+
+        final String[] expectedViolations = {
+            "8:5: " + getCheckMessage(InnerTypeLastCheck.class, MSG_KEY),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastOne']]"
+                        + "/OBJBLOCK/CTOR_DEF"
+                        + "[./IDENT[@text='InputXpathInnerTypeLastOne']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastOne']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastOne']]"
+                        + "/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastOne']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastOne']]"
+                        + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testTwo() throws Exception {
+
+        final File fileToProcess =
+                new File(getPath("InputXpathInnerTypeLastTwo.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(InnerTypeLastCheck.class);
+
+        final String[] expectedViolations = {
+            "11:9: " + getCheckMessage(InnerTypeLastCheck.class, MSG_KEY),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastTwo']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='innerMethod']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastTwo']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT"
+                        + "[@text='innerMethod']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastTwo']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT"
+                        + "[@text='innerMethod']]/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations,
+                expectedXpathQueries);
+
+    }
+
+    @Test
+    public void testThree() throws Exception {
+
+        final File fileToProcess = new File(
+                getPath("InputXpathInnerTypeLastThree.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(InnerTypeLastCheck.class);
+
+        final String[] expectedViolations = {
+            "10:5: " + getCheckMessage(InnerTypeLastCheck.class, MSG_KEY),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastThree']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastThree']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastThree']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastThree']]"
+                        + "/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastThree']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathInnerTypeLastThree']]"
+                        + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations,
+                expectedXpathQueries);
+
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java
index 16110e0f7d0..fdbc451f70f 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testAllowMarker() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionInterfaceIsType1.java"));
+                "InputXpathInterfaceIsTypeAllowMarker.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InterfaceIsTypeCheck.class);
@@ -52,11 +52,11 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionInterfaceIsType1']]",
+                    + "@text='InputXpathInterfaceIsTypeAllowMarker']]",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionInterfaceIsType1']]/MODIFIERS",
+                    + "@text='InputXpathInterfaceIsTypeAllowMarker']]/MODIFIERS",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionInterfaceIsType1']]"
+                    + "@text='InputXpathInterfaceIsTypeAllowMarker']]"
                     + "/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -65,9 +65,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testAllowMarkerFalse() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionInterfaceIsType2.java"));
+                "InputXpathInterfaceIsType.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InterfaceIsTypeCheck.class);
@@ -81,11 +81,11 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionInterfaceIsType2']]",
+                    + "@text='InputXpathInterfaceIsType']]",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionInterfaceIsType2']]/MODIFIERS",
+                    + "@text='InputXpathInterfaceIsType']]/MODIFIERS",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionInterfaceIsType2']]"
+                    + "@text='InputXpathInterfaceIsType']]"
                     + "/MODIFIERS/LITERAL_PUBLIC"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java
index 269946f92b0..ed19e0b1b33 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testField() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java")
+            getPath("InputXpathInterfaceMemberImpliedModifierField.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -51,16 +51,16 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierField']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]",
 
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierField']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]"
                 + "/MODIFIERS",
 
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierField']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]"
                 + "/MODIFIERS/LITERAL_PUBLIC"
         );
@@ -69,9 +69,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testMethod() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java")
+            getPath("InputXpathInterfaceMemberImpliedModifierMethod.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -84,16 +84,16 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierMethod']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]",
 
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierMethod']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]"
                 + "/MODIFIERS",
 
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierMethod']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]"
                 + "/MODIFIERS/ABSTRACT"
         );
@@ -102,9 +102,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testInner() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java")
+            getPath("InputXpathInterfaceMemberImpliedModifierInner.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -117,16 +117,16 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierInner']]"
                 + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]",
 
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierInner']]"
                 + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]"
                 + "/MODIFIERS",
 
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]"
+                + "[@text='InputXpathInterfaceMemberImpliedModifierInner']]"
                 + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]"
                 + "/MODIFIERS/LITERAL_PUBLIC"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java
index ddc9aaf5265..2cd24d78858 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionOne.java"));
+                new File(getPath("InputXpathInvalidJavadocPositionOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InvalidJavadocPositionCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionOne']]"
+                    + "[./IDENT[@text='InputXpathInvalidJavadocPositionOne']]"
                     + "/MODIFIERS/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT"
                     + "[@text='* // warn\\n * Javadoc Comment\\n ']]"
         );
@@ -64,7 +64,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionTwo.java"));
+                new File(getPath("InputXpathInvalidJavadocPositionTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InvalidJavadocPositionCheck.class);
@@ -76,7 +76,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionInvalidJavadocPositionTwo']]"
+                    + "[@text='InputXpathInvalidJavadocPositionTwo']]"
                     + "/OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT"
                     + "[@text='* // warn\\n * Javadoc comment\\n ']]"
         );
@@ -88,7 +88,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionThree.java"));
+                new File(getPath("InputXpathInvalidJavadocPositionThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InvalidJavadocPositionCheck.class);
@@ -100,7 +100,7 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionThree']]/"
+                    + "[./IDENT[@text='InputXpathInvalidJavadocPositionThree']]/"
                     + "OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT"
                     + "[@text='* // warn\\n     * Javadoc comment\\n     ']]"
         );
@@ -112,7 +112,7 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionFour.java"));
+                new File(getPath("InputXpathInvalidJavadocPositionFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InvalidJavadocPositionCheck.class);
@@ -124,7 +124,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionFour']]"
+                + "[./IDENT[@text='InputXpathInvalidJavadocPositionFour']]"
                 + "/OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT"
                 + "[@text='* // warn\\n     * Javadoc Comment\\n     ']]"
         );
@@ -136,7 +136,7 @@ public void testFour() throws Exception {
     @Test
     public void testFive() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionFive.java"));
+                new File(getPath("InputXpathInvalidJavadocPositionFive.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InvalidJavadocPositionCheck.class);
@@ -148,7 +148,7 @@ public void testFive() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionFive']]"
+                + "[./IDENT[@text='InputXpathInvalidJavadocPositionFive']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT"
                 + "[@text='* // warn\\n         * Javadoc comment\\n         ']]"
@@ -161,7 +161,7 @@ public void testFive() throws Exception {
     @Test
     public void testSix() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionSix.java"));
+                new File(getPath("InputXpathInvalidJavadocPositionSix.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(InvalidJavadocPositionCheck.class);
@@ -173,7 +173,7 @@ public void testSix() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionSix']]"
+                + "[./IDENT[@text='InputXpathInvalidJavadocPositionSix']]"
                 + "/OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT"
                 + "[@text='* // warn\\n     * Javadoc Comment\\n     ']]"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavaNCSSTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavaNCSSTest.java
new file mode 100644
index 00000000000..441af676ead
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavaNCSSTest.java
@@ -0,0 +1,122 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck;
+
+// -@cs[AbbreviationAsWordInName] Test should be named as its main class.
+public class XpathRegressionJavaNCSSTest extends AbstractXpathTestSupport {
+
+    private final String checkName = JavaNCSSCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testOne() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathJavaNCSSOne.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(JavaNCSSCheck.class);
+
+        final String[] expectedViolation = {
+            "5:5: " + getCheckMessage(JavaNCSSCheck.class,
+                    JavaNCSSCheck.MSG_METHOD, 51, 50),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathJavaNCSSOne']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
+
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathJavaNCSSOne']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathJavaNCSSOne']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testTwo() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathJavaNCSSTwo.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(JavaNCSSCheck.class);
+
+        moduleConfig.addProperty("classMaximum", "50");
+
+        final String[] expectedViolation = {
+            "3:1: " + getCheckMessage(JavaNCSSCheck.class,
+                    JavaNCSSCheck.MSG_CLASS, 51, 50),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathJavaNCSSTwo']]",
+
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathJavaNCSSTwo']]/MODIFIERS",
+
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathJavaNCSSTwo']]"
+                + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testThree() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathJavaNCSSThree.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(JavaNCSSCheck.class);
+
+        moduleConfig.addProperty("fileMaximum", "50");
+
+        final String[] expectedViolation = {
+            "1:1: " + getCheckMessage(JavaNCSSCheck.class,
+                    JavaNCSSCheck.MSG_FILE, 51, 50),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT",
+                "/COMPILATION_UNIT/PACKAGE_DEF"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java
index eeb650ea07e..fc1f8fea74c 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocContentLocationOne.java"));
+                new File(getPath("InputXpathJavadocContentLocationOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocContentLocationCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/INTERFACE_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionJavadocContentLocationOne']]"
+                + "[./IDENT[@text='InputXpathJavadocContentLocationOne']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE/BLOCK_COMMENT_BEGIN"
                 + "[./COMMENT_CONTENT[@text='* Text. // warn\\n     ']]"
         );
@@ -64,7 +64,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocContentLocationTwo.java"));
+                new File(getPath("InputXpathJavadocContentLocationTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocContentLocationCheck.class);
@@ -78,7 +78,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionJavadocContentLocationTwo']]"
+                    + "[@text='InputXpathJavadocContentLocationTwo']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE/BLOCK_COMMENT_BEGIN"
                     + "[./COMMENT_CONTENT[@text='*\\n     * Text.\\n     ']]"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java
index d0578470a51..0f22c8da1e8 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocMethodOne.java"));
+                new File(getPath("InputXpathJavadocMethodOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocMethodCheck.class);
@@ -55,13 +55,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodOne']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodOne']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='uninheritableMethod']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodOne']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodOne']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='uninheritableMethod']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodOne']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodOne']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='uninheritableMethod']]/MODIFIERS"
                         + "/LITERAL_PRIVATE");
 
@@ -72,7 +72,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocMethodTwo.java"));
+                new File(getPath("InputXpathJavadocMethodTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocMethodCheck.class);
@@ -84,7 +84,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodTwo']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodTwo']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkParam']]/PARAMETERS"
                         + "/PARAMETER_DEF/IDENT[@text='x']");
 
@@ -95,7 +95,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocMethodThree.java"));
+                new File(getPath("InputXpathJavadocMethodThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocMethodCheck.class);
@@ -107,11 +107,11 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodThree']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkTypeParam']]/TYPE_PARAMETERS"
                         + "/TYPE_PARAMETER[./IDENT[@text='T']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodThree']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodThree']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkTypeParam']]/TYPE_PARAMETERS"
                         + "/TYPE_PARAMETER/IDENT[@text='T']");
 
@@ -122,7 +122,7 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocMethodFour.java"));
+                new File(getPath("InputXpathJavadocMethodFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocMethodCheck.class);
@@ -136,7 +136,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodFour']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodFour']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                         + "/LITERAL_THROWS/IDENT[@text='Exception']");
 
@@ -147,7 +147,7 @@ public void testFour() throws Exception {
     @Test
     public void testFive() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocMethodFive.java"));
+                new File(getPath("InputXpathJavadocMethodFive.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocMethodCheck.class);
@@ -161,7 +161,7 @@ public void testFive() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodFive']]"
+                        + "[./IDENT[@text='InputXpathJavadocMethodFive']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bar']]/SLIST"
                         + "/LITERAL_THROW/EXPR/LITERAL_NEW"
                         + "/DOT[./IDENT[@text='BuildException']]"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java
index d218f920862..f09b0d1798c 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,9 +42,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testMissingTag() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocTypeOne.java"));
+                new File(getPath("InputXpathJavadocTypeMissingTag.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocTypeCheck.class);
@@ -58,12 +58,12 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeOne']]",
+                        + "[./IDENT[@text='InputXpathJavadocTypeMissingTag']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeOne']]"
+                        + "[./IDENT[@text='InputXpathJavadocTypeMissingTag']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeOne']]"
+                        + "[./IDENT[@text='InputXpathJavadocTypeMissingTag']]"
                         + "/MODIFIERS/LITERAL_PUBLIC");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -71,9 +71,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testWrongFormat() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocTypeTwo.java"));
+                new File(getPath("InputXpathJavadocTypeWrongFormat.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocTypeCheck.class);
@@ -87,11 +87,11 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionJavadocTypeTwo']]",
+                        + "[@text='InputXpathJavadocTypeWrongFormat']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionJavadocTypeTwo']]/MODIFIERS",
+                        + "[@text='InputXpathJavadocTypeWrongFormat']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionJavadocTypeTwo']]"
+                        + "[@text='InputXpathJavadocTypeWrongFormat']]"
                         + "/MODIFIERS/LITERAL_PUBLIC");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -99,9 +99,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testIncomplete() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocTypeThree.java"));
+                new File(getPath("InputXpathJavadocTypeIncomplete.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocTypeCheck.class);
@@ -113,12 +113,12 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeThree']]",
+                        + "[./IDENT[@text='InputXpathJavadocTypeIncomplete']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeThree']]"
+                        + "[./IDENT[@text='InputXpathJavadocTypeIncomplete']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeThree']]"
+                        + "[./IDENT[@text='InputXpathJavadocTypeIncomplete']]"
                         + "/MODIFIERS/LITERAL_PUBLIC");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java
index a7e0b143f90..3f90d4cb643 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testPrivateClassFields() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocVariableOne.java"));
+                new File(getPath("InputXpathJavadocVariablePrivateClassFields.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocVariableCheck.class);
@@ -52,13 +52,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathJavadocVariablePrivateClassFields']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='age']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathJavadocVariablePrivateClassFields']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='age']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathJavadocVariablePrivateClassFields']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='age']]/MODIFIERS/LITERAL_PRIVATE"
         );
 
@@ -67,9 +67,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testInnerClassFields() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionJavadocVariableTwo.java"));
+                new File(getPath("InputXpathJavadocVariableInnerClassFields.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(JavadocVariableCheck.class);
@@ -81,15 +81,15 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathJavadocVariableInnerClassFields']]/OBJBLOCK"
                 + "/CLASS_DEF[./IDENT[@text='InnerInner2']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='fData']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathJavadocVariableInnerClassFields']]/OBJBLOCK"
                 + "/CLASS_DEF[./IDENT[@text='InnerInner2']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='fData']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathJavadocVariableInnerClassFields']]/OBJBLOCK"
                 + "/CLASS_DEF[./IDENT[@text='InnerInner2']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='fData']]/MODIFIERS"
                 + "/LITERAL_PUBLIC"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaBodyLengthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaBodyLengthTest.java
index 2b98821dd09..2c9dec27152 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaBodyLengthTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaBodyLengthTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,9 +40,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testDefault() throws Exception {
+    public void testDefaultMax() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionLambdaBodyLength1.java"));
+            "InputXpathLambdaBodyLengthDefaultMax.java"));
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
         final String[] expectedViolation = {
             "7:48: " + getCheckMessage(CLASS, LambdaBodyLengthCheck.MSG_KEY, 11, 10),
@@ -50,7 +50,7 @@ public void testDefault() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionLambdaBodyLength1']]"
+                + "[./IDENT[@text='InputXpathLambdaBodyLengthDefaultMax']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST"
                 + "/VARIABLE_DEF[./IDENT[@text='trimmer']]/ASSIGN/LAMBDA");
 
@@ -58,9 +58,9 @@ public void testDefault() throws Exception {
     }
 
     @Test
-    public void testMaxIsNotDefault() throws Exception {
+    public void testCustomMax() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionLambdaBodyLength2.java"));
+            "InputXpathLambdaBodyLengthCustomMax.java"));
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
         moduleConfig.addProperty("max", "5");
         final String[] expectedViolation = {
@@ -69,7 +69,7 @@ public void testMaxIsNotDefault() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionLambdaBodyLength2']]"
+                + "[./IDENT[@text='InputXpathLambdaBodyLengthCustomMax']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST"
                 + "/VARIABLE_DEF[./IDENT[@text='r']]/ASSIGN/LAMBDA");
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaParameterNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaParameterNameTest.java
index d6da3398766..405c8e37fec 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaParameterNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLambdaParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,9 +40,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionLambdaParameterName1.java"));
+                new File(getPath("InputXpathLambdaParameterNameDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(LambdaParameterNameCheck.class);
@@ -55,7 +55,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                "/COMPILATION_UNIT/CLASS_DEF"
-                       + "[./IDENT[@text='SuppressionXpathRegressionLambdaParameterName1']]"
+                       + "[./IDENT[@text='InputXpathLambdaParameterNameDefault']]"
                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/VARIABLE_DEF["
                        + "./IDENT[@text='trimmer']]/ASSIGN/LAMBDA/IDENT[@text='S']"
         );
@@ -65,9 +65,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testNonDefaultPattern() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionLambdaParameterName2.java"));
+                new File(getPath("InputXpathLambdaParameterNameNonDefaultPattern.java"));
 
         final String nonDefaultPattern = "^_[a-zA-Z0-9]*$";
 
@@ -82,30 +82,30 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionLambdaParameterName2']]"
+                        + "[./IDENT[@text='InputXpathLambdaParameterNameNonDefaultPattern']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/"
                         + "VARIABLE_DEF[./IDENT[@text='trimmer']]/ASSIGN/LAMBDA/PARAMETERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionLambdaParameterName2']]"
+                        + "[./IDENT[@text='InputXpathLambdaParameterNameNonDefaultPattern']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/"
                         + "VARIABLE_DEF[./IDENT[@text='trimmer']]/ASSIGN/LAMBDA/PARAMETERS"
                         + "/PARAMETER_DEF[./IDENT[@text='s']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionLambdaParameterName2']]"
+                        + "[./IDENT[@text='InputXpathLambdaParameterNameNonDefaultPattern']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST"
                         + "/VARIABLE_DEF[./IDENT[@text='trimmer']]/ASSIGN/LAMBDA/PARAMETERS"
                         + "/PARAMETER_DEF[./IDENT[@text='s']]/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionLambdaParameterName2']]"
+                        + "[./IDENT[@text='InputXpathLambdaParameterNameNonDefaultPattern']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/"
                         + "VARIABLE_DEF[./IDENT[@text='trimmer']]/ASSIGN/LAMBDA/PARAMETERS"
                         + "/PARAMETER_DEF[./IDENT[@text='s']]/TYPE",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionLambdaParameterName2']]"
+                        + "[./IDENT[@text='InputXpathLambdaParameterNameNonDefaultPattern']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/"
                         + "VARIABLE_DEF[./IDENT[@text='trimmer']]/ASSIGN/LAMBDA/PARAMETERS"
                         + "/PARAMETER_DEF/IDENT[@text='s']"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLeftCurlyTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLeftCurlyTest.java
index 6b621ae6e5b..a94af219be7 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLeftCurlyTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLeftCurlyTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionLeftCurlyOne.java"));
+                new File(getPath("InputXpathLeftCurlyOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(LeftCurlyCheck.class);
@@ -54,9 +54,9 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionLeftCurlyOne']]/OBJBLOCK",
+                    + "[./IDENT[@text='InputXpathLeftCurlyOne']]/OBJBLOCK",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionLeftCurlyOne']]/OBJBLOCK/LCURLY"
+                    + "[./IDENT[@text='InputXpathLeftCurlyOne']]/OBJBLOCK/LCURLY"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -66,22 +66,22 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionLeftCurlyTwo.java"));
+                new File(getPath("InputXpathLeftCurlyTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(LeftCurlyCheck.class);
         moduleConfig.addProperty("option", LeftCurlyOption.NL.toString());
 
         final String[] expectedViolation = {
-            "3:53: " + getCheckMessage(LeftCurlyCheck.class,
-                LeftCurlyCheck.MSG_KEY_LINE_NEW, "{", 53),
+            "3:37: " + getCheckMessage(LeftCurlyCheck.class,
+                LeftCurlyCheck.MSG_KEY_LINE_NEW, "{", 37),
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionLeftCurlyTwo']]/OBJBLOCK",
+                    + "[./IDENT[@text='InputXpathLeftCurlyTwo']]/OBJBLOCK",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionLeftCurlyTwo']]/OBJBLOCK/LCURLY"
+                    + "[./IDENT[@text='InputXpathLeftCurlyTwo']]/OBJBLOCK/LCURLY"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -91,7 +91,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionLeftCurlyThree.java"));
+                new File(getPath("InputXpathLeftCurlyThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(LeftCurlyCheck.class);
@@ -103,7 +103,7 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionLeftCurlyThree']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathLeftCurlyThree']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='sample']]/SLIST/LITERAL_IF/SLIST"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLocalFinalVariableNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLocalFinalVariableNameTest.java
new file mode 100644
index 00000000000..5b20c6b4ce1
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionLocalFinalVariableNameTest.java
@@ -0,0 +1,115 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck.MSG_INVALID_PATTERN;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck;
+
+public class XpathRegressionLocalFinalVariableNameTest extends AbstractXpathTestSupport {
+
+    private final String checkName = LocalFinalVariableNameCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testResource() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathLocalFinalVariableNameResource.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(LocalFinalVariableNameCheck.class);
+        moduleConfig.addProperty("format", "^[A-Z][A-Z0-9]*$");
+        moduleConfig.addProperty("tokens", "PARAMETER_DEF,RESOURCE");
+
+        final String[] expectedViolation = {
+            "7:21: " + getCheckMessage(LocalFinalVariableNameCheck.class,
+                    MSG_INVALID_PATTERN, "scanner", "^[A-Z][A-Z0-9]*$"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathLocalFinalVariableNameResource']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='MyMethod']]/SLIST/LITERAL_TRY"
+                        + "/RESOURCE_SPECIFICATION/RESOURCES/RESOURCE/IDENT[@text='scanner']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testVariable() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathLocalFinalVariableNameVar.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(LocalFinalVariableNameCheck.class);
+        moduleConfig.addProperty("format", "^[A-Z][a-z0-9]*$");
+
+        final String[] expectedViolation = {
+            "5:19: " + getCheckMessage(LocalFinalVariableNameCheck.class,
+                    MSG_INVALID_PATTERN, "VAR1", "^[A-Z][a-z0-9]*$"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathLocalFinalVariableNameVar']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='MyMethod']]/SLIST/VARIABLE_DEF"
+                        + "/IDENT[@text='VAR1']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testInnerClass() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathLocalFinalVariableNameInner.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(LocalFinalVariableNameCheck.class);
+        moduleConfig.addProperty("format", "^[A-Z][a-z0-9]*$");
+
+        final String[] expectedViolation = {
+            "8:23: " + getCheckMessage(LocalFinalVariableNameCheck.class,
+                        MSG_INVALID_PATTERN, "VAR1", "^[A-Z][a-z0-9]*$"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathLocalFinalVariableNameInner']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK"
+                        + "/METHOD_DEF[./IDENT[@text='MyMethod']]/SLIST/VARIABLE_DEF"
+                        + "/IDENT[@text='VAR1']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMagicNumberTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMagicNumberTest.java
new file mode 100644
index 00000000000..9f74327746a
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMagicNumberTest.java
@@ -0,0 +1,116 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck;
+
+public class XpathRegressionMagicNumberTest extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+        return MagicNumberCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testVariable() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMagicNumberVariable.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MagicNumberCheck.class);
+
+        final String[] expectedViolation = {
+            "5:13: " + getCheckMessage(MagicNumberCheck.class, MagicNumberCheck.MSG_KEY, "5"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+            "/COMPILATION_UNIT/CLASS_DEF"
+                    + "[./IDENT[@text='InputXpathMagicNumberVariable']]"
+                    + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='d']]"
+                    + "/ASSIGN/EXPR[./NUM_INT[@text='5']]",
+            "/COMPILATION_UNIT/CLASS_DEF"
+                    + "[./IDENT[@text='InputXpathMagicNumberVariable']]"
+                    + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='d']]"
+                    + "/ASSIGN/EXPR/NUM_INT[@text='5']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+            expectedXpathQueries);
+    }
+
+    @Test
+    public void testMethodDef() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMagicNumberMethodDef.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MagicNumberCheck.class);
+
+        final String[] expectedViolation = {
+            "5:17: " + getCheckMessage(MagicNumberCheck.class, MagicNumberCheck.MSG_KEY, "20"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                        + "[./IDENT[@text='InputXpathMagicNumberMethodDef']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodWithMagicNumber']]"
+                        + "/SLIST/VARIABLE_DEF[./IDENT[@text='x']]/ASSIGN/EXPR[./"
+                        + "NUM_INT[@text='20']]",
+                "/COMPILATION_UNIT/CLASS_DEF"
+                        + "[./IDENT[@text='InputXpathMagicNumberMethodDef']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodWithMagicNumber']]"
+                        + "/SLIST/VARIABLE_DEF[./IDENT[@text='x']]/ASSIGN/EXPR/NU"
+                        + "M_INT[@text='20']"
+        );
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testAnotherVariable() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMagicNumberAnotherVariable.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MagicNumberCheck.class);
+
+        final String[] expectedViolation = {
+            "13:21: " + getCheckMessage(MagicNumberCheck.class, MagicNumberCheck.MSG_KEY, "20"),
+        };
+
+        final List<String> expectedXpathQueries = List.of(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                        + "[./IDENT[@text='InputXpathMagicNumberAnotherVariable']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='performOperation']]"
+                        + "/SLIST/LITERAL_TRY/LITERAL_CATCH/SLIST/LITERAL_IF"
+                        + "/LITERAL_ELSE/SLIST/EXPR/ASSIGN"
+                        + "[./IDENT[@text='a']]/NUM_INT[@text='20']"
+        );
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMatchXpathTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMatchXpathTest.java
index 182aea9a446..a01131fc02a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMatchXpathTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMatchXpathTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathOne.java"));
+                new File(getPath("InputXpathMatchXpathOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MatchXpathCheck.class);
@@ -53,11 +53,11 @@ public void testOne() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionMatchXpathOne']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathMatchXpathOne']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionMatchXpathOne']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathMatchXpathOne']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionMatchXpathOne']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathMatchXpathOne']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -68,7 +68,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathTwo.java"));
+                new File(getPath("InputXpathMatchXpathTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MatchXpathCheck.class);
@@ -81,7 +81,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathTwo']]"
+                        + "[./IDENT[@text='InputXpathMatchXpathTwo']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='func1']]"
                         + "/LITERAL_THROWS[./IDENT[@text='RuntimeException']]"
         );
@@ -93,7 +93,7 @@ public void testTwo() throws Exception {
     @Test
     public void testEncodedQuoteString() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedQuoteString.java"));
+                new File(getPath("InputXpathMatchXpathEncodedQuoteString.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -106,11 +106,11 @@ public void testEncodedQuoteString() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedQuoteString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedQuoteString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='quoteChar']]/ASSIGN/EXPR"
                     + "[./STRING_LITERAL[@text='\\&quot;testOne\\&quot;']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedQuoteString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedQuoteString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='quoteChar']]/ASSIGN/EXPR"
                     + "/STRING_LITERAL[@text='\\&quot;testOne\\&quot;']"
         );
@@ -122,7 +122,7 @@ public void testEncodedQuoteString() throws Exception {
     @Test
     public void testEncodedLessString() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedLessString.java"));
+                new File(getPath("InputXpathMatchXpathEncodedLessString.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -135,11 +135,11 @@ public void testEncodedLessString() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedLessString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedLessString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='lessChar']]/ASSIGN/EXPR"
                     + "[./STRING_LITERAL[@text='&lt;testTwo']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedLessString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedLessString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='lessChar']]/ASSIGN/EXPR/"
                     + "STRING_LITERAL[@text='&lt;testTwo']"
         );
@@ -151,7 +151,7 @@ public void testEncodedLessString() throws Exception {
     @Test
     public void testEncodedNewLineString() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedNewLineString.java"));
+                new File(getPath("InputXpathMatchXpathEncodedNewLineString.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -164,11 +164,11 @@ public void testEncodedNewLineString() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedNewLineString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedNewLineString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='newLineChar']]/ASSIGN/EXPR"
                     + "[./STRING_LITERAL[@text='testFive\\n']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedNewLineString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedNewLineString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='newLineChar']]/ASSIGN/EXPR"
                     + "/STRING_LITERAL[@text='testFive\\n']"
         );
@@ -180,7 +180,7 @@ public void testEncodedNewLineString() throws Exception {
     @Test
     public void testGreaterString() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedGreaterString.java"));
+                new File(getPath("InputXpathMatchXpathEncodedGreaterString.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -193,11 +193,11 @@ public void testGreaterString() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedGreaterString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedGreaterString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='greaterChar']]/ASSIGN/EXPR"
                     + "[./STRING_LITERAL[@text='&gt;testFour']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedGreaterString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedGreaterString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='greaterChar']]/ASSIGN/EXPR"
                     + "/STRING_LITERAL[@text='&gt;testFour']"
         );
@@ -209,7 +209,7 @@ public void testGreaterString() throws Exception {
     @Test
     public void testEncodedAmpString() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedAmpString.java"));
+                new File(getPath("InputXpathMatchXpathEncodedAmpString.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -222,11 +222,11 @@ public void testEncodedAmpString() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAmpString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedAmpString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='ampersandChar']]/ASSIGN/EXPR"
                     + "[./STRING_LITERAL[@text='&amp;testThree']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAmpString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedAmpString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='ampersandChar']]/ASSIGN/EXPR"
                     + "/STRING_LITERAL[@text='&amp;testThree']"
         );
@@ -238,7 +238,7 @@ public void testEncodedAmpString() throws Exception {
     @Test
     public void testEncodedAposString() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedAposString.java"));
+                new File(getPath("InputXpathMatchXpathEncodedAposString.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -251,11 +251,11 @@ public void testEncodedAposString() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAposString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedAposString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='aposChar']]/ASSIGN/EXPR"
                     + "[./STRING_LITERAL[@text='&apos;&apos;SingleQuoteOnBothSide&apos;&apos;']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAposString']]/"
+                    + "[./IDENT[@text='InputXpathMatchXpathEncodedAposString']]/"
                     + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='aposChar']]/ASSIGN/EXPR"
                     + "/STRING_LITERAL[@text='&apos;&apos;SingleQuoteOnBothSide&apos;&apos;']"
         );
@@ -267,7 +267,7 @@ public void testEncodedAposString() throws Exception {
     @Test
     public void testEncodedCarriageString() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionMatchXpathEncodedCarriageString.java"));
+            new File(getPath("InputXpathMatchXpathEncodedCarriageString.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -280,12 +280,12 @@ public void testEncodedCarriageString() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedCarriage"
-                        + "String']]/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='carriageChar']]/ASSIGN"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedCarriageString"
+                        + "']]/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='carriageChar']]/ASSIGN"
                         + "/EXPR[./STRING_LITERAL[@text='carriageCharAtEnd\\r']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedCarriage"
-                        + "String']]/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='carriageChar']]/ASSIGN"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedCarriageString"
+                        + "']]/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='carriageChar']]/ASSIGN"
                         + "/EXPR/STRING_LITERAL[@text='carriageCharAtEnd\\r']"
         );
 
@@ -296,7 +296,7 @@ public void testEncodedCarriageString() throws Exception {
     @Test
     public void testEncodedAmpersandChars() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedAmpChar.java"));
+                new File(getPath("InputXpathMatchXpathEncodedAmpChar.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -309,11 +309,11 @@ public void testEncodedAmpersandChars() throws Exception {
 
         final List<String> expectedXpathQueriesForAmpersand = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAmpChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedAmpChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='ampChar']]/ASSIGN/EXPR"
                         + "[./CHAR_LITERAL[@text='&apos;&apos;&amp;&apos;&apos;']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAmpChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedAmpChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='ampChar']]/ASSIGN/EXPR"
                         + "/CHAR_LITERAL[@text='&apos;&apos;&amp;&apos;&apos;']"
         );
@@ -325,7 +325,7 @@ public void testEncodedAmpersandChars() throws Exception {
     @Test
     public void testEncodedQuoteChar() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedQuotChar.java"));
+                new File(getPath("InputXpathMatchXpathEncodedQuoteChar.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -338,11 +338,11 @@ public void testEncodedQuoteChar() throws Exception {
 
         final List<String> expectedXpathQueriesForQuote = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedQuotChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedQuoteChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='quotChar']]/ASSIGN/EXPR"
                         + "[./CHAR_LITERAL[@text='&apos;&apos;\\&quot;&apos;&apos;']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedQuotChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedQuoteChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='quotChar']]/ASSIGN/EXPR/"
                         + "CHAR_LITERAL[@text='&apos;&apos;\\&quot;&apos;&apos;']"
         );
@@ -354,7 +354,7 @@ public void testEncodedQuoteChar() throws Exception {
     @Test
     public void testEncodedLessChar() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedLessChar.java"));
+                new File(getPath("InputXpathMatchXpathEncodedLessChar.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -367,11 +367,11 @@ public void testEncodedLessChar() throws Exception {
 
         final List<String> expectedXpathQueriesForLess = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedLessChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedLessChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='lessChar']]/ASSIGN/EXPR"
                         + "[./CHAR_LITERAL[@text='&apos;&apos;&lt;&apos;&apos;']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedLessChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedLessChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='lessChar']]/ASSIGN/EXPR/"
                         + "CHAR_LITERAL[@text='&apos;&apos;&lt;&apos;&apos;']"
         );
@@ -383,7 +383,7 @@ public void testEncodedLessChar() throws Exception {
     @Test
     public void testEncodedAposChar() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedAposChar.java"));
+                new File(getPath("InputXpathMatchXpathEncodedAposChar.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -396,11 +396,11 @@ public void testEncodedAposChar() throws Exception {
 
         final List<String> expectedXpathQueriesForApos = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAposChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedAposChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='aposChar']]/ASSIGN/EXPR"
                         + "[./CHAR_LITERAL[@text='&apos;&apos;\\&apos;&apos;&apos;&apos;']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncodedAposChar']]/"
+                        + "[./IDENT[@text='InputXpathMatchXpathEncodedAposChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='aposChar']]/ASSIGN/EXPR/"
                         + "CHAR_LITERAL[@text='&apos;&apos;\\&apos;&apos;&apos;&apos;']"
         );
@@ -412,7 +412,7 @@ public void testEncodedAposChar() throws Exception {
     @Test
     public void testEncodedGreaterChar() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathEncodedGreaterChar.java"));
+                new File(getPath("InputXpathMatchXpathEncodedGreaterChar.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(IllegalTokenCheck.class);
@@ -425,13 +425,13 @@ public void testEncodedGreaterChar() throws Exception {
 
         final List<String> expectedXpathQueriesForGreater = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncoded"
-                        + "GreaterChar']]/"
+                        + "[./IDENT[@text='"
+                        + "InputXpathMatchXpathEncodedGreaterChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='greaterChar']]/ASSIGN/EXPR"
                         + "[./CHAR_LITERAL[@text='&apos;&apos;&gt;&apos;&apos;']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMatchXpathEncoded"
-                        + "GreaterChar']]/"
+                        + "[./IDENT[@text='"
+                        + "InputXpathMatchXpathEncodedGreaterChar']]/"
                         + "OBJBLOCK/VARIABLE_DEF[./IDENT[@text='greaterChar']]/ASSIGN/EXPR/"
                         + "CHAR_LITERAL[@text='&apos;&apos;&gt;&apos;&apos;']"
         );
@@ -443,7 +443,7 @@ public void testEncodedGreaterChar() throws Exception {
     @Test
     public void testFollowing() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMatchXpathThree.java"));
+                new File(getPath("InputXpathMatchXpathThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MatchXpathCheck.class);
@@ -456,7 +456,7 @@ public void testFollowing() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                        + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionMatchXpathThree']]"
+                        + "/CLASS_DEF[./IDENT[@text='InputXpathMatchXpathThree']]"
                         + "/OBJBLOCK/RCURLY"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMemberNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMemberNameTest.java
index 88b74c37232..4c1e4f3137f 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMemberNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMemberNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void test1() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMemberName1.java"));
+                new File(getPath("InputXpathMemberNameDefault.java"));
 
         final String pattern = "^[a-z][a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -55,7 +55,7 @@ public void test1() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionMemberName1']]"
+                        + "='InputXpathMemberNameDefault']]"
                         + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='NUM2']"
         );
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -63,9 +63,9 @@ public void test1() throws Exception {
     }
 
     @Test
-    public void test2() throws Exception {
+    public void testIgnoreProtected() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMemberName2.java"));
+                new File(getPath("InputXpathMemberNameIgnoreProtected.java"));
 
         final String pattern = "^m[A-Z][a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -82,7 +82,7 @@ public void test2() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionMemberName2']]"
+                        + "='InputXpathMemberNameIgnoreProtected']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]"
                         + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='NUM1']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodCountTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodCountTest.java
index f9dea22d252..895d09ecc60 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodCountTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodCountTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionMethodCount1.java")
+            getPath("InputXpathMethodCountDefault.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -52,14 +52,14 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMethodCount1']]",
+                        + "[./IDENT[@text='InputXpathMethodCountDefault']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMethodCount1']]"
+                        + "[./IDENT[@text='InputXpathMethodCountDefault']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMethodCount1']]"
+                        + "[./IDENT[@text='InputXpathMethodCountDefault']]"
                     + "/LITERAL_CLASS"
         );
 
@@ -67,9 +67,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testPrivate() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionMethodCount2.java")
+            getPath("InputXpathMethodCountPrivate.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -83,14 +83,14 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount2']]",
+                    + "[./IDENT[@text='InputXpathMethodCountPrivate']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount2']]"
+                    + "[./IDENT[@text='InputXpathMethodCountPrivate']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount2']]"
+                    + "[./IDENT[@text='InputXpathMethodCountPrivate']]"
                     + "/LITERAL_CLASS"
         );
 
@@ -98,9 +98,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testPackage() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionMethodCount1.java")
+            getPath("InputXpathMethodCountDefault.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -114,14 +114,14 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount1']]",
+                    + "[./IDENT[@text='InputXpathMethodCountDefault']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount1']]"
+                    + "[./IDENT[@text='InputXpathMethodCountDefault']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount1']]"
+                    + "[./IDENT[@text='InputXpathMethodCountDefault']]"
                     + "/LITERAL_CLASS"
         );
 
@@ -129,9 +129,9 @@ public void testThree() throws Exception {
     }
 
     @Test
-    public void testFour() throws Exception {
+    public void testProtected() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionMethodCount3.java")
+            getPath("InputXpathMethodCountProtected.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -145,14 +145,14 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount3']]",
+                    + "[./IDENT[@text='InputXpathMethodCountProtected']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount3']]"
+                    + "[./IDENT[@text='InputXpathMethodCountProtected']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount3']]"
+                    + "[./IDENT[@text='InputXpathMethodCountProtected']]"
                     + "/LITERAL_CLASS"
         );
 
@@ -160,9 +160,9 @@ public void testFour() throws Exception {
     }
 
     @Test
-    public void testFive() throws Exception {
+    public void testPublic() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionMethodCount4.java")
+            getPath("InputXpathMethodCountPublic.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -176,14 +176,14 @@ public void testFive() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount4']]",
+                    + "[./IDENT[@text='InputXpathMethodCountPublic']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount4']]"
+                    + "[./IDENT[@text='InputXpathMethodCountPublic']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMethodCount4']]"
+                    + "[./IDENT[@text='InputXpathMethodCountPublic']]"
                     + "/LITERAL_CLASS"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodLengthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodLengthTest.java
new file mode 100644
index 00000000000..dafebfd929c
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodLengthTest.java
@@ -0,0 +1,138 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.sizes.MethodLengthCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.sizes.MethodLengthCheck;
+
+public class XpathRegressionMethodLengthTest extends AbstractXpathTestSupport {
+
+    private final String checkName = MethodLengthCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testSimple() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMethodLengthSimple.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(MethodLengthCheck.class);
+        moduleConfig.addProperty("max", "10");
+
+        final String[] expectedViolations = {
+            "4:5: " + getCheckMessage(MethodLengthCheck.class, MSG_KEY,
+                    11, 10, "InputXpathMethodLengthSimple"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSimple']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSimple']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSimple']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSimple']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSimple']]"
+                        + "/OBJBLOCK/CTOR_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSimple']]"
+                        + "/MODIFIERS/LITERAL_PROTECTED"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testNoEmptyLines() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMethodLengthNoEmptyLines.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(MethodLengthCheck.class);
+        moduleConfig.addProperty("max", "5");
+        moduleConfig.addProperty("countEmpty", "false");
+        moduleConfig.addProperty("tokens", "METHOD_DEF");
+
+        final String[] expectedViolations = {
+            "15:5: " + getCheckMessage(MethodLengthCheck.class, MSG_KEY, 6, 5, "methodOne"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthNoEmptyLines']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodOne']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthNoEmptyLines']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodOne']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthNoEmptyLines']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodOne']]"
+                        + "/MODIFIERS/LITERAL_PROTECTED"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testSingleToken() throws Exception {
+        final File fileToProcess = new File(
+                getPath("InputXpathMethodLengthSingleToken.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(MethodLengthCheck.class);
+        moduleConfig.addProperty("max", "1");
+        moduleConfig.addProperty("tokens", "METHOD_DEF");
+
+        final String[] expectedViolations = {
+            "9:9: " + getCheckMessage(MethodLengthCheck.class, MSG_KEY, 3, 1, "methodOne"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSingleToken']]"
+                        + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a']]/ASSIGN/EXPR/LITERAL_NEW"
+                        + "[./IDENT[@text='InputXpathMethodLengthSingleToken']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodOne']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSingleToken']]"
+                        + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a']]/ASSIGN/EXPR/LITERAL_NEW"
+                        + "[./IDENT[@text='InputXpathMethodLengthSingleToken']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodOne']]/MODIFIERS",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                        + "[@text='InputXpathMethodLengthSingleToken']]"
+                        + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a']]/ASSIGN/EXPR/LITERAL_NEW"
+                        + "[./IDENT[@text='InputXpathMethodLengthSingleToken']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='methodOne']]"
+                        + "/MODIFIERS/LITERAL_PUBLIC"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodNameTest.java
index bc0ec2bfd08..5892d062882 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void test1() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMethodName1.java"));
+                new File(getPath("InputXpathMethodNameDefault.java"));
 
         final String pattern = "^[a-z][a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -55,7 +55,7 @@ public void test1() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionMethodName1']]"
+                        + "='InputXpathMethodNameDefault']]"
                         + "/OBJBLOCK/METHOD_DEF/IDENT[@text='SecondMethod']"
         );
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -63,9 +63,9 @@ public void test1() throws Exception {
     }
 
     @Test
-    public void test2() throws Exception {
+    public void testInnerClass() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMethodName2.java"));
+                new File(getPath("InputXpathMethodNameInner.java"));
 
         final String pattern = "^[a-z](_?[a-zA-Z0-9]+)*$";
         final DefaultConfiguration moduleConfig =
@@ -80,7 +80,7 @@ public void test2() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionMethodName2']]"
+                        + "='InputXpathMethodNameInner']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]"
                         + "/OBJBLOCK/METHOD_DEF/IDENT[@text='MyMethod2']"
         );
@@ -89,9 +89,9 @@ public void test2() throws Exception {
     }
 
     @Test
-    public void test3() throws Exception {
+    public void testCustomProperties() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMethodName3.java"));
+                new File(getPath("InputXpathMethodNameCustomProperties.java"));
 
         final String pattern = "^[a-z](_?[a-zA-Z0-9]+)*$";
         final DefaultConfiguration moduleConfig =
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodParamPadTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodParamPadTest.java
index 07be430b5fd..fa761b4cf99 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodParamPadTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodParamPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMethodParamPadOne.java"));
+                new File(getPath("InputXpathMethodParamPadOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MethodParamPadCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionMethodParamPadOne']]/OBJBLOCK"
+                + "[@text='InputXpathMethodParamPadOne']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='InputMethodParamPad']]/LPAREN"
         );
 
@@ -63,7 +63,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMethodParamPadTwo.java"));
+                new File(getPath("InputXpathMethodParamPadTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MethodParamPadCheck.class);
@@ -75,7 +75,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionMethodParamPadTwo']]/OBJBLOCK"
+                + "[@text='InputXpathMethodParamPadTwo']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='sayHello']]/LPAREN"
         );
 
@@ -86,7 +86,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMethodParamPadThree.java"));
+                new File(getPath("InputXpathMethodParamPadThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MethodParamPadCheck.class);
@@ -99,7 +99,7 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                + "[@text='SuppressionXpathRegressionMethodParamPadThree']]/OBJBLOCK"
+                + "[@text='InputXpathMethodParamPadThree']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='sayHello']]/LPAREN"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodTypeParameterNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodTypeParameterNameTest.java
new file mode 100644
index 00000000000..4ab22b258d1
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMethodTypeParameterNameTest.java
@@ -0,0 +1,126 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck.MSG_INVALID_PATTERN;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck;
+
+public class XpathRegressionMethodTypeParameterNameTest extends AbstractXpathTestSupport {
+
+    private final String checkName = MethodTypeParameterNameCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void test1() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMethodTypeParameterNameDefault.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MethodTypeParameterNameCheck.class);
+
+        final String[] expectedViolation = {
+            "4:11: " + getCheckMessage(MethodTypeParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "TT", "^[A-Z]$"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./"
+                  + "IDENT[@text='InputXpathMethodTypeParameterNameDefault']]"
+                  + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/TYPE_PARAMETERS"
+                  + "/TYPE_PARAMETER[./IDENT[@text='TT']]", "/COMPILATION_UNIT"
+                  + "/CLASS_DEF[./IDENT["
+                  + "@text='InputXpathMethodTypeParameterNameDefault']]"
+                  + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
+                  + "/TYPE_PARAMETERS/TYPE_PARAMETER/IDENT[@text='TT']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void test2() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMethodTypeParameterNameInner.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MethodTypeParameterNameCheck.class);
+        moduleConfig.addProperty("format", "^foo$");
+
+        final String[] expectedViolation = {
+            "6:10: " + getCheckMessage(MethodTypeParameterNameCheck.class,
+                    MSG_INVALID_PATTERN, "fo_", "^foo$"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                  + "@text='InputXpathMethodTypeParameterNameInner']]"
+                  + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Junk']]/OBJBLOCK"
+                  + "/METHOD_DEF[./IDENT[@text='foo']]/TYPE_PARAMETERS"
+                  + "/TYPE_PARAMETER[./IDENT[@text='fo_']]", "/COMPILATION_UNIT"
+                  + "/CLASS_DEF[./IDENT[@text="
+                  + "'InputXpathMethodTypeParameterNameInner']]"
+                  + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Junk']]/OBJBLOCK"
+                  + "/METHOD_DEF[./IDENT[@text='foo']]/TYPE_PARAMETERS"
+                  + "/TYPE_PARAMETER/IDENT[@text='fo_']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void test3() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathMethodTypeParameterNameLowercase.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MethodTypeParameterNameCheck.class);
+        moduleConfig.addProperty("format", "^[a-z]$");
+
+        final String[] expectedViolation = {
+            "7:6: " + getCheckMessage(MethodTypeParameterNameCheck.class,
+                        MSG_INVALID_PATTERN, "a_a", "^[a-z]$"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                  + "[@text='InputXpathMethodTypeParameterNameLowercase']]"
+                  + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myMethod']]/TYPE_PARAMETERS"
+                  + "/TYPE_PARAMETER[./IDENT[@text='a_a']]", "/COMPILATION_UNIT"
+                  + "/CLASS_DEF[./IDENT[@text="
+                  + "'InputXpathMethodTypeParameterNameLowercase']]"
+                  + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myMethod']]"
+                  + "/TYPE_PARAMETERS/TYPE_PARAMETER/IDENT[@text='a_a']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingCtorTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingCtorTest.java
index e382799c7b5..dc0fb2d7114 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingCtorTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingCtorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testMissingCtor() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingCtor1.java"));
+                "InputXpathMissingCtor.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingCtorCheck.class);
@@ -52,11 +52,11 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMissingCtor1']]",
+                    + "[./IDENT[@text='InputXpathMissingCtor']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMissingCtor1']]/MODIFIERS",
+                    + "[./IDENT[@text='InputXpathMissingCtor']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionMissingCtor1']]/MODIFIERS/LITERAL_PUBLIC"
+                    + "@text='InputXpathMissingCtor']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -64,9 +64,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testInnerClass() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingCtor2.java"));
+                "InputXpathMissingCtorInner.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingCtorCheck.class);
@@ -78,13 +78,13 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionMissingCtor2']]"
+                    + "@text='InputXpathMissingCtorInner']]"
                     + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionMissingCtor2']]"
+                    + "@text='InputXpathMissingCtorInner']]"
                     + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionMissingCtor2']]"
+                    + "@text='InputXpathMissingCtorInner']]"
                     + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/LITERAL_CLASS"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocMethodTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocMethodTest.java
index b9da91959db..d8a546d8f88 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocMethodTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocMethodTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testMissingJavadocMethodCtor() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionMissingJavadocMethod1.java")
+            getPath("InputXpathMissingJavadocMethodCtor.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -52,20 +52,20 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionMissingJavadocMethod1']]"
+                    + "[@text='InputXpathMissingJavadocMethodCtor']]"
                     + "/OBJBLOCK/CTOR_DEF[."
-                    + "/IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod1']]",
+                    + "/IDENT[@text='InputXpathMissingJavadocMethodCtor']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod1']]"
+                    + "[./IDENT[@text='InputXpathMissingJavadocMethodCtor']]"
                     + "/OBJBLOCK/CTOR_DEF[."
-                    + "/IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod1']]"
+                    + "/IDENT[@text='InputXpathMissingJavadocMethodCtor']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod1']]"
+                    + "[./IDENT[@text='InputXpathMissingJavadocMethodCtor']]"
                     + "/OBJBLOCK/CTOR_DEF[."
-                    + "/IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod1']]"
+                    + "/IDENT[@text='InputXpathMissingJavadocMethodCtor']]"
                     + "/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -73,9 +73,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testMissingJavadocMethod() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionMissingJavadocMethod2.java")
+            getPath("InputXpathMissingJavadocMethod.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -89,16 +89,16 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod2']]"
+                    + "[./IDENT[@text='InputXpathMissingJavadocMethod']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod2']]"
+                    + "[./IDENT[@text='InputXpathMissingJavadocMethod']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocMethod2']]"
+                    + "[./IDENT[@text='InputXpathMissingJavadocMethod']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                     + "/MODIFIERS/LITERAL_PUBLIC"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocPackageTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocPackageTest.java
index 2e1238ddc7e..3caadb6f6a2 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocPackageTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocPackageTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocTypeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocTypeTest.java
index f6853f293f1..f5917ae8521 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocTypeTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingJavadocTypeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testClass() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingJavadocTypeClass.java"
+                "InputXpathMissingJavadocTypeClass.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -54,12 +54,12 @@ public void testClass() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeClass']]",
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeClass']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeClass']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeClass']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeClass']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeClass']]"
                         + "/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -69,7 +69,7 @@ public void testClass() throws Exception {
     @Test
     public void testScope() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingJavadocTypeScope.java"
+                "InputXpathMissingJavadocTypeScope.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -84,13 +84,13 @@ public void testScope() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeScope']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeScope']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeScope']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeScope']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeScope']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeScope']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/MODIFIERS/LITERAL_PRIVATE"
         );
 
@@ -100,7 +100,7 @@ public void testScope() throws Exception {
     @Test
     public void testExcluded() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingJavadocTypeExcluded.java"
+                "InputXpathMissingJavadocTypeExcluded.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -116,13 +116,13 @@ public void testExcluded() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeExcluded']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeExcluded']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeExcluded']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeExcluded']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingJavadocTypeExcluded']]"
+                        + "[./IDENT[@text='InputXpathMissingJavadocTypeExcluded']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/MODIFIERS/LITERAL_PRIVATE"
         );
 
@@ -132,7 +132,7 @@ public void testExcluded() throws Exception {
     @Test
     public void testAnnotation() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingJavadocTypeAnnotation.java"
+                "InputXpathMissingJavadocTypeAnnotation.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -147,17 +147,17 @@ public void testAnnotation() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionMissingJavadocTypeAnnotation']]"
+                        + "'InputXpathMissingJavadocTypeAnnotation']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionMissingJavadocTypeAnnotation']]"
+                        + "'InputXpathMissingJavadocTypeAnnotation']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionMissingJavadocTypeAnnotation']]"
+                        + "'InputXpathMissingJavadocTypeAnnotation']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='TestAnnotation2']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionMissingJavadocTypeAnnotation']]"
+                        + "'InputXpathMissingJavadocTypeAnnotation']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='TestAnnotation2']]/AT"
         );
@@ -168,7 +168,7 @@ public void testAnnotation() throws Exception {
     @Test
     public void testToken() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingJavadocTypeToken.java"
+                "InputXpathMissingJavadocTypeToken.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -183,12 +183,12 @@ public void testToken() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionMissingJavadocTypeToken']]",
+                        + "'InputXpathMissingJavadocTypeToken']]",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionMissingJavadocTypeToken']]"
+                        + "'InputXpathMissingJavadocTypeToken']]"
                         + "/MODIFIERS",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionMissingJavadocTypeToken']]"
+                        + "'InputXpathMissingJavadocTypeToken']]"
                         + "/MODIFIERS/LITERAL_PUBLIC"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java
index 0d6b4e0b5c7..58ca781698f 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingOverrideTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testClass() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingOverrideClass.java"));
+                "InputXpathMissingOverrideClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingOverrideCheck.class);
@@ -52,13 +52,13 @@ public void testClass() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideClass']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideClass']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideClass']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideClass']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideClass']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideClass']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS/LITERAL_PUBLIC"
 
         );
@@ -71,7 +71,7 @@ public void testClass() throws Exception {
     @Test
     public void testInterface() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingOverrideInterface.java"));
+                "InputXpathMissingOverrideInterface.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingOverrideCheck.class);
@@ -83,16 +83,16 @@ public void testInterface() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE/LITERAL_BOOLEAN"
 
         );
@@ -105,7 +105,7 @@ public void testInterface() throws Exception {
     @Test
     public void testAnonymous() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingOverrideAnonymous.java"));
+                "InputXpathMissingOverrideAnonymous.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingOverrideCheck.class);
@@ -117,17 +117,17 @@ public void testAnonymous() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideAnonymous']]"
+                        + "[@text='InputXpathMissingOverrideAnonymous']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='r']]/ASSIGN/EXPR/"
                         + "LITERAL_NEW[./IDENT[@text='Runnable']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='run']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideAnonymous']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideAnonymous']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='r']]/ASSIGN/EXPR/"
                         + "LITERAL_NEW[./IDENT[@text='Runnable']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='run']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideAnonymous']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideAnonymous']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='r']]/ASSIGN/EXPR/"
                         + "LITERAL_NEW[./IDENT[@text='Runnable']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='run']]/MODIFIERS/LITERAL_PUBLIC"
@@ -140,9 +140,9 @@ public void testAnonymous() throws Exception {
     }
 
     @Test
-    public void testInheritDocInvalid1() throws Exception {
+    public void testInheritDocInvalidPrivateMethod() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingOverrideInheritDocInvalid1.java"));
+                "InputXpathMissingOverrideInheritDocInvalidPrivateMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingOverrideCheck.class);
@@ -154,13 +154,13 @@ public void testInheritDocInvalid1() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInheritDocInvalid1']]"
+                        + "[@text='InputXpathMissingOverrideInheritDocInvalidPrivateMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInheritDocInvalid1']]"
+                        + "[@text='InputXpathMissingOverrideInheritDocInvalidPrivateMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInheritDocInvalid1']]"
+                        + "[@text='InputXpathMissingOverrideInheritDocInvalidPrivateMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS/LITERAL_PRIVATE"
 
         );
@@ -171,9 +171,9 @@ public void testInheritDocInvalid1() throws Exception {
     }
 
     @Test
-    public void testInheritDocInvalid2() throws Exception {
+    public void testInheritDocInvalidPublicMethod() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingOverrideInheritDocInvalid2.java"));
+                "InputXpathMissingOverrideInheritDocInvalidPublicMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingOverrideCheck.class);
@@ -185,13 +185,13 @@ public void testInheritDocInvalid2() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInheritDocInvalid2']]"
+                        + "[@text='InputXpathMissingOverrideInheritDocInvalidPublicMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInheritDocInvalid2']]"
+                        + "[@text='InputXpathMissingOverrideInheritDocInvalidPublicMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInheritDocInvalid2']]"
+                        + "[@text='InputXpathMissingOverrideInheritDocInvalidPublicMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS/LITERAL_PUBLIC"
 
         );
@@ -202,9 +202,9 @@ public void testInheritDocInvalid2() throws Exception {
     }
 
     @Test
-    public void testJavaFiveCompatibility1() throws Exception {
+    public void testJavaFiveCompatibilityOne() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingOverrideClass.java"));
+                "InputXpathMissingOverrideClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingOverrideCheck.class);
@@ -217,13 +217,13 @@ public void testJavaFiveCompatibility1() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideClass']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideClass']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideClass']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideClass']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingOverrideClass']]"
+                        + "[./IDENT[@text='InputXpathMissingOverrideClass']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS/LITERAL_PUBLIC"
 
         );
@@ -234,9 +234,9 @@ public void testJavaFiveCompatibility1() throws Exception {
     }
 
     @Test
-    public void testJavaFiveCompatibility2() throws Exception {
+    public void testJavaFiveCompatibilityTwo() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionMissingOverrideInterface.java"));
+                "InputXpathMissingOverrideInterface.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MissingOverrideCheck.class);
@@ -249,16 +249,16 @@ public void testJavaFiveCompatibility2() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE",
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionMissingOverrideInterface']]"
+                        + "[@text='InputXpathMissingOverrideInterface']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE/LITERAL_BOOLEAN"
 
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingSwitchDefaultTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingSwitchDefaultTest.java
index d23e4418f59..bb1d58d0881 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingSwitchDefaultTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMissingSwitchDefaultTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testSimple() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMissingSwitchDefaultOne.java"));
+                new File(getPath("InputXpathMissingSwitchDefaultSimple.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clss);
         final String[] expectedViolation = {
@@ -50,7 +50,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingSwitchDefaultOne']]"
+                        + "[./IDENT[@text='InputXpathMissingSwitchDefaultSimple']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test1']]"
                         + "/SLIST/LITERAL_SWITCH"
         );
@@ -59,9 +59,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testNested() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionMissingSwitchDefaultTwo.java"));
+                new File(getPath("InputXpathMissingSwitchDefaultNested.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clss);
 
@@ -71,11 +71,11 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingSwitchDefaultTwo']]"
+                        + "[./IDENT[@text='InputXpathMissingSwitchDefaultNested']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test2']]"
                         + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionMissingSwitchDefaultTwo']]"
+                        + "[./IDENT[@text='InputXpathMissingSwitchDefaultNested']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test2']]"
                         + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/"
                         + "LITERAL_SWITCH"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionModifierOrderTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionModifierOrderTest.java
index 409f389cbad..70f2241e0a5 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionModifierOrderTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionModifierOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testMethod() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionModifierOrderMethod.java"));
+            getPath("InputXpathModifierOrderMethod.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -52,11 +52,11 @@ public void testMethod() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionModifierOrderMethod']]"
+                        + "[@text='InputXpathModifierOrderMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/MODIFIERS"
                         + "/ANNOTATION[./IDENT[@text='MethodAnnotation']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionModifierOrderMethod']]"
+                        + "[@text='InputXpathModifierOrderMethod']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/MODIFIERS"
                         + "/ANNOTATION[./IDENT[@text='MethodAnnotation']]/AT");
 
@@ -66,7 +66,7 @@ public void testMethod() throws Exception {
     @Test
     public void testVariable() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionModifierOrderVariable.java"));
+            getPath("InputXpathModifierOrderVariable.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -77,7 +77,7 @@ public void testVariable() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionModifierOrderVariable']]"
+                        + "[@text='InputXpathModifierOrderVariable']]"
                         + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='var']]/MODIFIERS/LITERAL_PRIVATE");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
@@ -86,7 +86,7 @@ public void testVariable() throws Exception {
     @Test
     public void testAnnotation() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionModifierOrderAnnotation.java"));
+            getPath("InputXpathModifierOrderAnnotation.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -97,10 +97,10 @@ public void testAnnotation() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/ANNOTATION_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionModifierOrderAnnotation']]"
+                        + "[@text='InputXpathModifierOrderAnnotation']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='InterfaceAnnotation']]",
                 "/COMPILATION_UNIT/ANNOTATION_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionModifierOrderAnnotation']]"
+                        + "[@text='InputXpathModifierOrderAnnotation']]"
                         + "/MODIFIERS/ANNOTATION[./IDENT[@text='InterfaceAnnotation']]/AT");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleStringLiteralsTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleStringLiteralsTest.java
new file mode 100644
index 00000000000..43f14d838b8
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleStringLiteralsTest.java
@@ -0,0 +1,147 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck;
+
+public class XpathRegressionMultipleStringLiteralsTest extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+
+        return MultipleStringLiteralsCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testDefault() throws Exception {
+        final File fileToProcess = new File(
+                getPath("InputXpathMultipleStringLiteralsDefault.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MultipleStringLiteralsCheck.class);
+
+        final String[] expectedViolations = {
+            "4:16: " + getCheckMessage(MultipleStringLiteralsCheck.class,
+                    MSG_KEY, "\"StringContents\"", 2),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                    + "[./IDENT[@text='InputXpathMultipleStringLiteralsDefault']]"
+                    + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a']]"
+                    + "/ASSIGN/EXPR[./STRING_LITERAL[@text='StringContents']]",
+                 "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathMultipleStringLiteralsDefault']]"
+                + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a']]"
+                + "/ASSIGN/EXPR/STRING_LITERAL[@text='StringContents']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testAllowDuplicates() throws Exception {
+        final File fileToProcess = new File(
+                getPath("InputXpathMultipleStringLiteralsAllowDuplicates.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MultipleStringLiteralsCheck.class);
+        moduleConfig.addProperty("allowedDuplicates", "2");
+
+        final String[] expectedViolations = {
+            "8:19: " + getCheckMessage(MultipleStringLiteralsCheck.class,
+                    MSG_KEY, "\", \"", 3),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathMultipleStringLiteralsAllowDuplicates']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myTest']]/SLIST/VARIABLE_DEF"
+                + "[./IDENT[@text='a5']]/ASSIGN/EXPR/PLUS[./STRING_LITERAL[@text=', ']]"
+                + "/PLUS/STRING_LITERAL[@text=', ']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testIgnoreRegexp() throws Exception {
+        final File fileToProcess = new File(
+                getPath("InputXpathMultipleStringLiteralsIgnoreRegexp.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MultipleStringLiteralsCheck.class);
+        moduleConfig.addProperty("ignoreStringsRegexp", "((\"\")|(\", \"))$");
+
+        final String[] expectedViolations = {
+            "7:19: " + getCheckMessage(MultipleStringLiteralsCheck.class,
+                    MSG_KEY, "\"DoubleString\"", 2),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathMultipleStringLiteralsIgnoreRegexp']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myTest']]/SLIST/VARIABLE_DEF"
+                + "[./IDENT[@text='a3']]/ASSIGN/EXPR/PLUS/STRING_LITERAL[@text='DoubleString']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testIgnoreOccurrenceContext() throws Exception {
+        final String filePath =
+                "InputXpathMultipleStringLiteralsIgnoreOccurrenceContext.java";
+        final File fileToProcess = new File(getPath(filePath));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(MultipleStringLiteralsCheck.class);
+        moduleConfig.addProperty("ignoreOccurrenceContext", "");
+
+        final String[] expectedViolations = {
+            "5:17: " + getCheckMessage(MultipleStringLiteralsCheck.class,
+                    MSG_KEY, "\"unchecked\"", 3),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+               "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
+               + "'InputXpathMultipleStringLiteralsIgnoreOccurrenceContext']]"
+               + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a1']]"
+               + "/ASSIGN/EXPR[./STRING_LITERAL[@text='unchecked']]",
+               "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
+               + "'InputXpathMultipleStringLiteralsIgnoreOccurrenceContext']]"
+               + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a1']]"
+               + "/ASSIGN/EXPR/STRING_LITERAL[@text='unchecked']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleVariableDeclarationsTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleVariableDeclarationsTest.java
index 053e5f03681..8955720a1fc 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleVariableDeclarationsTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionMultipleVariableDeclarationsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testCommaSeparator() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionMultipleVariableDeclarationsOne.java"));
+                getPath("InputXpathMultipleVariableDeclarationsCommaSeparator.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MultipleVariableDeclarationsCheck.class);
@@ -52,28 +52,28 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i']]",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i']]/TYPE",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i']]/TYPE/LITERAL_INT",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='j']]",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='j']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='j']]/TYPE",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsOne']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarationsCommaSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='j']]/TYPE/LITERAL_INT"
         );
 
@@ -82,9 +82,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testMultipleVariableDeclarations() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionMultipleVariableDeclarationsTwo.java"));
+                getPath("InputXpathMultipleVariableDeclarations.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(MultipleVariableDeclarationsCheck.class);
@@ -96,16 +96,16 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsTwo']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarations']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i1']]",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsTwo']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarations']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i1']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsTwo']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarations']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i1']]/TYPE",
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionMultipleVariableDeclarationsTwo']]/OBJBLOCK"
+                + "@text='InputXpathMultipleVariableDeclarations']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='i1']]/TYPE/LITERAL_INT"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNPathComplexityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNPathComplexityTest.java
index ecdf28f718f..b791c19108a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNPathComplexityTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNPathComplexityTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,9 +40,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testMethod() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNPathComplexityOne.java"));
+                new File(getPath("InputXpathNPathComplexityMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NPathComplexityCheck.class);
@@ -55,13 +55,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNPathComplexityOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNPathComplexityMethod']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNPathComplexityOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNPathComplexityMethod']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNPathComplexityOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNPathComplexityMethod']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -70,9 +70,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testStaticBlock() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNPathComplexityTwo.java"));
+                new File(getPath("InputXpathNPathComplexityStaticBlock.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NPathComplexityCheck.class);
@@ -85,7 +85,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNPathComplexityTwo']]"
+                + "[./IDENT[@text='InputXpathNPathComplexityStaticBlock']]"
                 + "/OBJBLOCK/STATIC_INIT"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNeedBracesTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNeedBracesTest.java
index c6bd9c3640d..00c146c5579 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNeedBracesTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNeedBracesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testDo() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionNeedBracesDo.java"));
+                "InputXpathNeedBracesDo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NeedBracesCheck.class);
@@ -52,7 +52,7 @@ public void testDo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionNeedBracesDo']]"
+                        + "[./IDENT[@text='InputXpathNeedBracesDo']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_DO"
         );
 
@@ -63,7 +63,7 @@ public void testDo() throws Exception {
     @Test
     public void testSingleLine() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionNeedBracesSingleLine.java"));
+                "InputXpathNeedBracesSingleLine.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NeedBracesCheck.class);
@@ -75,7 +75,7 @@ public void testSingleLine() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNeedBracesSingleLine']]"
+                + "[./IDENT[@text='InputXpathNeedBracesSingleLine']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_IF"
         );
 
@@ -86,7 +86,7 @@ public void testSingleLine() throws Exception {
     @Test
     public void testSingleLineLambda() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionNeedBracesSingleLineLambda.java"));
+                "InputXpathNeedBracesSingleLineLambda.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NeedBracesCheck.class);
@@ -99,7 +99,7 @@ public void testSingleLineLambda() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNeedBracesSingleLineLambda']]"
+                + "[./IDENT[@text='InputXpathNeedBracesSingleLineLambda']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='r3']]/ASSIGN/LAMBDA"
         );
 
@@ -110,7 +110,7 @@ public void testSingleLineLambda() throws Exception {
     @Test
     public void testEmptyLoopBody() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionNeedBracesEmptyLoopBody.java"));
+                "InputXpathNeedBracesEmptyLoopBody.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NeedBracesCheck.class);
@@ -121,7 +121,7 @@ public void testEmptyLoopBody() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNeedBracesEmptyLoopBody']]"
+                + "[./IDENT[@text='InputXpathNeedBracesEmptyLoopBody']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_WHILE"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedForDepthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedForDepthTest.java
index e9166e16404..55e7d299346 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedForDepthTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedForDepthTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testCorrect() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNestedForDepth.java"));
+                new File(getPath("InputXpathNestedForDepth.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NestedForDepthCheck.class);
@@ -52,7 +52,7 @@ public void testCorrect() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNestedForDepth']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNestedForDepth']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_FOR"
                 + "/SLIST/LITERAL_FOR/SLIST/LITERAL_FOR"
         );
@@ -64,7 +64,7 @@ public void testCorrect() throws Exception {
     @Test
     public void testMax() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNestedForDepthMax.java"));
+                new File(getPath("InputXpathNestedForDepthMax.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NestedForDepthCheck.class);
@@ -77,7 +77,7 @@ public void testMax() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNestedForDepthMax']]"
+                + "[./IDENT[@text='InputXpathNestedForDepthMax']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/LITERAL_FOR/"
                 + "SLIST/LITERAL_FOR/"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedIfDepthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedIfDepthTest.java
index 4977b550ab5..3f7f2246de2 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedIfDepthTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedIfDepthTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testCorrect() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNestedIfDepth.java"));
+                new File(getPath("InputXpathNestedIfDepth.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NestedIfDepthCheck.class);
@@ -52,7 +52,7 @@ public void testCorrect() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNestedIfDepth']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNestedIfDepth']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_IF"
                 + "/SLIST/LITERAL_IF/SLIST/LITERAL_IF"
         );
@@ -64,7 +64,7 @@ public void testCorrect() throws Exception {
     @Test
     public void testMax() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionNestedIfDepthMax.java"));
+            new File(getPath("InputXpathNestedIfDepthMax.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(NestedIfDepthCheck.class);
@@ -77,7 +77,7 @@ public void testMax() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNestedIfDepthMax']]"
+                + "[./IDENT[@text='InputXpathNestedIfDepthMax']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/LITERAL_IF/"
                 + "SLIST/LITERAL_IF/"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedTryDepthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedTryDepthTest.java
index 4f8a260db4c..0b809ce7cac 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedTryDepthTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNestedTryDepthTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testCorrect() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNestedTryDepth.java"));
+                new File(getPath("InputXpathNestedTryDepth.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NestedTryDepthCheck.class);
@@ -52,7 +52,7 @@ public void testCorrect() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNestedTryDepth']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNestedTryDepth']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_TRY/SLIST"
                 + "/LITERAL_TRY/SLIST/LITERAL_TRY"
         );
@@ -64,7 +64,7 @@ public void testCorrect() throws Exception {
     @Test
     public void testMax() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionNestedTryDepthMax.java"));
+            new File(getPath("InputXpathNestedTryDepthMax.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(NestedTryDepthCheck.class);
@@ -77,7 +77,7 @@ public void testMax() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNestedTryDepthMax']]"
+                + "[./IDENT[@text='InputXpathNestedTryDepthMax']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/LITERAL_TRY"
                 + "/SLIST/LITERAL_TRY"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoArrayTrailingCommaTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoArrayTrailingCommaTest.java
index 0ec07ca862d..3244fb771ed 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoArrayTrailingCommaTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoArrayTrailingCommaTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNoArrayTrailingCommaOne.java"));
+                new File(getPath("InputXpathNoArrayTrailingCommaOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoArrayTrailingCommaCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionNoArrayTrailingCommaOne']]"
+                    + "[@text='InputXpathNoArrayTrailingCommaOne']]"
                     + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='t1']]/ASSIGN/EXPR"
                     + "/LITERAL_NEW/ARRAY_INIT/COMMA[4]"
         );
@@ -64,7 +64,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNoArrayTrailingCommaTwo.java"));
+                new File(getPath("InputXpathNoArrayTrailingCommaTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoArrayTrailingCommaCheck.class);
@@ -76,7 +76,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoArrayTrailingCommaTwo']]"
+                    + "[./IDENT[@text='InputXpathNoArrayTrailingCommaTwo']]"
                     + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='t4']]"
                     + "/ASSIGN/EXPR/LITERAL_NEW/ARRAY_INIT/COMMA"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoCloneTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoCloneTest.java
index 210619d68ba..bcea4e6bac8 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoCloneTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoCloneTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testMethod() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNoCloneOne.java"));
+                new File(getPath("InputXpathNoCloneMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoCloneCheck.class);
@@ -51,13 +51,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoCloneOne']]/OBJBLOCK"
+                    + "[./IDENT[@text='InputXpathNoCloneMethod']]/OBJBLOCK"
                     + "/METHOD_DEF[./IDENT[@text='clone']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoCloneOne']]/OBJBLOCK"
+                    + "[./IDENT[@text='InputXpathNoCloneMethod']]/OBJBLOCK"
                     + "/METHOD_DEF[./IDENT[@text='clone']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoCloneOne']]/OBJBLOCK"
+                    + "[./IDENT[@text='InputXpathNoCloneMethod']]/OBJBLOCK"
                     + "/METHOD_DEF[./IDENT[@text='clone']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -68,7 +68,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNoCloneTwo.java"));
+                new File(getPath("InputXpathNoCloneInnerClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoCloneCheck.class);
@@ -78,15 +78,15 @@ public void testTwo() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoCloneTwo']]"
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathNoCloneInnerClass']]"
                         + "/OBJBLOCK"
                         + "/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK"
                         + "/METHOD_DEF[./IDENT[@text='clone']]",
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoCloneTwo']]"
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathNoCloneInnerClass']]"
                         + "/OBJBLOCK"
                         + "/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='clone']]/MODIFIERS",
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionNoCloneTwo']]"
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathNoCloneInnerClass']]"
                         + "/OBJBLOCK"
                         + "/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK"
                         + "/METHOD_DEF[./IDENT[@text='clone']]/MODIFIERS/LITERAL_PUBLIC"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoEnumTrailingCommaTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoEnumTrailingCommaTest.java
index 830cf98ac11..b2a12ddca0f 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoEnumTrailingCommaTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoEnumTrailingCommaTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionNoEnumTrailingCommaOne.java"));
+                "InputXpathNoEnumTrailingCommaOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoEnumTrailingCommaCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoEnumTrailingCommaOne']]"
+                    + "[./IDENT[@text='InputXpathNoEnumTrailingCommaOne']]"
                     + "/OBJBLOCK/ENUM_DEF[./IDENT[@text='Foo3']]/OBJBLOCK/COMMA[2]"
         );
 
@@ -62,7 +62,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionNoEnumTrailingCommaTwo.java"));
+                "InputXpathNoEnumTrailingCommaTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoEnumTrailingCommaCheck.class);
@@ -74,7 +74,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoEnumTrailingCommaTwo']]"
+                    + "[./IDENT[@text='InputXpathNoEnumTrailingCommaTwo']]"
                     + "/OBJBLOCK/ENUM_DEF[./IDENT[@text='Foo6']]/OBJBLOCK/COMMA[2]"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoFinalizerTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoFinalizerTest.java
index cd0bd5fba70..90dc6f46f30 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoFinalizerTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoFinalizerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testMain() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionNoFinalizer1.java"));
+                getPath("InputXpathNoFinalizerMain.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoFinalizerCheck.class);
@@ -50,13 +50,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoFinalizer1']]"
+                + "[./IDENT[@text='InputXpathNoFinalizerMain']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='finalize']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoFinalizer1']]"
+                + "[./IDENT[@text='InputXpathNoFinalizerMain']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoFinalizer1']]"
+                + "[./IDENT[@text='InputXpathNoFinalizerMain']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS/LITERAL_PROTECTED"
         );
 
@@ -65,9 +65,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testInner() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionNoFinalizer2.java"));
+                getPath("InputXpathNoFinalizerInner.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoFinalizerCheck.class);
@@ -79,20 +79,20 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]"
+                + "[./IDENT[@text='InputXpathNoFinalizerInner']]"
                 + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/"
                 + "METHOD_DEF[./IDENT[@text='finalize']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]"
+                + "[./IDENT[@text='InputXpathNoFinalizerInner']]"
                 + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/"
                 + "METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]"
+                + "[./IDENT[@text='InputXpathNoFinalizerInner']]"
                 + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/"
                 + "METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS/"
                 + "ANNOTATION[./IDENT[@text='Override']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoFinalizer2']]"
+                + "[./IDENT[@text='InputXpathNoFinalizerInner']]"
                 + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/"
                 + "METHOD_DEF[./IDENT[@text='finalize']]/MODIFIERS/"
                 + "ANNOTATION[./IDENT[@text='Override']]/AT"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoLineWrapTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoLineWrapTest.java
index 63621e91753..86be6f22fac 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoLineWrapTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoLineWrapTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionNoLineWrap1.java")
+                getPath("InputXpathNoLineWrapDefault.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -57,9 +57,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testMethodDef() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionNoLineWrap2.java")
+                getPath("InputXpathNoLineWrapTokensMethodDef.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -73,16 +73,16 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionNoLineWrap2']]"
+                    + "[@text='InputXpathNoLineWrapTokensMethodDef']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test2']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionNoLineWrap2']]"
+                    + "[@text='InputXpathNoLineWrapTokensMethodDef']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test2']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                    + "[@text='SuppressionXpathRegressionNoLineWrap2']]"
+                    + "[@text='InputXpathNoLineWrapTokensMethodDef']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test2']]"
                     + "/MODIFIERS/LITERAL_PUBLIC"
 
@@ -92,9 +92,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testTokensCtorDef() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionNoLineWrap3.java")
+                getPath("InputXpathNoLineWrapTokensCtorDef.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -108,17 +108,17 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoLineWrap3']]"
-                    + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='SuppressionXpathRegressionNoLineWrap3']]",
+                    + "[./IDENT[@text='InputXpathNoLineWrapTokensCtorDef']]"
+                    + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='InputXpathNoLineWrapTokensCtorDef']]",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoLineWrap3']]"
-                    + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='SuppressionXpathRegressionNoLineWrap3']]"
+                    + "[./IDENT[@text='InputXpathNoLineWrapTokensCtorDef']]"
+                    + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='InputXpathNoLineWrapTokensCtorDef']]"
                     + "/MODIFIERS",
 
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionNoLineWrap3']]"
-                    + "/OBJBLOCK/CTOR_DEF/IDENT[@text='SuppressionXpathRegressionNoLineWrap3']"
+                    + "[./IDENT[@text='InputXpathNoLineWrapTokensCtorDef']]"
+                    + "/OBJBLOCK/CTOR_DEF/IDENT[@text='InputXpathNoLineWrapTokensCtorDef']"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceAfterTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceAfterTest.java
index 175232a0b6e..fc7cbd4da5a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceAfterTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceAfterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testNoWhitespaceAfter() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNoWhitespaceAfter.java"));
+                new File(getPath("InputXpathNoWhitespaceAfter.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoWhitespaceAfterCheck.class);
@@ -53,10 +53,10 @@ public void testNoWhitespaceAfter() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceAfter']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNoWhitespaceAfter']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceAfter']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNoWhitespaceAfter']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR/UNARY_MINUS["
                 + "./NUM_INT[@text='1']]"
         );
@@ -68,7 +68,7 @@ public void testNoWhitespaceAfter() throws Exception {
     @Test
     public void testTokens() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNoWhitespaceAfterTokens.java"));
+                new File(getPath("InputXpathNoWhitespaceAfterTokens.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoWhitespaceAfterCheck.class);
@@ -81,7 +81,7 @@ public void testTokens() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceAfterTokens']]"
+                + "[./IDENT[@text='InputXpathNoWhitespaceAfterTokens']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/TYPE/DOT[./IDENT[@text='String']]"
                 + "/DOT[./IDENT[@text='java']]"
@@ -94,7 +94,7 @@ public void testTokens() throws Exception {
     @Test
     public void testAllowLineBreaks() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionNoWhitespaceAfterLineBreaks.java"));
+            new File(getPath("InputXpathNoWhitespaceAfterLineBreaks.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(NoWhitespaceAfterCheck.class);
@@ -107,20 +107,20 @@ public void testAllowLineBreaks() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceAfterLineBreaks']]"
+                + "[./IDENT[@text='InputXpathNoWhitespaceAfterLineBreaks']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='s']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceAfterLineBreaks']]"
+                + "[./IDENT[@text='InputXpathNoWhitespaceAfterLineBreaks']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='s']]"
                 + "/MODIFIERS",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceAfterLineBreaks']]"
+                + "[./IDENT[@text='InputXpathNoWhitespaceAfterLineBreaks']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='s']]/TYPE",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceAfterLineBreaks']]"
+                + "[./IDENT[@text='InputXpathNoWhitespaceAfterLineBreaks']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='s']]"
                 + "/TYPE/DOT[./IDENT[@text='String']]"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest.java
index 96bf40cd534..57fbe7f115a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeCaseDefaultColonTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     public void testOne() throws Exception {
         final File fileToProcess =
                 new File(getPath(
-                        "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java"));
+                        "InputXpathNoWhitespaceBeforeCaseDefaultColonOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class);
@@ -54,7 +54,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                    + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne']]"
+                    + "'InputXpathNoWhitespaceBeforeCaseDefaultColonOne']]"
                     + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP/LITERAL_CASE/COLON"
         );
 
@@ -66,7 +66,7 @@ public void testOne() throws Exception {
     public void testTwo() throws Exception {
         final File fileToProcess =
                 new File(getPath(
-                        "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java"));
+                        "InputXpathNoWhitespaceBeforeCaseDefaultColonTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class);
@@ -78,7 +78,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                    + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo']]"
+                    + "'InputXpathNoWhitespaceBeforeCaseDefaultColonTwo']]"
                     + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP"
                     + "/LITERAL_DEFAULT/COLON"
         );
@@ -91,7 +91,7 @@ public void testTwo() throws Exception {
     public void testThree() throws Exception {
         final File fileToProcess =
                 new File(getPath(
-                        "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java"));
+                        "InputXpathNoWhitespaceBeforeCaseDefaultColonThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class);
@@ -103,7 +103,7 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                    + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree']]"
+                    + "'InputXpathNoWhitespaceBeforeCaseDefaultColonThree']]"
                     + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP"
                     + "/LITERAL_CASE/COLON"
         );
@@ -116,7 +116,7 @@ public void testThree() throws Exception {
     public void testFour() throws Exception {
         final File fileToProcess =
                 new File(getPath(
-                        "SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java"));
+                        "InputXpathNoWhitespaceBeforeCaseDefaultColonFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoWhitespaceBeforeCaseDefaultColonCheck.class);
@@ -128,7 +128,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                    + "'SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour']]"
+                    + "'InputXpathNoWhitespaceBeforeCaseDefaultColonFour']]"
                     + "/OBJBLOCK/INSTANCE_INIT/SLIST/LITERAL_SWITCH/CASE_GROUP"
                     + "/LITERAL_DEFAULT/COLON"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeTest.java
index 211c2a763d3..65816fd555b 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionNoWhitespaceBeforeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testNoWhitespaceBefore() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionNoWhitespaceBefore.java"));
+                new File(getPath("InputXpathNoWhitespaceBefore.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(NoWhitespaceBeforeCheck.class);
@@ -52,7 +52,7 @@ public void testNoWhitespaceBefore() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceBefore']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathNoWhitespaceBefore']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/SEMI"
         );
 
@@ -63,7 +63,7 @@ public void testNoWhitespaceBefore() throws Exception {
     @Test
     public void testTokens() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionNoWhitespaceBeforeTokens.java"));
+            new File(getPath("InputXpathNoWhitespaceBeforeTokens.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(NoWhitespaceBeforeCheck.class);
@@ -76,7 +76,7 @@ public void testTokens() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceBeforeTokens']]"
+                + "[./IDENT[@text='InputXpathNoWhitespaceBeforeTokens']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/TYPE/DOT[./IDENT[@text='String']]"
                 + "/DOT[./IDENT[@text='java']]"
@@ -89,7 +89,7 @@ public void testTokens() throws Exception {
     @Test
     public void testAllowLineBreaks() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionNoWhitespaceBeforeLineBreaks.java"));
+            new File(getPath("InputXpathNoWhitespaceBeforeLineBreaks.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(NoWhitespaceBeforeCheck.class);
@@ -102,7 +102,7 @@ public void testAllowLineBreaks() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionNoWhitespaceBeforeLineBreaks']]"
+                + "[./IDENT[@text='InputXpathNoWhitespaceBeforeLineBreaks']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='array']]"
                 + "/ASSIGN/ARRAY_INIT/COMMA"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneStatementPerLineTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneStatementPerLineTest.java
index b36cf561348..d7af3fe0ccf 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneStatementPerLineTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneStatementPerLineTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testClassFields() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionOneStatementPerLineOne.java"));
+                new File(getPath("InputXpathOneStatementPerLineClassFields.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OneStatementPerLineCheck.class);
@@ -52,7 +52,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionOneStatementPerLineOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathOneStatementPerLineClassFields']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='j']]/SEMI"
         );
 
@@ -61,9 +61,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testForLoopBlock() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionOneStatementPerLineTwo.java"));
+                new File(getPath("InputXpathOneStatementPerLineForLoopBlock.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OneStatementPerLineCheck.class);
@@ -75,7 +75,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionOneStatementPerLineTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathOneStatementPerLineForLoopBlock']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='foo5']]/SLIST/LITERAL_FOR/SLIST/SEMI[2]"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneTopLevelClassTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneTopLevelClassTest.java
index 144ec2db537..9574853414b 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneTopLevelClassTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOneTopLevelClassTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionOneTopLevelClassFirst.java"));
+                new File(getPath("InputXpathOneTopLevelClassFirst.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OneTopLevelClassCheck.class);
@@ -63,7 +63,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionOneTopLevelClassSecond.java"));
+            new File(getPath("InputXpathOneTopLevelClassSecond.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(OneTopLevelClassCheck.class);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOperatorWrapTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOperatorWrapTest.java
index 34713562d1f..28f799392bd 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOperatorWrapTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOperatorWrapTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOperatorWrapNewLine() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionOperatorWrapNewLine.java"));
+                new File(getPath("InputXpathOperatorWrapNewLine.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OperatorWrapCheck.class);
@@ -53,7 +53,7 @@ public void testOperatorWrapNewLine() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionOperatorWrapNewLine']]"
+                        + "='InputXpathOperatorWrapNewLine']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='x']]"
                         + "/ASSIGN/EXPR/MINUS[./NUM_INT[@text='4']]"
@@ -67,7 +67,7 @@ public void testOperatorWrapNewLine() throws Exception {
     @Test
     public void testOperatorWrapPreviousLine() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionOperatorWrapPreviousLine.java"));
+                new File(getPath("InputXpathOperatorWrapPreviousLine.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OperatorWrapCheck.class);
@@ -81,7 +81,7 @@ public void testOperatorWrapPreviousLine() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
              "/COMPILATION_UNIT"
-                + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionOperatorWrapPreviousLine']]"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathOperatorWrapPreviousLine']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='b']]"
                 + "/ASSIGN"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeFilenameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeFilenameTest.java
index 95b287be431..b4cc2d80eda 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeFilenameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeFilenameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testNoPublic() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionOuterTypeFilename1.java"));
+                "InputXpathOuterTypeFilenameOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OuterTypeFilenameCheck.class);
@@ -63,7 +63,7 @@ public void testNoPublic() throws Exception {
     @Test
     public void testNested() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionOuterTypeFilename2.java"));
+                "InputXpathOuterTypeFilenameTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OuterTypeFilenameCheck.class);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeNumberTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeNumberTest.java
index e0637f4e3ef..4ad21fad172 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeNumberTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOuterTypeNumberTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testDefault() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionOuterTypeNumberDefault.java"));
+            new File(getPath("InputXpathOuterTypeNumberDefault.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(OuterTypeNumberCheck.class);
@@ -61,7 +61,7 @@ public void testDefault() throws Exception {
     @Test
     public void testMax() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionOuterTypeNumber.java"));
+                new File(getPath("InputXpathOuterTypeNumber.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(OuterTypeNumberCheck.class);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOverloadMethodsDeclarationOrderTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOverloadMethodsDeclarationOrderTest.java
index 0245e3d9e18..170432f7933 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOverloadMethodsDeclarationOrderTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionOverloadMethodsDeclarationOrderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionOverloadMethodsDeclarationOrder1.java"));
+                getPath("InputXpathOverloadMethodsDeclarationOrderDefault.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -52,13 +52,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionOverloadMethodsDeclarationOrder1']]"
+                        + "[@text='InputXpathOverloadMethodsDeclarationOrderDefault']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='overloadMethod']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionOverloadMethodsDeclarationOrder1']]"
+                        + "[@text='InputXpathOverloadMethodsDeclarationOrderDefault']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='overloadMethod']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
-                        + "[@text='SuppressionXpathRegressionOverloadMethodsDeclarationOrder1']]"
+                        + "[@text='InputXpathOverloadMethodsDeclarationOrderDefault']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='overloadMethod']]"
                         + "/MODIFIERS/LITERAL_PUBLIC"
         );
@@ -67,9 +67,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testAnonymous() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionOverloadMethodsDeclarationOrder2.java"));
+                getPath("InputXpathOverloadMethodsDeclarationOrderAnonymous.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(clazz);
 
@@ -80,19 +80,19 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionOverloadMethodsDeclarationOrder2']]"
+                        + "'InputXpathOverloadMethodsDeclarationOrderAnonymous']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text="
-                        + "'MySuppressionXpathRegressionOverloadMethodsDeclarationOrder2']]"
+                        + "'MyInputXpathOverloadMethodsDeclarationOrderAnonymous']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='overloadMethod']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionOverloadMethodsDeclarationOrder2']]"
+                        + "'InputXpathOverloadMethodsDeclarationOrderAnonymous']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text="
-                        + "'MySuppressionXpathRegressionOverloadMethodsDeclarationOrder2']]"
+                        + "'MyInputXpathOverloadMethodsDeclarationOrderAnonymous']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='overloadMethod']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionOverloadMethodsDeclarationOrder2']]"
+                        + "'InputXpathOverloadMethodsDeclarationOrderAnonymous']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text="
-                        + "'MySuppressionXpathRegressionOverloadMethodsDeclarationOrder2']]"
+                        + "'MyInputXpathOverloadMethodsDeclarationOrderAnonymous']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='overloadMethod']]"
                         + "/MODIFIERS/LITERAL_PUBLIC"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java
index 016dddd58d8..72dc53cfc8c 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     public void testOne() throws Exception {
         final File fileToProcess =
                 new File(getNonCompilablePath(
-                        "SuppressionXpathRegressionPackageAnnotationOne.java"));
+                        "InputXpathPackageAnnotationOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(PackageAnnotationCheck.class);
@@ -62,7 +62,7 @@ public void testOne() throws Exception {
     public void testTwo() throws Exception {
         final File fileToProcess =
                 new File(getNonCompilablePath(
-                        "SuppressionXpathRegressionPackageAnnotationTwo.java"));
+                        "InputXpathPackageAnnotationTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(PackageAnnotationCheck.class);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java
index bf36bc68798..44d90d015e3 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void test1() throws Exception {
+    public void testWrongPackage() throws Exception {
         final File fileToProcess =
-                new File(getNonCompilablePath("SuppressionXpathRegression1.java"));
+                new File(getNonCompilablePath("InputXpathWrongPackage.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(PackageDeclarationCheck.class);
@@ -59,9 +59,9 @@ public void test1() throws Exception {
     }
 
     @Test
-    public void test2() throws Exception {
+    public void testMissingPackage() throws Exception {
         final File fileToProcess =
-                new File(getNonCompilablePath("SuppressionXpathRegression2.java"));
+                new File(getNonCompilablePath("InputXpathMissingPackage.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(PackageDeclarationCheck.class);
@@ -73,11 +73,11 @@ public void test2() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT",
-                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression2']]",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathMissingPackage']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegression2']]/MODIFIERS",
+                        + "[./IDENT[@text='InputXpathMissingPackage']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegression2']]/MODIFIERS/LITERAL_PUBLIC"
+                        + "[./IDENT[@text='InputXpathMissingPackage']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageNameTest.java
new file mode 100644
index 00000000000..11feafb1fef
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageNameTest.java
@@ -0,0 +1,124 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck;
+
+public class XpathRegressionPackageNameTest extends AbstractXpathTestSupport {
+
+    private final String checkName = PackageNameCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testOne() throws Exception {
+
+        final File fileToProcess =
+                new File(getPath("InputXpathPackageNameOne.java"));
+
+        final String pattern = "[A-Z]+";
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(PackageNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+
+        final String[] expectedViolation = {
+            "1:9: " + getCheckMessage(PackageNameCheck.class, MSG_KEY,
+                    "org.checkstyle.suppressionxpathfilter.packagename",
+                    pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/PACKAGE_DEF/DOT"
+                        + "[./IDENT[@text='packagename']]/DOT"
+                        + "[./IDENT[@text='suppressionxpathfilter']]"
+                        + "/DOT/IDENT[@text='org']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+
+    }
+
+    @Test
+    public void testThree() throws Exception {
+
+        final File fileToProcess =
+                new File(getNonCompilablePath("InputXpathPackageNameThree.java"));
+
+        final String pattern = "^[a-z]+(\\.[a-z][a-z0-9]*)*$";
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(PackageNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+        final String[] expectedViolations = {
+            "1:9: " + getCheckMessage(PackageNameCheck.class, MSG_KEY,
+                    "org.checkstyle.suppressionxpathfilter.PACKAGENAME",
+                    pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/PACKAGE_DEF/DOT[./IDENT"
+                        + "[@text='PACKAGENAME']]/DOT[./IDENT"
+                        + "[@text='suppressionxpathfilter']]"
+                        + "/DOT/IDENT[@text='org']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testTwo() throws Exception {
+
+        final File fileToProcess =
+                new File(getPath("InputXpathPackageNameTwo.java"));
+
+        final String pattern = "[A-Z]+";
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(PackageNameCheck.class);
+        moduleConfig.addProperty("format", pattern);
+
+        final String[] expectedViolation = {
+            "2:9: " + getCheckMessage(PackageNameCheck.class, MSG_KEY,
+                    "org.checkstyle.suppressionxpathfilter.packagename",
+                    pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/PACKAGE_DEF/DOT"
+                        + "[./IDENT[@text='packagename']]/DOT"
+                        + "[./IDENT[@text='suppressionxpathfilter']]"
+                        + "/DOT/IDENT[@text='org']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterAssignmentTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterAssignmentTest.java
new file mode 100644
index 00000000000..578924da6e4
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterAssignmentTest.java
@@ -0,0 +1,124 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.coding.ParameterAssignmentCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.ParameterAssignmentCheck;
+
+public class XpathRegressionParameterAssignmentTest extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+        return ParameterAssignmentCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testMethods() throws Exception {
+        final String filePath =
+                getPath("InputXpathParameterAssignmentMethods.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(ParameterAssignmentCheck.class);
+
+        final String[] expectedViolations = {
+            "9:15: " + getCheckMessage(ParameterAssignmentCheck.class, MSG_KEY, "field"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentMethods']]"
+            + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='Test1']]/SLIST/EXPR"
+            + "[./PLUS_ASSIGN/IDENT[@text='field']]",
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentMethods']]"
+            + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='Test1']]"
+            + "/SLIST/EXPR/PLUS_ASSIGN[./IDENT[@text='field']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+
+    }
+
+    @Test
+    public void testLambdas() throws Exception {
+        final String filePath =
+                getPath("InputXpathParameterAssignmentLambdas.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(ParameterAssignmentCheck.class);
+
+        final String[] expectedViolations = {
+            "9:32: " + getCheckMessage(ParameterAssignmentCheck.class, MSG_KEY, "q"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentLambdas']]"
+            + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='obj1']]"
+            + "/ASSIGN/LAMBDA[./IDENT[@text='q']]/EXPR",
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentLambdas']]"
+            + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='obj1']]/ASSIGN/LAMBDA[./IDENT["
+            + "@text='q']]/EXPR/POST_INC[./IDENT[@text='q']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testCtor() throws Exception {
+        final String filePath =
+                getPath("InputXpathParameterAssignmentCtor.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(ParameterAssignmentCheck.class);
+
+        final String[] expectedViolations = {
+            "9:15: " + getCheckMessage(ParameterAssignmentCheck.class, MSG_KEY, "field"),
+        };
+
+        final List<String> expectedXpathQueries = Arrays.asList(
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentCtor']]"
+            + "/OBJBLOCK/CTOR_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentCtor']]"
+            + "/SLIST/EXPR[./PLUS_ASSIGN/IDENT[@text='field']]",
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentCtor']]"
+            + "/OBJBLOCK/CTOR_DEF[./IDENT["
+            + "@text='InputXpathParameterAssignmentCtor']]"
+            + "/SLIST/EXPR/PLUS_ASSIGN[./IDENT[@text='field']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNameTest.java
index 9739fe18e37..9c58147781a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testDefaultPattern() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParameterNameDefaultPattern.java"));
+                new File(getPath("InputXpathParameterNameDefaultPattern.java"));
 
         final String pattern = "^[a-z][a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -55,7 +55,7 @@ public void testDefaultPattern() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionParameterNameDefaultPattern']]"
+                        + "='InputXpathParameterNameDefaultPattern']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method1']]"
                         + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='v_1']"
         );
@@ -66,7 +66,7 @@ public void testDefaultPattern() throws Exception {
     @Test
     public void testDifferentPattern() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParameterNameDifferentPattern.java"));
+                new File(getPath("InputXpathParameterNameDifferentPattern.java"));
 
         final String pattern = "^[a-z][_a-zA-Z0-9]+$";
         final DefaultConfiguration moduleConfig =
@@ -81,7 +81,7 @@ public void testDifferentPattern() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionParameterNameDifferentPattern']]"
+                        + "='InputXpathParameterNameDifferentPattern']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method2']]"
                         + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='V2']"
         );
@@ -92,7 +92,7 @@ public void testDifferentPattern() throws Exception {
     @Test
     public void testIgnoreOverridden() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParameterNameIgnoreOverridden.java"));
+                new File(getPath("InputXpathParameterNameIgnoreOverridden.java"));
 
         final String pattern = "^[a-z][a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -107,7 +107,7 @@ public void testIgnoreOverridden() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionParameterNameIgnoreOverridden']]"
+                        + "='InputXpathParameterNameIgnoreOverridden']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method2']]"
                         + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='V2']"
         );
@@ -118,7 +118,7 @@ public void testIgnoreOverridden() throws Exception {
     @Test
     public void testAccessModifiers() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParameterNameAccessModifier.java"));
+                new File(getPath("InputXpathParameterNameAccessModifier.java"));
 
         final String pattern = "^[a-z][a-z0-9][a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -134,7 +134,7 @@ public void testAccessModifiers() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionParameterNameAccessModifier']]"
+                        + "='InputXpathParameterNameAccessModifier']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method2']]"
                         + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='b']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java
new file mode 100644
index 00000000000..6e110fd7e2c
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParameterNumberTest.java
@@ -0,0 +1,132 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck;
+
+public class XpathRegressionParameterNumberTest extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+        return ParameterNumberCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testDefault() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathParameterNumberDefault.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(ParameterNumberCheck.class);
+
+        final String[] expectedViolations = {
+            "5:10: " + getCheckMessage(ParameterNumberCheck.class, MSG_KEY, 7, 11),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathParameterNumberDefault']]"
+                + "/OBJBLOCK/METHOD_DEF/IDENT[@text='myMethod']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+
+    }
+
+    @Test
+    public void testMethods() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathParameterNumberMethods.java"));
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(ParameterNumberCheck.class);
+        moduleConfig.addProperty("max", "10");
+        moduleConfig.addProperty("tokens", "METHOD_DEF");
+
+        final String[] expectedViolations = {
+            "7:10: " + getCheckMessage(ParameterNumberCheck.class, MSG_KEY, 10, 11),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+               "/COMPILATION_UNIT/CLASS_DEF"
+               + "[./IDENT[@text='InputXpathParameterNumberMethods']]"
+               + "/OBJBLOCK/METHOD_DEF/IDENT[@text='myMethod']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testIgnoreOverriddenMethods() throws Exception {
+        final String filePath =
+                getPath("InputXpathParameterNumberIgnoreOverriddenMethods.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(ParameterNumberCheck.class);
+        moduleConfig.addProperty("ignoreOverriddenMethods", "true");
+
+        final String[] expectedViolations = {
+            "6:13: " + getCheckMessage(ParameterNumberCheck.class, MSG_KEY, 7, 8),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathParameterNumberIgnoreOverriddenMethods']]"
+                + "/OBJBLOCK/CTOR_DEF/IDENT"
+                + "[@text='InputXpathParameterNumberIgnoreOverriddenMethods']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+
+    @Test
+    public void testIgnoreAnnotatedBy() throws Exception {
+        final String filePath =
+                getPath("InputXpathParameterNumberIgnoreAnnotatedBy.java");
+        final File fileToProcess = new File(filePath);
+
+        final DefaultConfiguration moduleConfig = createModuleConfig(ParameterNumberCheck.class);
+        moduleConfig.addProperty("ignoreAnnotatedBy", "MyAnno");
+        moduleConfig.addProperty("max", "2");
+
+        final String[] expectedViolations = {
+            "15:34: " + getCheckMessage(ParameterNumberCheck.class, MSG_KEY, 2, 3),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                + "[./IDENT[@text='InputXpathParameterNumberIgnoreAnnotatedBy']]"
+                + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]"
+                + "/OBJBLOCK/STATIC_INIT/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='Object']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
+                + "/SLIST/LITERAL_IF/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='Object']]"
+                + "/OBJBLOCK/METHOD_DEF/IDENT[@text='checkedMethod']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParenPadTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParenPadTest.java
index 9435a63a72e..4f8c22931e9 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParenPadTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionParenPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     @Test
     public void testLeftFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParenPadLeftFollowed.java"));
+                new File(getPath("InputXpathParenPadLeftFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ParenPadCheck.class);
@@ -54,7 +54,7 @@ public void testLeftFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionParenPadLeftFollowed']]"
+                + "[./IDENT[@text='InputXpathParenPadLeftFollowed']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_IF/LPAREN"
         );
 
@@ -65,7 +65,7 @@ public void testLeftFollowed() throws Exception {
     @Test
     public void testLeftNotFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParenPadLeftNotFollowed.java"));
+                new File(getPath("InputXpathParenPadLeftNotFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ParenPadCheck.class);
@@ -78,7 +78,7 @@ public void testLeftNotFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionParenPadLeftNotFollowed']]"
+                + "[./IDENT[@text='InputXpathParenPadLeftNotFollowed']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_IF/LPAREN"
         );
 
@@ -89,7 +89,7 @@ public void testLeftNotFollowed() throws Exception {
     @Test
     public void testRightPreceded() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParenPadRightPreceded.java"));
+                new File(getPath("InputXpathParenPadRightPreceded.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ParenPadCheck.class);
@@ -101,7 +101,7 @@ public void testRightPreceded() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionParenPadRightPreceded']]"
+                + "[./IDENT[@text='InputXpathParenPadRightPreceded']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_IF/RPAREN"
         );
 
@@ -112,7 +112,7 @@ public void testRightPreceded() throws Exception {
     @Test
     public void testRightNotPreceded() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionParenPadRightNotPreceded.java"));
+                new File(getPath("InputXpathParenPadRightNotPreceded.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ParenPadCheck.class);
@@ -125,7 +125,7 @@ public void testRightNotPreceded() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionParenPadRightNotPreceded']]"
+                + "[./IDENT[@text='InputXpathParenPadRightNotPreceded']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]/SLIST/LITERAL_IF/RPAREN"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java
index 5886fca71e3..4b71fc653ac 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     public void testOne() throws Exception {
         final File fileToProcess =
                 new File(getNonCompilablePath(
-                        "SuppressionXpathRegressionPatternVariableName1.java"));
+                        "InputXpathPatternVariableNameOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(PatternVariableNameCheck.class);
@@ -56,7 +56,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName1']]"
+                + "[./IDENT[@text='InputXpathPatternVariableNameOne']]"
                 + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/EXPR/"
                 + "LITERAL_INSTANCEOF[./IDENT[@text='o1']]/PATTERN_VARIABLE_DEF/"
                 + "IDENT[@text='STRING1']"
@@ -70,7 +70,7 @@ public void testOne() throws Exception {
     public void testTwo() throws Exception {
         final File fileToProcess =
                 new File(getNonCompilablePath(
-                        "SuppressionXpathRegressionPatternVariableName2.java"));
+                        "InputXpathPatternVariableNameTwo.java"));
 
         final String nonDefaultPattern = "^_[a-zA-Z0-9]*$";
 
@@ -85,7 +85,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName2']]"
+                + "[./IDENT[@text='InputXpathPatternVariableNameTwo']]"
                 + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/EXPR/"
                 + "LITERAL_INSTANCEOF[./IDENT[@text='o1']]/"
                 + "PATTERN_VARIABLE_DEF/IDENT[@text='s']"
@@ -99,7 +99,7 @@ public void testTwo() throws Exception {
     public void testThree() throws Exception {
         final File fileToProcess =
                 new File(getNonCompilablePath(
-                        "SuppressionXpathRegressionPatternVariableName3.java"));
+                        "InputXpathPatternVariableNameThree.java"));
 
         final String nonDefaultPattern = "^[a-z](_?[a-zA-Z0-9]+)*$";
 
@@ -114,7 +114,7 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName3']]"
+                    + "[./IDENT[@text='InputXpathPatternVariableNameThree']]"
                     + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/"
                     + "EXPR/LITERAL_INSTANCEOF[./IDENT[@text='o1']]/"
                     + "PATTERN_VARIABLE_DEF/IDENT[@text='STR']"
@@ -128,7 +128,7 @@ public void testThree() throws Exception {
     public void testFour() throws Exception {
         final File fileToProcess =
                 new File(getNonCompilablePath(
-                        "SuppressionXpathRegressionPatternVariableName4.java"));
+                        "InputXpathPatternVariableNameFour.java"));
 
         final String nonDefaultPattern = "^[a-z][_a-zA-Z0-9]{2,}$";
 
@@ -143,7 +143,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                    + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName1']]"
+                    + "[./IDENT[@text='InputXpathPatternVariableNameFour']]"
                     + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/EXPR/"
                     + "LITERAL_INSTANCEOF[./IDENT[@text='o1']]/"
                     + "PATTERN_VARIABLE_DEF/IDENT[@text='st']"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java
index 561e3d2a7a4..29a365b56df 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-                "SuppressionXpathRecordComponentName1.java"));
+                "InputXpathRecordComponentNameDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RecordComponentNameCheck.class);
@@ -53,7 +53,7 @@ public void testOne() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Collections.singletonList(
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentName1']]"
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNameDefault']]"
                 + "/RECORD_COMPONENTS/RECORD_COMPONENT_DEF/IDENT[@text='_value']"
         );
 
@@ -62,9 +62,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testFormat() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-                "SuppressionXpathRecordComponentName2.java"));
+                "InputXpathRecordComponentNameFormat.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RecordComponentNameCheck.class);
@@ -78,7 +78,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRecordComponentName2']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathRecordComponentNameFormat']]/OBJBLOCK"
                 + "/RECORD_DEF[./IDENT[@text='MyRecord']]"
                 + "/RECORD_COMPONENTS/RECORD_COMPONENT_DEF/IDENT[@text='otherValue']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java
index a87a7044018..7ccafe659e8 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-                "SuppressionXpathRecordComponentNumber1.java"));
+                "InputXpathRecordComponentNumberDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RecordComponentNumberCheck.class);
@@ -52,10 +52,10 @@ public void testOne() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber1']]",
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber1']]"
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNumberDefault']]",
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNumberDefault']]"
                     + "/MODIFIERS",
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber1']]"
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNumberDefault']]"
                     + "/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -64,9 +64,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testCustomMax() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-                "SuppressionXpathRecordComponentNumber2.java"));
+                "InputXpathRecordComponentNumberCustomMax.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RecordComponentNumberCheck.class);
@@ -79,11 +79,11 @@ public void testTwo() throws Exception {
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber2']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathRecordComponentNumberCustomMax']]"
                     + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]",
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber2']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathRecordComponentNumberCustomMax']]"
                     + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]/MODIFIERS",
-            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber2']]"
+            "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathRecordComponentNumberCustomMax']]"
                     + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]/MODIFIERS"
                     + "/LITERAL_PUBLIC"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordTypeParameterNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordTypeParameterNameTest.java
index b1562cacb84..441e96a20c2 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordTypeParameterNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordTypeParameterNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testTypeDeclared() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-                "SuppressionXpathRegressionRecordTypeParameterName1.java"));
+                "InputXpathRecordTypeParameterNameTypeDeclared.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RecordTypeParameterNameCheck.class);
@@ -49,14 +49,16 @@ public void testOne() throws Exception {
         final String pattern = "^[A-Z]$";
 
         final String[] expectedViolation = {
-            "7:15: " + getCheckMessage(RecordTypeParameterNameCheck.class,
+            "7:55: " + getCheckMessage(RecordTypeParameterNameCheck.class,
                     AbstractNameCheck.MSG_INVALID_PATTERN, "foo", pattern),
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='Other']]/"
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='"
+                    + "InputXpathRecordTypeParameterNameTypeDeclared']]/"
                     + "TYPE_PARAMETERS/TYPE_PARAMETER[./IDENT[@text='foo']]",
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='Other']]/TYPE_PARAMETERS/"
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='"
+                    + "InputXpathRecordTypeParameterNameTypeDeclared']]/TYPE_PARAMETERS/"
                     + "TYPE_PARAMETER/IDENT[@text='foo']"
         );
 
@@ -65,9 +67,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testTypeDefault() throws Exception {
         final File fileToProcess = new File(getNonCompilablePath(
-                "SuppressionXpathRegressionRecordTypeParameterName2.java"));
+                "InputXpathRecordTypeParameterNameTypeDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RecordTypeParameterNameCheck.class);
@@ -75,14 +77,16 @@ public void testTwo() throws Exception {
         final String pattern = "^[A-Z]$";
 
         final String[] expectedViolation = {
-            "4:44: " + getCheckMessage(RecordTypeParameterNameCheck.class,
+            "4:60: " + getCheckMessage(RecordTypeParameterNameCheck.class,
                     AbstractNameCheck.MSG_INVALID_PATTERN, "t", pattern),
         };
 
         final List<String> expectedXpathQueries = Arrays.asList(
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputRecordTypeParameterName']]"
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT"
+                    + "[@text='InputXpathRecordTypeParameterNameTypeDefault']]"
                     + "/TYPE_PARAMETERS/TYPE_PARAMETER[./IDENT[@text='t']]",
-            "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputRecordTypeParameterName']]"
+            "/COMPILATION_UNIT/RECORD_DEF[./IDENT"
+                    + "[@text='InputXpathRecordTypeParameterNameTypeDefault']]"
                     + "/TYPE_PARAMETERS/TYPE_PARAMETER/IDENT[@text='t']"
                 );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRedundantImportTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRedundantImportTest.java
index 811a33c17af..92660e2b8ad 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRedundantImportTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRedundantImportTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,15 +38,15 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testInternal() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRedundantImport1.java"));
+                new File(getPath("InputXpathRedundantImportInternal.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RedundantImportCheck.class);
         final String[] expectedViolation = {
             "3:1: " + getCheckMessage(RedundantImportCheck.class,
                         RedundantImportCheck.MSG_SAME, "org.checkstyle.suppressionxpathfilter"
-                                + ".redundantimport.SuppressionXpathRegressionRedundantImport1"),
+                                + ".redundantimport.InputXpathRedundantImportInternal"),
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/IMPORT");
@@ -56,9 +56,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testLibrary() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRedundantImport2.java"));
+                new File(getPath("InputXpathRedundantImportLibrary.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RedundantImportCheck.class);
         final String[] expectedViolation = {
@@ -73,9 +73,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testDuplicate() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRedundantImport3.java"));
+                new File(getPath("InputXpathRedundantImportDuplicate.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RedundantImportCheck.class);
         final String[] expectedViolation = {
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRequireThisTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRequireThisTest.java
index adae07eb709..44ddf2e7158 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRequireThisTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRequireThisTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRequireThisOne.java"));
+                new File(getPath("InputXpathRequireThisOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RequireThisCheck.class);
@@ -53,7 +53,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionRequireThisOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathRequireThisOne']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='changeAge']]/SLIST/EXPR/ASSIGN"
                 + "/IDENT[@text='age']"
         );
@@ -65,7 +65,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRequireThisTwo.java"));
+                new File(getPath("InputXpathRequireThisTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RequireThisCheck.class);
@@ -78,7 +78,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionRequireThisTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathRequireThisTwo']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='method2']]/SLIST/EXPR"
                 + "/METHOD_CALL/IDENT[@text='method1']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionReturnCountTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionReturnCountTest.java
index 5e2fae8cd76..ebaa7c8bbab 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionReturnCountTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionReturnCountTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,9 +36,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testVoid() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionReturnCount1.java")
+            getPath("InputXpathReturnCountVoid.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -51,16 +51,16 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]/TYPE",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]/TYPE/LITERAL_VOID"
         );
 
@@ -68,9 +68,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testCustomMaxForVoid() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionReturnCount1.java")
+            getPath("InputXpathReturnCountVoid.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -85,16 +85,16 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]/TYPE",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount1']]"
+                + "[./IDENT[@text='InputXpathReturnCountVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testVoid']]/TYPE/LITERAL_VOID"
         );
 
@@ -102,9 +102,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testNonVoid() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionReturnCount2.java")
+            getPath("InputXpathReturnCountNonVoid.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -117,16 +117,16 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]/TYPE",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]/TYPE/LITERAL_BOOLEAN"
         );
 
@@ -134,9 +134,9 @@ public void testThree() throws Exception {
     }
 
     @Test
-    public void testFour() throws Exception {
+    public void testCustomMax() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionReturnCount2.java")
+            getPath("InputXpathReturnCountNonVoid.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -151,16 +151,16 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]/TYPE",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount2']]"
+                + "[./IDENT[@text='InputXpathReturnCountNonVoid']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testNonVoid']]/TYPE/LITERAL_BOOLEAN"
         );
 
@@ -168,9 +168,9 @@ public void testFour() throws Exception {
     }
 
     @Test
-    public void testFive() throws Exception {
+    public void testCtor() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionReturnCount3.java")
+            getPath("InputXpathReturnCountCtor.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -183,24 +183,24 @@ public void testFive() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount3']]"
-                + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='SuppressionXpathRegressionReturnCount3']]",
+                + "[./IDENT[@text='InputXpathReturnCountCtor']]"
+                + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='InputXpathReturnCountCtor']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount3']]"
-                + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='SuppressionXpathRegressionReturnCount3']]"
+                + "[./IDENT[@text='InputXpathReturnCountCtor']]"
+                + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='InputXpathReturnCountCtor']]"
                 + "/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionReturnCount3']]"
-                + "/OBJBLOCK/CTOR_DEF/IDENT[@text='SuppressionXpathRegressionReturnCount3']"
+                + "[./IDENT[@text='InputXpathReturnCountCtor']]"
+                + "/OBJBLOCK/CTOR_DEF/IDENT[@text='InputXpathReturnCountCtor']"
         );
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
     }
 
     @Test
-    public void testSix() throws Exception {
+    public void testLambda() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionReturnCount4.java")
+            getPath("InputXpathReturnCountLambda.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -213,7 +213,7 @@ public void testSix() throws Exception {
 
         final List<String> expectedXpathQueries = List.of(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionReturnCount4']]"
+                        + "[./IDENT[@text='InputXpathReturnCountLambda']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testLambda']]/SLIST"
                         + "/VARIABLE_DEF[./IDENT[@text='a']]/ASSIGN/LAMBDA[./IDENT[@text='i']]"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRightCurlyTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRightCurlyTest.java
index f379b3910f4..015aad489e0 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRightCurlyTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRightCurlyTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRightCurlyOne.java"));
+                new File(getPath("InputXpathRightCurlyOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RightCurlyCheck.class);
@@ -53,7 +53,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionRightCurlyOne']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathRightCurlyOne']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_IF/SLIST/RCURLY"
         );
 
@@ -64,7 +64,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRightCurlyTwo.java"));
+                new File(getPath("InputXpathRightCurlyTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RightCurlyCheck.class);
@@ -77,7 +77,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionRightCurlyTwo']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathRightCurlyTwo']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='fooMethod']]/SLIST/LITERAL_TRY/SLIST/RCURLY"
         );
 
@@ -88,7 +88,7 @@ public void testTwo() throws Exception {
     @Test
     public void testThree() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRightCurlyThree.java"));
+                new File(getPath("InputXpathRightCurlyThree.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RightCurlyCheck.class);
@@ -101,7 +101,7 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionRightCurlyThree']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathRightCurlyThree']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='sample']]/SLIST/LITERAL_IF/SLIST/RCURLY"
         );
 
@@ -112,7 +112,7 @@ public void testThree() throws Exception {
     @Test
     public void testFour() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionRightCurlyFour.java"));
+                new File(getPath("InputXpathRightCurlyFour.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(RightCurlyCheck.class);
@@ -125,7 +125,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionRightCurlyFour']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathRightCurlyFour']]/OBJBLOCK"
                 + "/METHOD_DEF[./IDENT[@text='sample']]/SLIST/LITERAL_IF/SLIST/RCURLY"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanExpressionTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanExpressionTest.java
new file mode 100644
index 00000000000..6c92201aedc
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanExpressionTest.java
@@ -0,0 +1,114 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck;
+
+public class XpathRegressionSimplifyBooleanExpressionTest extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+        return SimplifyBooleanExpressionCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testSimple() throws Exception {
+        final String fileName = "InputXpathSimplifyBooleanExpressionSimple.java";
+        final File fileToProcess = new File(getPath(fileName));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(SimplifyBooleanExpressionCheck.class);
+
+        final String[] expectedViolations = {
+            "8:13: " + getCheckMessage(SimplifyBooleanExpressionCheck.class, MSG_KEY),
+        };
+
+        final List<String> expectedXpathQuery = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathSimplifyBooleanExpressionSimple']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_IF/EXPR",
+                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathSimplifyBooleanExpressionSimple']]"
+                + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_IF/EXPR/LNOT"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQuery);
+    }
+
+    @Test
+    public void testAnonymous() throws Exception {
+        final String fileName =
+                "InputXpathSimplifyBooleanExpressionAnonymous.java";
+        final File fileToProcess = new File(getPath(fileName));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(SimplifyBooleanExpressionCheck.class);
+
+        final String[] expectedViolations = {
+            "8:19: " + getCheckMessage(SimplifyBooleanExpressionCheck.class, MSG_KEY),
+        };
+
+        final List<String> expectedXpathQuery = Arrays.asList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathSimplifyBooleanExpressionAnonymous']]"
+                + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]/OBJBLOCK/METHOD_DEF"
+                + "[./IDENT[@text='test']]/SLIST/LITERAL_IF/EXPR",
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathSimplifyBooleanExpressionAnonymous']]"
+                + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]/OBJBLOCK/METHOD_DEF"
+                + "[./IDENT[@text='test']]/SLIST/LITERAL_IF/EXPR/EQUAL[./IDENT[@text='a']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQuery);
+    }
+
+    @Test
+    public void testInterface() throws Exception {
+        final String fileName =
+                "InputXpathSimplifyBooleanExpressionInterface.java";
+        final File fileToProcess = new File(getPath(fileName));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(SimplifyBooleanExpressionCheck.class);
+
+        final String[] expectedViolations = {
+            "7:20: " + getCheckMessage(SimplifyBooleanExpressionCheck.class, MSG_KEY),
+        };
+
+        final List<String> expectedXpathQuery = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
+                + "[@text='InputXpathSimplifyBooleanExpressionInterface']]"
+                + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Inner']]/OBJBLOCK/METHOD_DEF[./IDENT"
+                + "[@text='test']]/SLIST/LITERAL_IF/EXPR/LNOT/NOT_EQUAL[./IDENT[@text='b']]"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolations, expectedXpathQuery);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanReturnTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanReturnTest.java
index 809805372a7..ded114ed26f 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanReturnTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSimplifyBooleanReturnTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,7 @@ protected String getCheckName() {
     public void testIfBooleanEqualsBoolean() throws Exception {
         final File fileToProcess = new File(
             getPath(
-                "SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanEqualsBoolean.java"));
+                "InputXpathSimplifyBooleanReturnIfBooleanEqualsBoolean.java"));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
 
@@ -54,7 +54,7 @@ public void testIfBooleanEqualsBoolean() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                + "'SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanEqualsBoolean']]"
+                + "'InputXpathSimplifyBooleanReturnIfBooleanEqualsBoolean']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='toTest']]/SLIST/LITERAL_IF"
         );
 
@@ -66,7 +66,7 @@ public void testIfBooleanEqualsBoolean() throws Exception {
     public void testIfBooleanReturnBoolean() throws Exception {
         final File fileToProcess = new File(
             getPath(
-                "SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanReturnBoolean.java"
+                "InputXpathSimplifyBooleanReturnIfBooleanReturnBoolean.java"
             ));
 
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
@@ -77,7 +77,7 @@ public void testIfBooleanReturnBoolean() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                + "'SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanReturnBoolean']]"
+                + "'InputXpathSimplifyBooleanReturnIfBooleanReturnBoolean']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='toTest']]/SLIST/EXPR/METHOD_CALL/ELIST"
                 + "/LAMBDA[./IDENT[@text='statement']]/SLIST/LITERAL_IF"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSingleSpaceSeparatorTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSingleSpaceSeparatorTest.java
index 145646de771..e5ce112504f 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSingleSpaceSeparatorTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSingleSpaceSeparatorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testSingleSpaceSeparator() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionSingleSpaceSeparator.java"));
+                new File(getPath("InputXpathSingleSpaceSeparator.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(SingleSpaceSeparatorCheck.class);
@@ -52,7 +52,7 @@ public void testSingleSpaceSeparator() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionSingleSpaceSeparator']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathSingleSpaceSeparator']]/OBJBLOCK"
                 + "/VARIABLE_DEF/IDENT[@text='bad']"
         );
 
@@ -63,7 +63,7 @@ public void testSingleSpaceSeparator() throws Exception {
     @Test
     public void testValidateComments() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionSingleSpaceSeparatorValidateComments.java"
+            "InputXpathSingleSpaceSeparatorValidateComments.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -77,7 +77,7 @@ public void testValidateComments() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[."
-                + "/IDENT[@text='SuppressionXpathRegressionSingleSpaceSeparatorValidateComments']]"
+                + "/IDENT[@text='InputXpathSingleSpaceSeparatorValidateComments']]"
                 + "/OBJBLOCK/SINGLE_LINE_COMMENT[./COMMENT_CONTENT"
                 + "[@text=' an invalid comment // warn\\n']]"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionStaticVariableNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionStaticVariableNameTest.java
new file mode 100644
index 00000000000..f52d8c7dbf3
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionStaticVariableNameTest.java
@@ -0,0 +1,117 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck;
+import com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck;
+
+public class XpathRegressionStaticVariableNameTest extends AbstractXpathTestSupport {
+
+    private final String checkName = StaticVariableNameCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testStaticVariableName() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathStaticVariableName.java"));
+
+        final String pattern = "^[a-z][a-zA-Z0-9]*$";
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(StaticVariableNameCheck.class);
+
+        final String[] expectedViolation = {
+            "6:24: " + getCheckMessage(StaticVariableNameCheck.class,
+                        AbstractNameCheck.MSG_INVALID_PATTERN, "NUM2", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT"
+                        + "/CLASS_DEF[./IDENT[@text"
+                        + "='InputXpathStaticVariableName']]"
+                        + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='NUM2']"
+
+        );
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testInnerClassField() throws Exception {
+        final File fileToProcess =
+                new File(getNonCompilablePath(
+                        "InputXpathStaticVariableNameInnerClassField.java"));
+
+        final String pattern = "^[a-z][a-zA-Z0-9]*$";
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(StaticVariableNameCheck.class);
+
+        final String[] expectedViolation = {
+            "14:24: " + getCheckMessage(StaticVariableNameCheck.class,
+                        AbstractNameCheck.MSG_INVALID_PATTERN, "NUM3", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT"
+                        + "/CLASS_DEF[./IDENT[@text"
+                        + "='InputXpathStaticVariableNameInnerClassField']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='outerMethod']]"
+                        + "/SLIST/CLASS_DEF[./IDENT[@text='MyLocalClass']]"
+                        + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='NUM3']"
+        );
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testNoAccessModifier() throws Exception {
+        final File fileToProcess =
+                new File(getNonCompilablePath(
+                        "InputXpathStaticVariableNameNoAccessModifier.java"));
+
+        final String pattern = "^[a-z][a-zA-Z0-9]*$";
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(StaticVariableNameCheck.class);
+
+        final String[] expectedViolation = {
+            "6:19: " + getCheckMessage(StaticVariableNameCheck.class,
+                        AbstractNameCheck.MSG_INVALID_PATTERN, "NUM3", pattern),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT"
+                        + "/CLASS_DEF[./IDENT[@text"
+                        + "='InputXpathStaticVariableNameNoAccessModifier']]"
+                        + "/OBJBLOCK/INSTANCE_INIT/SLIST/VARIABLE_DEF/IDENT[@text='NUM3']"
+        );
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionStringLiteralEqualityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionStringLiteralEqualityTest.java
index 289dd0c0572..9a742742bf8 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionStringLiteralEqualityTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionStringLiteralEqualityTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testEqualityTrue() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionStringLiteralEquality.java"));
+                new File(getPath("InputXpathStringLiteralEqualityTrue.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(StringLiteralEqualityCheck.class);
         final String[] expectedViolation = {
@@ -50,11 +50,11 @@ public void testOne() throws Exception {
         };
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT"
-                + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionStringLiteralEquality']]"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathStringLiteralEqualityTrue']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunction']]"
                 + "/SLIST/LITERAL_IF/EXPR",
             "/COMPILATION_UNIT"
-                + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionStringLiteralEquality']]"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathStringLiteralEqualityTrue']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunction']]"
                 + "/SLIST/LITERAL_IF/EXPR/EQUAL[./IDENT[@text='foo']]"
 
@@ -65,9 +65,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testEqualityFalse() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionStringLiteralEquality1.java"));
+                new File(getPath("InputXpathStringLiteralEqualityFalse.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(StringLiteralEqualityCheck.class);
         final String[] expectedViolation = {
@@ -76,11 +76,11 @@ public void testTwo() throws Exception {
         };
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT"
-                + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionStringLiteralEquality1']]"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathStringLiteralEqualityFalse']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunction']]"
                 + "/SLIST/LITERAL_WHILE/EXPR",
             "/COMPILATION_UNIT"
-                + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionStringLiteralEquality1']]"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathStringLiteralEqualityFalse']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunction']]"
                 + "/SLIST/LITERAL_WHILE/EXPR/NOT_EQUAL[./IDENT[@text='foo']]"
 
@@ -91,9 +91,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testEqualityExp() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionStringLiteralEquality2.java"));
+                new File(getPath("InputXpathStringLiteralEqualityExp.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(StringLiteralEqualityCheck.class);
         final String[] expectedViolation = {
@@ -102,7 +102,7 @@ public void testThree() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT"
-                + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionStringLiteralEquality2']]"
+                + "/CLASS_DEF[./IDENT[@text='InputXpathStringLiteralEqualityExp']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunction']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='flag']]"
                 + "/ASSIGN/EXPR/EQUAL[./IDENT[@text='foo']]"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSuperCloneTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSuperCloneTest.java
new file mode 100644
index 00000000000..0e06c358ebf
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionSuperCloneTest.java
@@ -0,0 +1,106 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.AbstractSuperCheck;
+import com.puppycrawl.tools.checkstyle.checks.coding.SuperCloneCheck;
+
+public class XpathRegressionSuperCloneTest extends AbstractXpathTestSupport {
+
+    @Override
+    protected String getCheckName() {
+        return SuperCloneCheck.class.getSimpleName();
+    }
+
+    @Test
+    public void testInnerClone() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathSuperCloneInnerClone.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(SuperCloneCheck.class);
+
+        final String[] expectedViolation = {
+            "6:23: " + getCheckMessage(SuperCloneCheck.class, AbstractSuperCheck.MSG_KEY, "clone"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                        + "[./IDENT[@text='InputXpathSuperCloneInnerClone']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClone']]"
+                        + "/OBJBLOCK/METHOD_DEF/IDENT[@text='clone']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testNoSuperClone() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathSuperCloneNoSuperClone.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(SuperCloneCheck.class);
+
+        final String[] expectedViolation = {
+            "6:23: " + getCheckMessage(SuperCloneCheck.class, AbstractSuperCheck.MSG_KEY, "clone"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                        + "[./IDENT[@text='InputXpathSuperCloneNoSuperClone']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='NoSuperClone']]"
+                        + "/OBJBLOCK/METHOD_DEF/IDENT[@text='clone']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testPlainAndSubclasses() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathSuperClonePlainAndSubclasses.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(SuperCloneCheck.class);
+
+        final String[] expectedViolation = {
+            "4:19: " + getCheckMessage(SuperCloneCheck.class, AbstractSuperCheck.MSG_KEY, "clone"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF"
+                        + "[./IDENT[@text='InputXpathSuperClonePlainAndSubclasses']]"
+                        + "/OBJBLOCK/METHOD_DEF/IDENT[@text='clone']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionThrowsCountTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionThrowsCountTest.java
index f9f2c28c20b..7a107eef2d0 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionThrowsCountTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionThrowsCountTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionThrowsCount1.java"));
+                new File(getPath("InputXpathThrowsCountDefault.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ThrowsCountCheck.class);
         final String[] expectedViolation = {
@@ -49,7 +49,7 @@ public void testOne() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                    + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionThrowsCount1']]"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathThrowsCountDefault']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunction']]"
                     + "/LITERAL_THROWS[./IDENT[@text='CloneNotSupportedException']]"
 
@@ -60,9 +60,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testCustomMax() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionThrowsCount2.java"));
+                new File(getPath("InputXpathThrowsCountCustomMax.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ThrowsCountCheck.class);
 
@@ -74,7 +74,7 @@ public void testTwo() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                    + "/INTERFACE_DEF[./IDENT[@text='SuppressionXpathRegressionThrowsCount2']]"
+                    + "/INTERFACE_DEF[./IDENT[@text='InputXpathThrowsCountCustomMax']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunction']]"
                     + "/LITERAL_THROWS[./IDENT[@text='IllegalStateException']]"
 
@@ -85,9 +85,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testPrivateMethods() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionThrowsCount3.java"));
+                new File(getPath("InputXpathThrowsCountPrivateMethods.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(ThrowsCountCheck.class);
 
@@ -99,7 +99,7 @@ public void testThree() throws Exception {
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
-                    + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionThrowsCount3']]"
+                    + "/CLASS_DEF[./IDENT[@text='InputXpathThrowsCountPrivateMethods']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='myFunc']]"
                     + "/SLIST/VARIABLE_DEF[./IDENT[@text='foo']]"
                     + "/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='myClass']]"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTodoCommentTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTodoCommentTest.java
index 98e99995656..00d612b4c1a 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTodoCommentTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTodoCommentTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testSingleLine() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionTodoCommentOne.java"));
+                new File(getPath("InputXpathTodoCommentSingleLine.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TodoCommentCheck.class);
@@ -53,7 +53,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionTodoCommentOne']]/OBJBLOCK/"
+                        + "'InputXpathTodoCommentSingleLine']]/OBJBLOCK/"
                         + "SINGLE_LINE_COMMENT/COMMENT_CONTENT[@text=' warn FIXME:\\n']");
 
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -61,9 +61,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testBlock() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionTodoCommentTwo.java"));
+                new File(getPath("InputXpathTodoCommentBlock.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TodoCommentCheck.class);
@@ -75,7 +75,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionTodoCommentTwo']]/"
+                        + "'InputXpathTodoCommentBlock']]/"
                         + "OBJBLOCK/BLOCK_COMMENT_BEGIN/COMMENT_CONTENT"
                         + "[@text=' // warn\\n     * FIXME:\\n     * TODO\\n     ']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTrailingCommentTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTrailingCommentTest.java
index 4682a4bfe7c..cf2f64c3736 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTrailingCommentTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTrailingCommentTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,9 +37,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testSingleLine() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionTrailingComment1.java"));
+                "InputXpathTrailingCommentSingleLine.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TrailingCommentCheck.class);
@@ -51,7 +51,7 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionTrailingComment1']]/"
+                        + "[./IDENT[@text='InputXpathTrailingCommentSingleLine']]/"
                         + "OBJBLOCK/SINGLE_LINE_COMMENT[./COMMENT_CONTENT[@text=' don&apos;"
                         + "&apos;t use trailing comments :) // warn\\n']]"
         );
@@ -61,9 +61,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testBlock() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionTrailingComment2.java"));
+                "InputXpathTrailingCommentBlock.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TrailingCommentCheck.class);
@@ -75,7 +75,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionTrailingComment2']]"
+                        + "[./IDENT[@text='InputXpathTrailingCommentBlock']]"
                         + "/OBJBLOCK/SINGLE_LINE_COMMENT[./COMMENT_CONTENT[@text=' warn\\n']]"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypeNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypeNameTest.java
index 8c9c9b6e976..4d32dda1cf1 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypeNameTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypeNameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void test1() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionTypeName1.java"));
+                new File(getPath("InputXpathTypeNameDefault.java"));
 
         final String pattern = "^[A-Z][a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -55,7 +55,7 @@ public void test1() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionTypeName1']]"
+                        + "='InputXpathTypeNameDefault']]"
                         + "/OBJBLOCK/CLASS_DEF/IDENT[@text='SecondName_']"
         );
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
@@ -63,9 +63,9 @@ public void test1() throws Exception {
     }
 
     @Test
-    public void test2() throws Exception {
+    public void testInterfaceDef() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionTypeName2.java"));
+                new File(getPath("InputXpathTypeNameInterfaceDef.java"));
 
         final String pattern = "^I_[a-zA-Z0-9]*$";
         final DefaultConfiguration moduleConfig =
@@ -81,7 +81,7 @@ public void test2() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT"
                         + "/CLASS_DEF[./IDENT[@text"
-                        + "='SuppressionXpathRegressionTypeName2']]"
+                        + "='InputXpathTypeNameInterfaceDef']]"
                         + "/OBJBLOCK/INTERFACE_DEF/IDENT[@text='SecondName']"
         );
         runVerifications(moduleConfig, fileToProcess, expectedViolation,
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypecastParenPadTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypecastParenPadTest.java
index e844579d33f..2aaa3b68848 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypecastParenPadTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionTypecastParenPadTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,7 +43,7 @@ protected String getCheckName() {
     @Test
     public void testLeftFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionTypecastParenPadLeftFollowed.java"));
+                new File(getPath("InputXpathTypecastParenPadLeftFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TypecastParenPadCheck.class);
@@ -55,10 +55,10 @@ public void testLeftFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionTypecastParenPadLeftFollowed']]"
+                + "[./IDENT[@text='InputXpathTypecastParenPadLeftFollowed']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionTypecastParenPadLeftFollowed']]"
+                + "[./IDENT[@text='InputXpathTypecastParenPadLeftFollowed']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR/TYPECAST"
         );
 
@@ -69,7 +69,7 @@ public void testLeftFollowed() throws Exception {
     @Test
     public void testLeftNotFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionTypecastParenPadLeftNotFollowed.java"));
+                new File(getPath("InputXpathTypecastParenPadLeftNotFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TypecastParenPadCheck.class);
@@ -82,10 +82,10 @@ public void testLeftNotFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionTypecastParenPadLeftNotFollowed']]"
+                + "[./IDENT[@text='InputXpathTypecastParenPadLeftNotFollowed']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionTypecastParenPadLeftNotFollowed']]"
+                + "[./IDENT[@text='InputXpathTypecastParenPadLeftNotFollowed']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR/TYPECAST"
         );
 
@@ -96,7 +96,7 @@ public void testLeftNotFollowed() throws Exception {
     @Test
     public void testRightPreceded() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionTypecastParenPadRightPreceded.java"));
+                new File(getPath("InputXpathTypecastParenPadRightPreceded.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TypecastParenPadCheck.class);
@@ -108,7 +108,7 @@ public void testRightPreceded() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionTypecastParenPadRightPreceded']]"
+                + "[./IDENT[@text='InputXpathTypecastParenPadRightPreceded']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR/TYPECAST/RPAREN"
         );
 
@@ -119,7 +119,7 @@ public void testRightPreceded() throws Exception {
     @Test
     public void testRightNotPreceded() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionTypecastParenPadRightNotPreceded.java"));
+                getPath("InputXpathTypecastParenPadRightNotPreceded.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(TypecastParenPadCheck.class);
@@ -132,7 +132,7 @@ public void testRightNotPreceded() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionTypecastParenPadRightNotPreceded']]"
+                + "@text='InputXpathTypecastParenPadRightNotPreceded']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR/TYPECAST/RPAREN"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUncommentedMainTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUncommentedMainTest.java
index 5cc11af187f..f85d40b8e36 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUncommentedMainTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUncommentedMainTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,9 +39,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testDefault() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionUncommentedMain.java"));
+                new File(getPath("InputXpathUncommentedMainDefault.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UncommentedMainCheck.class);
@@ -53,13 +53,13 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionUncommentedMain']]"
+                        + "[./IDENT[@text='InputXpathUncommentedMainDefault']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionUncommentedMain']]"
+                        + "[./IDENT[@text='InputXpathUncommentedMainDefault']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionUncommentedMain']]"
+                        + "[./IDENT[@text='InputXpathUncommentedMainDefault']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]/MODIFIERS/LITERAL_PUBLIC"
         );
 
@@ -68,9 +68,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testInStaticClass() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionUncommentedMainTwo.java"));
+                new File(getPath("InputXpathUncommentedMainInStaticClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UncommentedMainCheck.class);
@@ -82,15 +82,15 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionUncommentedMainTwo']]"
+                        + "[./IDENT[@text='InputXpathUncommentedMainInStaticClass']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Launcher']"
                         + "]/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionUncommentedMainTwo']]"
+                        + "[./IDENT[@text='InputXpathUncommentedMainInStaticClass']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Launcher']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF"
-                        + "[./IDENT[@text='SuppressionXpathRegressionUncommentedMainTwo']]"
+                        + "[./IDENT[@text='InputXpathUncommentedMainInStaticClass']]"
                         + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Launcher']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='main']]/MODIFIERS/LITERAL_PUBLIC"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessaryParenthesesTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessaryParenthesesTest.java
index 0fcb550d8da..8b12a683d97 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessaryParenthesesTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessaryParenthesesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,9 +37,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testClassFields() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses1.java")
+            getPath("InputXpathUnnecessaryParenthesesClassFields.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -52,12 +52,12 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses1']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesClassFields']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a']]"
                 + "/ASSIGN/EXPR",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses1']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesClassFields']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='a']]"
                 + "/ASSIGN/EXPR/LPAREN"
         );
@@ -66,9 +66,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testConditionals() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses2.java")
+            getPath("InputXpathUnnecessaryParenthesesConditionals.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -81,12 +81,12 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses2']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesConditionals']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/LITERAL_IF/EXPR",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses2']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesConditionals']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/LITERAL_IF/EXPR/LPAREN"
         );
@@ -95,9 +95,9 @@ public void testTwo() throws Exception {
     }
 
     @Test
-    public void testThree() throws Exception {
+    public void testLambdas() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses3.java")
+            getPath("InputXpathUnnecessaryParenthesesLambdas.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -110,7 +110,7 @@ public void testThree() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses3']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesLambdas']]"
                 + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='predicate']]"
                 + "/ASSIGN/LAMBDA"
         );
@@ -119,9 +119,9 @@ public void testThree() throws Exception {
     }
 
     @Test
-    public void testFour() throws Exception {
+    public void testLocalVariables() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses4.java")
+            getPath("InputXpathUnnecessaryParenthesesLocalVariables.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -134,7 +134,7 @@ public void testFour() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses4']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesLocalVariables']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='b']]"
                 + "/ASSIGN/EXPR/PLUS/IDENT[@text='a']"
@@ -144,9 +144,9 @@ public void testFour() throws Exception {
     }
 
     @Test
-    public void testFive() throws Exception {
+    public void testStringLiteral() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses5.java")
+            getPath("InputXpathUnnecessaryParenthesesStringLiteral.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -159,7 +159,7 @@ public void testFive() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses5']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesStringLiteral']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='str']]"
                 + "/ASSIGN/EXPR/PLUS/STRING_LITERAL[@text='Checkstyle']"
@@ -169,9 +169,9 @@ public void testFive() throws Exception {
     }
 
     @Test
-    public void testSix() throws Exception {
+    public void testMethodDef() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses6.java")
+            getPath("InputXpathUnnecessaryParenthesesMethodDef.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -184,7 +184,7 @@ public void testSix() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses6']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesMethodDef']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='a']]"
                 + "/ASSIGN/EXPR/PLUS/NUM_INT[@text='10']"
@@ -194,9 +194,9 @@ public void testSix() throws Exception {
     }
 
     @Test
-    public void testSeven() throws Exception {
+    public void testReturnExpr() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses7.java")
+            getPath("InputXpathUnnecessaryParenthesesReturnExpr.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -209,12 +209,12 @@ public void testSeven() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses7']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesReturnExpr']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/LITERAL_RETURN/EXPR",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses7']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesReturnExpr']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/LITERAL_RETURN/EXPR/LPAREN"
         );
@@ -223,9 +223,9 @@ public void testSeven() throws Exception {
     }
 
     @Test
-    public void testEight() throws Exception {
+    public void testExprWithMethodParam() throws Exception {
         final File fileToProcess = new File(
-            getPath("SuppressionXpathRegressionUnnecessaryParentheses8.java")
+            getPath("InputXpathUnnecessaryParenthesesExprWithMethodParam.java")
         );
 
         final DefaultConfiguration moduleConfig =
@@ -238,13 +238,13 @@ public void testEight() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses8']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesExprWithMethodParam']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='c']]"
                 + "/ASSIGN/EXPR",
 
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUnnecessaryParentheses8']]"
+                + "[./IDENT[@text='InputXpathUnnecessaryParenthesesExprWithMethodParam']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
                 + "/SLIST/VARIABLE_DEF[./IDENT[@text='c']]"
                 + "/ASSIGN/EXPR/LPAREN"
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationTest.java
index 938eec46e88..43e2eb212fe 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,9 +40,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testSimple() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclaration.java"));
+            "InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationSimple.java"));
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
         final String[] expectedViolation = {
             "5:2: " + getCheckMessage(CLASS,
@@ -56,9 +56,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testInnerTypes() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes"
+            "InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes"
                     + ".java"));
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
         final String[] expectedViolation = {
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTest.java
index 332c70d1212..71d5fb1a40c 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ protected String getCheckName() {
     @Test
     public void testDefault() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclaration.java"));
+            "InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationDefault.java"));
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
         final String[] expectedViolation = {
             "4:20: " + getCheckMessage(CLASS,
@@ -52,7 +52,7 @@ public void testDefault() throws Exception {
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT"
                 + "[@text="
-                + "'SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclaration']]"
+                + "'InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationDefault']]"
                 + "/OBJBLOCK/SEMI"
         );
 
@@ -62,7 +62,7 @@ public void testDefault() throws Exception {
     @Test
     public void testTokens() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTokens"
+            "InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationTokens"
                 + ".java"));
         final DefaultConfiguration moduleConfig = createModuleConfig(CLASS);
         moduleConfig.addProperty("tokens", "METHOD_DEF");
@@ -74,7 +74,7 @@ public void testTokens() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[."
-                + "/IDENT[@text='SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMember"
+                + "/IDENT[@text='InputXpathUnnecessarySemicolonAfterTypeMember"
                     + "DeclarationTokens']]"
                 + "/OBJBLOCK/SEMI[1]"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInEnumerationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInEnumerationTest.java
index ccffd3a8821..022428d1f52 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInEnumerationTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInEnumerationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,9 +40,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testSimple() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionUnnecessarySemicolonInEnumeration.java"));
+                getPath("InputXpathUnnecessarySemicolonInEnumerationSimple.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UnnecessarySemicolonInEnumerationCheck.class);
@@ -60,9 +60,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testAll() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionUnnecessarySemicolonInEnumerationAll.java"
+            "InputXpathUnnecessarySemicolonInEnumerationAll.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -75,7 +75,7 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/ENUM_DEF[./IDENT[@text="
-                + "'SuppressionXpathRegressionUnnecessarySemicolonInEnumerationAll']]"
+                + "'InputXpathUnnecessarySemicolonInEnumerationAll']]"
                 + "/OBJBLOCK/SEMI"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInTryWithResourcesTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInTryWithResourcesTest.java
index 08f2d01f1d1..68d0f716ccf 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInTryWithResourcesTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnnecessarySemicolonInTryWithResourcesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,18 +42,16 @@ protected String getCheckName() {
     @Test
     public void testDefault() throws Exception {
         final File fileToProcess = new File(
-                getPath("SuppressionXpathRegressionUnnecessarySemicolonInTryWithResources.java"));
+                getPath("InputXpathUnnecessarySemicolonInTryWithResourcesDefault.java"));
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UnnecessarySemicolonInTryWithResourcesCheck.class);
         final String[] expectedViolation = {
-            "11:43: " + getCheckMessage(UnnecessarySemicolonInTryWithResourcesCheck.class,
-                UnnecessarySemicolonInTryWithResourcesCheck.MSG_SEMI),
-            "12:76: " + getCheckMessage(UnnecessarySemicolonInTryWithResourcesCheck.class,
+            "11:76: " + getCheckMessage(UnnecessarySemicolonInTryWithResourcesCheck.class,
                 UnnecessarySemicolonInTryWithResourcesCheck.MSG_SEMI),
         };
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionUnnecessarySemicolonInTryWithResources']]"
+                        + "'InputXpathUnnecessarySemicolonInTryWithResourcesDefault']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='m']]/SLIST/LITERAL_TRY"
                         + "/RESOURCE_SPECIFICATION/SEMI"
         );
@@ -61,9 +59,9 @@ public void testDefault() throws Exception {
     }
 
     @Test
-    public void testAllowWhenNoBraceAfterSemicolon() throws Exception {
+    public void testNoBrace() throws Exception {
         final File fileToProcess = new File(getPath(
-            "SuppressionXpathRegressionUnnecessarySemicolonInTryWithResourcesNoBrace.java"
+            "InputXpathUnnecessarySemicolonInTryWithResourcesNoBrace.java"
         ));
 
         final DefaultConfiguration moduleConfig =
@@ -77,7 +75,7 @@ public void testAllowWhenNoBraceAfterSemicolon() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                    + "'SuppressionXpathRegressionUnnecessarySemicolonInTryWithResourcesNoBrace']]"
+                    + "'InputXpathUnnecessarySemicolonInTryWithResourcesNoBrace']]"
                 + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                 + "/SLIST/LITERAL_TRY/RESOURCE_SPECIFICATION/SEMI"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedImportsTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedImportsTest.java
index b63d65adbb5..4e0ecc79226 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedImportsTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedImportsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,9 @@ protected String getCheckName() {
     }
 
     @Test
-    public void testOne() throws Exception {
+    public void testUnusedImports() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionUnusedImportsOne.java"));
+                new File(getPath("InputXpathUnusedImports.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UnusedImportsCheck.class);
@@ -58,9 +58,9 @@ public void testOne() throws Exception {
     }
 
     @Test
-    public void testTwo() throws Exception {
+    public void testStatic() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionUnusedImportsTwo.java"));
+                new File(getPath("InputXpathUnusedImportsStatic.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UnusedImportsCheck.class);
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedLocalVariableTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedLocalVariableTest.java
index 50b22a9416b..3302803d9c5 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedLocalVariableTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUnusedLocalVariableTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionUnusedLocalVariableOne.java"));
+                "InputXpathUnusedLocalVariableOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UnusedLocalVariableCheck.class);
@@ -51,18 +51,18 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/"
+                        + "@text='InputXpathUnusedLocalVariableOne']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[./IDENT[@text='a']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/"
+                        + "@text='InputXpathUnusedLocalVariableOne']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF["
                         + "./IDENT[@text='a']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/"
+                        + "@text='InputXpathUnusedLocalVariableOne']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF["
                         + "./IDENT[@text='a']]/TYPE",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionUnusedLocalVariableOne']]/OBJBLOCK/"
+                        + "@text='InputXpathUnusedLocalVariableOne']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF["
                         + "./IDENT[@text='a']]/TYPE/LITERAL_INT"
         );
@@ -74,7 +74,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionUnusedLocalVariableTwo.java"));
+                "InputXpathUnusedLocalVariableTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UnusedLocalVariableCheck.class);
@@ -86,17 +86,17 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/OBJBLOCK/"
+                        + "@text='InputXpathUnusedLocalVariableTwo']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF[./IDENT[@text='b']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/OBJBLOCK/"
+                        + "@text='InputXpathUnusedLocalVariableTwo']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF["
                         + "./IDENT[@text='b']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                        + "@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/OBJBLOCK/"
+                        + "@text='InputXpathUnusedLocalVariableTwo']]/OBJBLOCK/"
                         + "METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF["
                         + "./IDENT[@text='b']]/TYPE", "/COMPILATION_UNIT/CLASS_DEF["
-                        + "./IDENT[@text='SuppressionXpathRegressionUnusedLocalVariableTwo']]/"
+                        + "./IDENT[@text='InputXpathUnusedLocalVariableTwo']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/SLIST/VARIABLE_DEF["
                         + "./IDENT[@text='b']]/TYPE/LITERAL_INT"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUpperEllTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUpperEllTest.java
index 361a7834219..c5d640d38df 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUpperEllTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionUpperEllTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testUpperEllOne() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionUpperEllFirst.java"));
+                new File(getPath("InputXpathUpperEllOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(UpperEllCheck.class);
@@ -52,10 +52,10 @@ public void testUpperEllOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUpperEllFirst']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathUpperEllOne']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR[./NUM_LONG[@text='0l']]",
             "/COMPILATION_UNIT/CLASS_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUpperEllFirst']]/OBJBLOCK"
+                + "[./IDENT[@text='InputXpathUpperEllOne']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR"
                 + "/NUM_LONG[@text='0l']"
         );
@@ -67,7 +67,7 @@ public void testUpperEllOne() throws Exception {
     @Test
     public void testUpperEllTwo() throws Exception {
         final File fileToProcess =
-            new File(getPath("SuppressionXpathRegressionUpperEllSecond.java"));
+            new File(getPath("InputXpathUpperEllTwo.java"));
 
         final DefaultConfiguration moduleConfig =
             createModuleConfig(UpperEllCheck.class);
@@ -79,11 +79,11 @@ public void testUpperEllTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
             "/COMPILATION_UNIT/INTERFACE_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUpperEllSecond']]/OBJBLOCK/METHOD_DEF"
+                + "[./IDENT[@text='InputXpathUpperEllTwo']]/OBJBLOCK/METHOD_DEF"
                 + "[./IDENT[@text='test']]/SLIST/VARIABLE_DEF[./IDENT[@text='var2']]/ASSIGN/EXPR"
                 + "[./NUM_LONG[@text='508987l']]",
             "/COMPILATION_UNIT/INTERFACE_DEF"
-                + "[./IDENT[@text='SuppressionXpathRegressionUpperEllSecond']]/OBJBLOCK/METHOD_DEF"
+                + "[./IDENT[@text='InputXpathUpperEllTwo']]/OBJBLOCK/METHOD_DEF"
                 + "[./IDENT[@text='test']]/SLIST/VARIABLE_DEF[./IDENT[@text='var2']]/ASSIGN/EXPR"
                 + "/NUM_LONG[@text='508987l']"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionVariableDeclarationUsageDistanceTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionVariableDeclarationUsageDistanceTest.java
index dca8b14968c..07d70a1879b 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionVariableDeclarationUsageDistanceTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionVariableDeclarationUsageDistanceTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,7 +39,7 @@ protected String getCheckName() {
     @Test
     public void testOne() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionVariableDeclarationUsageDistance1.java"));
+                "InputXpathVariableDeclarationUsageDistanceOne.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(VariableDeclarationUsageDistanceCheck.class);
@@ -55,19 +55,19 @@ public void testOne() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance1']]/"
+                        + "'InputXpathVariableDeclarationUsageDistanceOne']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='temp']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance1']]/"
+                        + "'InputXpathVariableDeclarationUsageDistanceOne']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='temp']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance1']]/"
+                        + "'InputXpathVariableDeclarationUsageDistanceOne']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='temp']]/TYPE",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance1']]/"
+                        + "'InputXpathVariableDeclarationUsageDistanceOne']]/"
                         + "OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='temp']]/TYPE/LITERAL_INT"
         );
@@ -79,7 +79,7 @@ public void testOne() throws Exception {
     @Test
     public void testTwo() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionVariableDeclarationUsageDistance2.java"));
+                "InputXpathVariableDeclarationUsageDistanceTwo.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(VariableDeclarationUsageDistanceCheck.class);
@@ -96,19 +96,19 @@ public void testTwo() throws Exception {
 
         final List<String> expectedXpathQueries = Arrays.asList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance2']]"
+                        + "'InputXpathVariableDeclarationUsageDistanceTwo']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod2']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='count']]",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance2']]"
+                        + "'InputXpathVariableDeclarationUsageDistanceTwo']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod2']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='count']]/MODIFIERS",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance2']]"
+                        + "'InputXpathVariableDeclarationUsageDistanceTwo']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod2']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='count']]/TYPE",
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text="
-                        + "'SuppressionXpathRegressionVariableDeclarationUsageDistance2']]"
+                        + "'InputXpathVariableDeclarationUsageDistanceTwo']]"
                         + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod2']]"
                         + "/SLIST/VARIABLE_DEF[./IDENT[@text='count']]/TYPE/LITERAL_INT"
         );
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionVisibilityModifierTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionVisibilityModifierTest.java
new file mode 100644
index 00000000000..181e5ff8b48
--- /dev/null
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionVisibilityModifierTest.java
@@ -0,0 +1,130 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import static com.puppycrawl.tools.checkstyle.checks.design.VisibilityModifierCheck.MSG_KEY;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.design.VisibilityModifierCheck;
+
+public class XpathRegressionVisibilityModifierTest extends AbstractXpathTestSupport {
+
+    private final String checkName = VisibilityModifierCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testDefaultModifier() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathVisibilityModifierDefault.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(VisibilityModifierCheck.class);
+
+        final String[] expectedViolation = {
+            "6:9: " + getCheckMessage(VisibilityModifierCheck.class, MSG_KEY, "field"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathVisibilityModifierDefault']]"
+                        + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='field']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testAnnotation() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathVisibilityModifierAnnotation.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(VisibilityModifierCheck.class);
+        moduleConfig.addProperty("ignoreAnnotationCanonicalNames", "Deprecated");
+
+        final String[] expectedViolation = {
+            "5:12: " + getCheckMessage(VisibilityModifierCheck.class, MSG_KEY,
+                    "annotatedString"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathVisibilityModifierAnnotation']]"
+                        + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='annotatedString']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testAnonymousClass() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathVisibilityModifierAnonymous.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(VisibilityModifierCheck.class);
+
+        final String[] expectedViolation = {
+            "6:23: " + getCheckMessage(VisibilityModifierCheck.class, MSG_KEY, "field1"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathVisibilityModifierAnonymous']]"
+                        + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='runnable']]"
+                        + "/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='Runnable']]"
+                        + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='field1']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+
+    @Test
+    public void testInnerClass() throws Exception {
+        final File fileToProcess =
+                new File(getPath("InputXpathVisibilityModifierInner.java"));
+
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(VisibilityModifierCheck.class);
+
+        final String[] expectedViolation = {
+            "7:20: " + getCheckMessage(VisibilityModifierCheck.class, MSG_KEY, "field2"),
+        };
+
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
+                        + "@text='InputXpathVisibilityModifierInner']]"
+                        + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='InnerClass']]/OBJBLOCK/"
+                        + "VARIABLE_DEF/IDENT[@text='field2']"
+        );
+
+        runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries);
+    }
+}
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAfterTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAfterTest.java
index 91af949f296..2fe07e74e42 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAfterTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAfterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testWhitespaceAfterTypecast() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionWhitespaceAfterTypecast.java"));
+                new File(getPath("InputXpathWhitespaceAfterTypecast.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(WhitespaceAfterCheck.class);
@@ -52,7 +52,7 @@ public void testWhitespaceAfterTypecast() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionWhitespaceAfterTypecast']]/OBJBLOCK"
+                + "@text='InputXpathWhitespaceAfterTypecast']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/EXPR/TYPECAST/RPAREN"
         );
 
@@ -63,7 +63,7 @@ public void testWhitespaceAfterTypecast() throws Exception {
     @Test
     public void testWhitespaceAfterNotFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionWhitespaceAfterNotFollowed.java"));
+                new File(getPath("InputXpathWhitespaceAfterNotFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(WhitespaceAfterCheck.class);
@@ -75,7 +75,7 @@ public void testWhitespaceAfterNotFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionWhitespaceAfterNotFollowed']]/OBJBLOCK"
+                + "@text='InputXpathWhitespaceAfterNotFollowed']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN/ARRAY_INIT/COMMA"
         );
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAroundTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAroundTest.java
index 2166a8072d8..03457f1b5d2 100644
--- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAroundTest.java
+++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionWhitespaceAroundTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testWhitespaceAroundNotPreceded() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionWhitespaceAroundNotPreceded.java"));
+                new File(getPath("InputXpathWhitespaceAroundNotPreceded.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(WhitespaceAroundCheck.class);
@@ -52,7 +52,7 @@ public void testWhitespaceAroundNotPreceded() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionWhitespaceAroundNotPreceded']]/OBJBLOCK"
+                + "@text='InputXpathWhitespaceAroundNotPreceded']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN"
         );
 
@@ -63,7 +63,7 @@ public void testWhitespaceAroundNotPreceded() throws Exception {
     @Test
     public void testWhitespaceAroundNotFollowed() throws Exception {
         final File fileToProcess =
-                new File(getPath("SuppressionXpathRegressionWhitespaceAroundNotFollowed.java"));
+                new File(getPath("InputXpathWhitespaceAroundNotFollowed.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(WhitespaceAroundCheck.class);
@@ -75,7 +75,7 @@ public void testWhitespaceAroundNotFollowed() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
             "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                + "@text='SuppressionXpathRegressionWhitespaceAroundNotFollowed']]/OBJBLOCK"
+                + "@text='InputXpathWhitespaceAroundNotFollowed']]/OBJBLOCK"
                 + "/VARIABLE_DEF[./IDENT[@text='bad']]/ASSIGN"
         );
 
diff --git a/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule526parameternames/InputRecordComponentName.java b/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule526parameternames/InputRecordComponentName.java
index 77e64cac15e..43689309e20 100644
--- a/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule526parameternames/InputRecordComponentName.java
+++ b/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule526parameternames/InputRecordComponentName.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.recordcomponentname;
 
 /* Config:
diff --git a/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/InputPatternVariableNameEnhancedInstanceofTestDefault.java b/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/InputPatternVariableNameEnhancedInstanceofTestDefault.java
index f294a515bfe..697aa0cc3fe 100644
--- a/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/InputPatternVariableNameEnhancedInstanceofTestDefault.java
+++ b/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule527localvariablenames/InputPatternVariableNameEnhancedInstanceofTestDefault.java
@@ -1,7 +1,7 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.google.checkstyle.test.chapter5naming.rule527localvariablenames;
 
-import java.util.ArrayList;
+import java.util.*;
 import java.util.Locale;
 
 public class InputPatternVariableNameEnhancedInstanceofTestDefault {
@@ -42,7 +42,7 @@ public void t(Object o1, Object o2) {
         }
         b = ((VoidPredicate) () -> o1 instanceof String s).get();
 
-        ArrayList<Integer> arrayList = new ArrayList<Integer>();
+        List<Integer> arrayList = new ArrayList<Integer>();
         if (arrayList instanceof ArrayList<Integer> ai) {
             System.out.println("Blah");
         }
diff --git a/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InputRecordTypeParameterName.java b/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InputRecordTypeParameterName.java
index fe5c31fe0c1..b621aa06886 100644
--- a/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InputRecordTypeParameterName.java
+++ b/src/it/resources-noncompilable/com/google/checkstyle/test/chapter5naming/rule528typevariablenames/InputRecordTypeParameterName.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.recordtypeparametername;
 
 import java.io.Serializable;
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingRecords.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingRecords.java
new file mode 100644
index 00000000000..bf12fe5fd82
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingRecords.java
@@ -0,0 +1,16 @@
+//non-compiled with javac: Compilable with Java14
+
+package org.checkstyle.suppressionxpathfilter.constructorsdeclarationgrouping;
+
+public class InputXpathConstructorsDeclarationGroupingRecords {
+  public record MyRecord(int x, int y) {
+
+    public MyRecord(int a) {
+      this(a,a);
+    }
+
+    void foo() {}
+
+    public MyRecord {} // warn
+  }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInRecord.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInRecord.java
new file mode 100644
index 00000000000..7083a132464
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInRecord.java
@@ -0,0 +1,11 @@
+//non-compiled with javac: Compilable with Java17
+
+package org.checkstyle.suppressionxpathfilter.covariantequals;
+
+public record InputXpathCovariantEqualsInRecord() {
+
+    public boolean equals(String str) { // warn
+        return str.equals(this);
+    }
+
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInRecord.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInRecord.java
deleted file mode 100644
index 34171e75b51..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInRecord.java
+++ /dev/null
@@ -1,11 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-
-package org.checkstyle.suppressionxpathfilter.covariantequals;
-
-public record SuppressionXpathRegressionCovariantEqualsInRecord() {
-
-    public boolean equals(String str) { // warn
-        return str.equals(this);
-    }
-
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameOne.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameOne.java
new file mode 100644
index 00000000000..d64db415bee
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameOne.java
@@ -0,0 +1,12 @@
+//non-compiled with javac: Compilable with Java17
+package org.checkstyle.suppressionxpathfilter.illegalidentifiername;
+
+/* Config:
+ *
+ * default
+ */
+public record InputXpathIllegalIdentifierNameOne
+        (String string,
+            String yield, // warn
+            String otherString){
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameTwo.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameTwo.java
new file mode 100644
index 00000000000..49629d72d67
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameTwo.java
@@ -0,0 +1,17 @@
+//non-compiled with javac: Compilable with Java17
+package org.checkstyle.suppressionxpathfilter.illegalidentifiername;
+
+/* Config:
+ *
+ * default
+ */
+public class InputXpathIllegalIdentifierNameTwo {
+    int foo(int yield) { // warn
+        return switch (yield) {
+            case 1 -> 2;
+            case 2 -> 3;
+            case 3 -> 4;
+            default -> 5;
+        };
+    }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestOne.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestOne.java
deleted file mode 100644
index 24417eaf730..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestOne.java
+++ /dev/null
@@ -1,12 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package org.checkstyle.suppressionxpathfilter.illegalidentifiername;
-
-/* Config:
- *
- * default
- */
-public record SuppressionXpathRegressionIllegalIdentifierNameTestOne
-        (String string,
-            String yield, // warn
-            String otherString){
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java
deleted file mode 100644
index 966376ded91..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package org.checkstyle.suppressionxpathfilter.illegalidentifiername;
-
-/* Config:
- *
- * default
- */
-public class SuppressionXpathRegressionIllegalIdentifierNameTestTwo {
-    int foo(int yield) { // warn
-        return switch (yield) {
-            case 1 -> 2;
-            case 2 -> 3;
-            case 3 -> 4;
-            default -> 5;
-        };
-    }
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationAnonymous.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationAnonymous.java
new file mode 100644
index 00000000000..fd102f38a0d
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationAnonymous.java
@@ -0,0 +1,13 @@
+//non-compiled with javac: compiling on jdk before 9
+
+package org.checkstyle.suppressionxpathfilter.illegalinstantiation;
+
+public class InputXpathIllegalInstantiationAnonymous {
+    int b = 5; // ok
+     class Inner{
+        public void test() {
+            Boolean x = new Boolean(true); // ok
+            Integer e = new Integer(b); // warn
+        }
+     }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationInterface.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationInterface.java
new file mode 100644
index 00000000000..bc77bc3d394
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationInterface.java
@@ -0,0 +1,13 @@
+//non-compiled with javac: compiling on jdk before 9
+
+package org.checkstyle.suppressionxpathfilter.illegalinstantiation;
+
+public class InputXpathIllegalInstantiationInterface {
+    interface Inner {
+        default void test() {
+            Boolean x = new Boolean(true); // ok
+            Integer e = new Integer(5); // ok
+            String s = new String(); // warn
+        }
+    }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationSimple.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationSimple.java
new file mode 100644
index 00000000000..3f5d3121c78
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationSimple.java
@@ -0,0 +1,11 @@
+//non-compiled with javac: compiling on jdk before 9
+
+package org.checkstyle.suppressionxpathfilter.illegalinstantiation;
+
+public class InputXpathIllegalInstantiationSimple {
+    int b = 5; // ok
+    public void test() {
+        Boolean x = new Boolean(true); // warn
+        Integer e = new Integer(b); // ok
+    }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationOne.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationOne.java
new file mode 100644
index 00000000000..ebdc152242f
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationOne.java
@@ -0,0 +1,8 @@
+//non-compiled with javac: compiling on jdk before 8
+//more details at https://github.com/checkstyle/checkstyle/issues/7846
+@Deprecated
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation; // warn
+
+public class InputXpathPackageAnnotationOne {
+
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationTwo.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationTwo.java
new file mode 100644
index 00000000000..62dcd55063d
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationTwo.java
@@ -0,0 +1,10 @@
+//non-compiled with javac: compiling on jdk before 8
+//more details at https://github.com/checkstyle/checkstyle/issues/7846
+@Deprecated @Generated("foo")
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation.two; // warn
+
+import javax.annotation.Generated;
+
+public class InputXpathPackageAnnotationTwo {
+
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationOne.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationOne.java
deleted file mode 100644
index 389588cf9ef..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-//non-compiled with javac: compiling on jdk before 8
-//more details at https://github.com/checkstyle/checkstyle/issues/7846
-@Deprecated
-package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation; // warn
-
-public class SuppressionXpathRegressionPackageAnnotationOne {
-
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationTwo.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationTwo.java
deleted file mode 100644
index 377d6614107..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationTwo.java
+++ /dev/null
@@ -1,10 +0,0 @@
-//non-compiled with javac: compiling on jdk before 8
-//more details at https://github.com/checkstyle/checkstyle/issues/7846
-@Deprecated @Generated("foo")
-package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation.two; // warn
-
-import javax.annotation.Generated;
-
-public class SuppressionXpathRegressionPackageAnnotationOne {
-
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathMissingPackage.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathMissingPackage.java
new file mode 100644
index 00000000000..39c32922a5e
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathMissingPackage.java
@@ -0,0 +1,5 @@
+// non-compiled with javac: missing package. Used for Testing purpose.
+// package is missing.
+public class InputXpathMissingPackage { // warn
+	// code
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathWrongPackage.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathWrongPackage.java
new file mode 100644
index 00000000000..e99f4c59afd
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathWrongPackage.java
@@ -0,0 +1,6 @@
+// non-compiled with javac: wrong package. Used for Testing purpose.
+package my.packagename.mismatch.with.folder; // warn
+
+public class InputXpathWrongPackage {
+	// code
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression1.java
deleted file mode 100644
index f0b5261b516..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// non-compiled with javac: wrong package. Used for Testing purpose.
-package my.packagename.mismatch.with.folder; // warn
-
-public class SuppressionXpathRegression1 {
-	// code
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression2.java
deleted file mode 100644
index b3c4f5b13e3..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// non-compiled with javac: missing package. Used for Testing purpose.
-// package is missing.
-public class SuppressionXpathRegression2 { // warn
-	// code
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameThree.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameThree.java
new file mode 100644
index 00000000000..9bc1d0519f9
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameThree.java
@@ -0,0 +1,4 @@
+package org.checkstyle.suppressionxpathfilter.PACKAGENAME; // warn
+
+public class InputXpathPackageNameThree {
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameFour.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameFour.java
new file mode 100644
index 00000000000..9cdd56c688d
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameFour.java
@@ -0,0 +1,9 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming;
+
+public class InputXpathPatternVariableNameFour {
+    MyClass(Object o1){
+        if (o1 instanceof String st) { // warning
+        }
+    }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameOne.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameOne.java
new file mode 100644
index 00000000000..10c43a800da
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameOne.java
@@ -0,0 +1,9 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming;
+
+public class InputXpathPatternVariableNameOne {
+   MyClass(Object o1){ 
+       if (o1 instanceof String STRING1) { // warning
+       }
+   }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameThree.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameThree.java
new file mode 100644
index 00000000000..5b3c90fbf83
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameThree.java
@@ -0,0 +1,9 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming;
+
+public class InputXpathPatternVariableNameThree {
+    MyClass(Object o1){ 
+        if (o1 instanceof String STR) { // warning
+        } 
+    }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameTwo.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameTwo.java
new file mode 100644
index 00000000000..4d051f13e61
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameTwo.java
@@ -0,0 +1,9 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming;
+
+public class InputXpathPatternVariableNameTwo {
+    MyClass(Object o1){
+        if (o1 instanceof String s) { // warning
+        }
+    }
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName1.java
deleted file mode 100644
index cb084cd2100..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.naming;
-
-public class SuppressionXpathRegressionPatternVariableName1 {
-   MyClass(Object o1){ 
-       if (o1 instanceof String STRING1) { // warning
-       }
-   }
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName2.java
deleted file mode 100644
index 1475ca2e97f..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName2.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.naming;
-
-public class SuppressionXpathRegressionPatternVariableName2 {
-    MyClass(Object o1){
-        if (o1 instanceof String s) { // warning
-        }
-    }
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName3.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName3.java
deleted file mode 100644
index 8915ded5185..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName3.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.naming;
-
-public class SuppressionXpathRegressionPatternVariableName3 {
-    MyClass(Object o1){ 
-        if (o1 instanceof String STR) { // warning
-        } 
-    }
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName4.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName4.java
deleted file mode 100644
index 8eeffc210f1..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName4.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.naming;
-
-public class SuppressionXpathRegressionPatternVariableName1 {
-    MyClass(Object o1){
-        if (o1 instanceof String st) { // warning
-        }
-    }
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameDefault.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameDefault.java
new file mode 100644
index 00000000000..47723e0ff48
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameDefault.java
@@ -0,0 +1,8 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentname;
+
+/* Config: default
+ */
+public record InputXpathRecordComponentNameDefault(int _value) { // warn
+
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameFormat.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameFormat.java
new file mode 100644
index 00000000000..80b7e9f3ba2
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameFormat.java
@@ -0,0 +1,10 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentname;
+
+/* Config:
+ * format = ^[a-z][a-zA-Z0-9]*$
+ */
+public class InputXpathRecordComponentNameFormat {
+    public record MyRecord(int _underscoreValue, // ok
+                           int otherValue) { } // warn
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName1.java
deleted file mode 100644
index 236ca74f1a4..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentname;
-
-/* Config: default
- */
-public record SuppressionXpathRecordComponentName1(int _value) { // warn
-
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName2.java
deleted file mode 100644
index a22ff3cd765..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName2.java
+++ /dev/null
@@ -1,10 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentname;
-
-/* Config:
- * format = ^[a-z][a-zA-Z0-9]*$
- */
-public class SuppressionXpathRecordComponentName2 {
-    public record MyRecord(int _underscoreValue, // ok
-                           int otherValue) { } // warn
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberCustomMax.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberCustomMax.java
new file mode 100644
index 00000000000..d1c28158498
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberCustomMax.java
@@ -0,0 +1,10 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
+
+/* Config:
+ *
+ * max = 1
+ */
+public class InputXpathRecordComponentNumberCustomMax {
+    public record MyRecord(int x, int y) { } // warn
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberDefault.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberDefault.java
new file mode 100644
index 00000000000..2ac74b62092
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberDefault.java
@@ -0,0 +1,15 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
+
+/* Config:
+ *
+ * max = 8
+ */
+public record InputXpathRecordComponentNumberDefault(int x, int y, int z, // warn
+                                                int a, int b, int c,
+                                                int d, int e, int f,
+                                                int g, int h, int i,
+                                                int j, int k,
+                                                 String... myVarargs) {
+
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber1.java
deleted file mode 100644
index 3ca4490d4d9..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber1.java
+++ /dev/null
@@ -1,15 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
-
-/* Config:
- *
- * max = 8
- */
-public record SuppressionXpathRecordComponentNumber1(int x, int y, int z, // warn
-                                                int a, int b, int c,
-                                                int d, int e, int f,
-                                                int g, int h, int i,
-                                                int j, int k,
-                                                 String... myVarargs) {
-
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber2.java
deleted file mode 100644
index 63dd71b3c36..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber2.java
+++ /dev/null
@@ -1,10 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
-
-/* Config:
- *
- * max = 1
- */
-public class SuppressionXpathRecordComponentNumber2 {
-    public record MyRecord(int x, int y) { } // warn
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/InputXpathRecordTypeParameterNameTypeDeclared.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/InputXpathRecordTypeParameterNameTypeDeclared.java
new file mode 100644
index 00000000000..6327eec7606
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/InputXpathRecordTypeParameterNameTypeDeclared.java
@@ -0,0 +1,11 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming.classtypeparametername;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+
+record InputXpathRecordTypeParameterNameTypeDeclared <foo extends Serializable & Cloneable> // warn
+(LinkedHashMap<String, Node> linkedHashMap) {
+
+}
+
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/InputXpathRecordTypeParameterNameTypeDefault.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/InputXpathRecordTypeParameterNameTypeDefault.java
new file mode 100644
index 00000000000..fec0e5c52cb
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/InputXpathRecordTypeParameterNameTypeDefault.java
@@ -0,0 +1,6 @@
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming.classtypeparametername;
+
+public record InputXpathRecordTypeParameterNameTypeDefault<t>(Integer x, String str) { // warn
+
+}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/SuppressionXpathRegressionRecordTypeParameterName1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/SuppressionXpathRegressionRecordTypeParameterName1.java
deleted file mode 100644
index 4f1bdf32bb9..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/SuppressionXpathRegressionRecordTypeParameterName1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.naming.classtypeparametername;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-
-record Other <foo extends Serializable & Cloneable> // warn
-(LinkedHashMap<String, Node> linkedHashMap) {
-
-}
-
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/SuppressionXpathRegressionRecordTypeParameterName2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/SuppressionXpathRegressionRecordTypeParameterName2.java
deleted file mode 100644
index b63183064c9..00000000000
--- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordtypeparametername/SuppressionXpathRegressionRecordTypeParameterName2.java
+++ /dev/null
@@ -1,6 +0,0 @@
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.checks.naming.classtypeparametername;
-
-public record InputRecordTypeParameterName<t>(Integer x, String str) { // warn
-
-}
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableNameInnerClassField.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableNameInnerClassField.java
new file mode 100644
index 00000000000..071f5147483
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableNameInnerClassField.java
@@ -0,0 +1,18 @@
+//non-compiled with javac: Compilable with Java17
+package org.checkstyle.suppressionxpathfilter.staticvariablename;
+
+public class InputXpathStaticVariableNameInnerClassField {
+
+     public int num1;
+
+     protected int NUM2;
+
+     public void outerMethod() {
+
+         class MyLocalClass {
+
+            static int NUM3; //warn
+
+        }
+    }
+ }
diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableNameNoAccessModifier.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableNameNoAccessModifier.java
new file mode 100644
index 00000000000..701069fb11c
--- /dev/null
+++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableNameNoAccessModifier.java
@@ -0,0 +1,8 @@
+//non-compiled with javac: Compilable with Java17
+package org.checkstyle.suppressionxpathfilter.staticvariablename;
+
+public class InputXpathStaticVariableNameNoAccessModifier {
+    {
+       static int NUM3; //warn
+    }
+ }
diff --git a/src/it/resources/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java b/src/it/resources/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java
new file mode 100644
index 00000000000..073e921e8c4
--- /dev/null
+++ b/src/it/resources/com/google/checkstyle/test/chapter3filestructure/rule3421overloadsplit/InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java
@@ -0,0 +1,18 @@
+package com.google.checkstyle.test.chapter3filestructure.rule3421overloadsplit;
+
+public class InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods {
+    public void testing() {
+    }
+
+    private void testing(int a) {
+    }
+
+    public void testing(int a, int b) {
+    }
+
+    public static void testing(String a) {
+    }
+
+    public void testing(String a, String b) {
+    }
+}
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlySwitchCasesBlocks.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlySwitchCasesBlocks.java
new file mode 100644
index 00000000000..04ca58b82d3
--- /dev/null
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlySwitchCasesBlocks.java
@@ -0,0 +1,60 @@
+package com.google.checkstyle.test.chapter4formatting.rule412nonemptyblocks;
+
+public class InputRightCurlySwitchCasesBlocks {
+
+     public static void test0() {
+        int mode = 0;
+        switch (mode) {
+            case 1: {
+                int x = 1;
+                break;
+            }
+            case 2: {
+                int x = 0;
+                break;
+            }
+        }
+    }
+
+    public static void test() {
+        int mode = 0;
+        switch (mode) {
+            case 1:{
+                int x = 1;
+                break;
+            } default :          // warn
+                int x = 0;
+        }
+    }
+
+    public static void test1() {
+        int k = 0;
+        switch (k) {
+            case 1:{
+                 int x = 1;}   // warn
+            case 2:
+                 int x = 2;
+                 break;
+        }
+    }
+
+     public static void test2() {
+        int mode = 0;
+        switch (mode) {
+            case 1: int x = 1;
+            case 2: {
+                break;
+            }
+        }
+    }
+
+     public static void test3() {
+        int k = 0;
+        switch (k) {
+            case 1:{
+                 int x = 1;
+            }
+            case 2: { int x = 2;}    // warn
+        }
+    }
+}
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/InputVariableDeclarationUsageDistanceCheck.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/InputVariableDeclarationUsageDistanceCheck.java
index a40cebc136e..b283f38f77b 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/InputVariableDeclarationUsageDistanceCheck.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4822variabledistance/InputVariableDeclarationUsageDistanceCheck.java
@@ -505,7 +505,7 @@ public void testIssue32_10() {
     public int testIssue32_11(String toDir)
             throws Exception
     {
-        int count = 0;
+        int count = 0;  // warn
         String[] files = {};
 
         System.identityHashCode("Data archival started");
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameAnnotation.java
new file mode 100644
index 00000000000..0937e6e5f54
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameAnnotation.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public class InputXpathAbbreviationAsWordInNameAnnotation {
+
+    @interface ANNOTATION { // warn
+
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameAnnotationField.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameAnnotationField.java
new file mode 100644
index 00000000000..b718b6917f3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameAnnotationField.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public @interface InputXpathAbbreviationAsWordInNameAnnotationField {
+
+    String ANNOTATION_FIELD(); // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameClass.java
new file mode 100644
index 00000000000..4f30ade2da5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameClass.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public class InputXpathAbbreviationAsWordInNameClass {
+
+    class CLASS { // warn
+
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameEnum.java
new file mode 100644
index 00000000000..7d6dd276151
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameEnum.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public class InputXpathAbbreviationAsWordInNameEnum {
+
+    enum ENUMERATION { // warn
+
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameField.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameField.java
new file mode 100644
index 00000000000..57e43f8a7a3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameField.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public class InputXpathAbbreviationAsWordInNameField {
+
+    int FIELD; // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameInterface.java
new file mode 100644
index 00000000000..05b7c86f9bf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameInterface.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public class InputXpathAbbreviationAsWordInNameInterface {
+
+    interface INTERFACE { // warn
+
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameMethod.java
new file mode 100644
index 00000000000..b501fd88b55
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameMethod.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public interface InputXpathAbbreviationAsWordInNameMethod {
+
+    void METHOD(); // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameParameter.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameParameter.java
new file mode 100644
index 00000000000..32fe570cf6c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameParameter.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public interface InputXpathAbbreviationAsWordInNameParameter {
+
+    void method(int PARAMETER); // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameVariable.java
new file mode 100644
index 00000000000..198d1c24cb2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/InputXpathAbbreviationAsWordInNameVariable.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
+
+public class InputXpathAbbreviationAsWordInNameVariable {
+
+    void method() {
+        int VARIABLE; // warn
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation.java
deleted file mode 100644
index e4b615a5017..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public class SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation {
-
-    @interface ANNOTATION { // warn
-
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField.java
deleted file mode 100644
index 13b121dfcc8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public @interface SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField {
-
-    String ANNOTATION_FIELD(); // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameClass.java
deleted file mode 100644
index f3f4ee78da8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameClass.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public class SuppressionXpathRegressionAbbreviationAsWordInNameClass {
-
-    class CLASS { // warn
-
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameEnum.java
deleted file mode 100644
index 7b3c8bfd271..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameEnum.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public class SuppressionXpathRegressionAbbreviationAsWordInNameEnum {
-
-    enum ENUMERATION { // warn
-
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameField.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameField.java
deleted file mode 100644
index ef3f4b72ee9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameField.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public class SuppressionXpathRegressionAbbreviationAsWordInNameField {
-
-    int FIELD; // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameInterface.java
deleted file mode 100644
index 3a9fd12ffd8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameInterface.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public class SuppressionXpathRegressionAbbreviationAsWordInNameInterface {
-
-    interface INTERFACE { // warn
-
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameMethod.java
deleted file mode 100644
index a9d269c868b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameMethod.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public interface SuppressionXpathRegressionAbbreviationAsWordInNameMethod {
-
-    void METHOD(); // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameParameter.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameParameter.java
deleted file mode 100644
index 99231cc3d67..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameParameter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public interface SuppressionXpathRegressionAbbreviationAsWordInNameParameter {
-
-    void method(int PARAMETER); // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameVariable.java
deleted file mode 100644
index d212b18be5a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abbreviationaswordinname/SuppressionXpathRegressionAbbreviationAsWordInNameVariable.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
-
-public class SuppressionXpathRegressionAbbreviationAsWordInNameVariable {
-
-    void method() {
-        int VARIABLE; // warn
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameInner.java
new file mode 100644
index 00000000000..e0b114df63a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameInner.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.abstractclassname;
+
+public class InputXpathAbstractClassNameInner {
+    abstract class MyClass { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameNoModifier.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameNoModifier.java
new file mode 100644
index 00000000000..33651a0cffc
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameNoModifier.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.abstractclassname;
+
+public class InputXpathAbstractClassNameNoModifier {
+    class AbstractMyClass { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameTop.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameTop.java
new file mode 100644
index 00000000000..9d7ea667f81
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/InputXpathAbstractClassNameTop.java
@@ -0,0 +1,4 @@
+package org.checkstyle.suppressionxpathfilter.abstractclassname;
+
+public abstract class InputXpathAbstractClassNameTop { // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameInner.java
deleted file mode 100644
index 421ad21f3bf..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameInner.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abstractclassname;
-
-public class SuppressionXpathRegressionAbstractClassNameInner {
-    abstract class MyClass { // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameNoModifier.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameNoModifier.java
deleted file mode 100644
index a690d379943..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameNoModifier.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abstractclassname;
-
-public class SuppressionXpathRegressionAbstractClassNameNoModifier {
-    class AbstractMyClass { // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameTop.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameTop.java
deleted file mode 100644
index bda9ac7903a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/abstractclassname/SuppressionXpathRegressionAbstractClassNameTop.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.abstractclassname;
-
-public abstract class SuppressionXpathRegressionAbstractClassNameTop { // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationAnnotation.java
new file mode 100644
index 00000000000..5a2bb56da66
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationAnnotation.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.annotationlocation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Annotation("bar") @interface InputXpathAnnotationLocationAnnotation {//warn
+
+}
+
+@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
+@interface Annotation  {
+
+    String value() default "";
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationCTOR.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationCTOR.java
new file mode 100644
index 00000000000..48011d5a5f1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationCTOR.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.annotationlocation;
+
+public class InputXpathAnnotationLocationCTOR {
+    @CTORAnnotation(value = "") public InputXpathAnnotationLocationCTOR()//warn
+    {
+        // comment
+    }
+}
+
+@interface CTORAnnotation {
+    String value();
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationClass.java
new file mode 100644
index 00000000000..20f3720a4e6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationClass.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.annotationlocation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@ClassAnnotation("bar") class InputXpathAnnotationLocationClass { //warn
+
+}
+
+@Target({ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.TYPE})
+@interface ClassAnnotation {
+
+    String value() default "";
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationEnum.java
new file mode 100644
index 00000000000..570afc65e08
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationEnum.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.annotationlocation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@EnumAnnotation("bar") enum InputXpathAnnotationLocationEnum { //warn
+
+    SuppressionXpathRegressionAnnotationLocationEnum() {
+    }
+
+}
+
+@Target({ElementType.FIELD, ElementType.TYPE})
+@interface EnumAnnotation  {
+
+    String value() default "";
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationInterface.java
new file mode 100644
index 00000000000..e9c1edbd440
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationInterface.java
@@ -0,0 +1,25 @@
+package org.checkstyle.suppressionxpathfilter.annotationlocation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Target;
+
+@InterfaceAnnotation("bar") interface InputXpathAnnotationLocationInterface { //warn
+
+}
+
+@Repeatable(InterfaceAnnotations.class)
+@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE})
+@interface InterfaceAnnotation  {
+
+    String value() default "";
+
+}
+
+@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE})
+@interface InterfaceAnnotations {
+
+    InterfaceAnnotation[] value();
+
+}
+
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationMethod.java
new file mode 100644
index 00000000000..66c51b2327a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationMethod.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.annotationlocation;
+
+public class InputXpathAnnotationLocationMethod {
+     @MethodAnnotation("foo") void foo1() {}//warn
+}
+@interface MethodAnnotation {
+     String value();
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationVariable.java
new file mode 100644
index 00000000000..d8bc41bcfa0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/InputXpathAnnotationLocationVariable.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.annotationlocation;
+
+public class InputXpathAnnotationLocationVariable {
+    @VariableAnnotation(value = "") public int b; //warn
+}
+@interface VariableAnnotation {
+    String value();
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationAnnotation.java
deleted file mode 100644
index 3bf5265ae22..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationAnnotation.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationlocation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-@Annotation("bar") @interface SuppressionXpathRegressionAnnotationLocationAnnotation {//warn
-
-}
-
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
-@interface Annotation  {
-
-    String value() default "";
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationCTOR.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationCTOR.java
deleted file mode 100644
index 55b1041aec2..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationCTOR.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationlocation;
-
-public class SuppressionXpathRegressionAnnotationLocationCTOR {
-    @CTORAnnotation(value = "") public SuppressionXpathRegressionAnnotationLocationCTOR()//warn
-    {
-        // comment
-    }
-}
-
-@interface CTORAnnotation {
-    String value();
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationClass.java
deleted file mode 100644
index 10d5357350c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationClass.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationlocation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-@ClassAnnotation("bar") class SuppressionXpathRegressionAnnotationLocationClass { //warn
-
-}
-
-@Target({ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.TYPE})
-@interface ClassAnnotation {
-
-    String value() default "";
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationEnum.java
deleted file mode 100644
index bb5266efc6c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationEnum.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationlocation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-@EnumAnnotation("bar") enum SuppressionXpathRegressionAnnotationLocationEnum { //warn
-
-    SuppressionXpathRegressionAnnotationLocationEnum() {
-    }
-
-}
-
-@Target({ElementType.FIELD, ElementType.TYPE})
-@interface EnumAnnotation  {
-
-    String value() default "";
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationInterface.java
deleted file mode 100644
index 36e6e5728ef..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationInterface.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationlocation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Target;
-
-@InterfaceAnnotation("bar") interface SuppressionXpathRegressionAnnotationLocationInterface { //warn
-
-}
-
-@Repeatable(InterfaceAnnotations.class)
-@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE})
-@interface InterfaceAnnotation  {
-
-    String value() default "";
-
-}
-
-@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE})
-@interface InterfaceAnnotations {
-
-    InterfaceAnnotation[] value();
-
-}
-
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationMethod.java
deleted file mode 100644
index 624247d91c0..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationMethod.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationlocation;
-
-public class SuppressionXpathRegressionAnnotationLocationMethod {
-     @MethodAnnotation("foo") void foo1() {}//warn
-}
-@interface MethodAnnotation {
-     String value();
-}
-
-
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationVariable.java
deleted file mode 100644
index 926318c4322..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationlocation/SuppressionXpathRegressionAnnotationLocationVariable.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationlocation;
-
-public class SuppressionXpathRegressionAnnotationLocationVariable {
-    @VariableAnnotation(value = "") public int b; //warn
-}
-@interface VariableAnnotation {
-    String value();
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineField.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineField.java
new file mode 100644
index 00000000000..cb652991f02
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineField.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.annotationonsameline;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InputXpathAnnotationOnSameLineField {
+    @Deprecated //warn
+    private List<String> names = new ArrayList<>();
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineInterface.java
new file mode 100644
index 00000000000..6dcc7ffd526
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineInterface.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.annotationonsameline;
+
+@Deprecated //warn
+interface InputXpathAnnotationOnSameLineInterface {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineMethod.java
new file mode 100644
index 00000000000..ab070e0929b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/InputXpathAnnotationOnSameLineMethod.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.annotationonsameline;
+
+public class InputXpathAnnotationOnSameLineMethod {
+    @Deprecated int x;
+
+    @Deprecated //warn
+    public int getX() {
+        return (int) x;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineOne.java
deleted file mode 100644
index 329e01a5232..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineOne.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationonsameline;
-
-public class SuppressionXpathRegressionAnnotationOnSameLineOne {
-    @Deprecated int x;
-
-    @Deprecated //warn
-    public int getX() {
-        return (int) x;
-    }
-}
-
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineThree.java
deleted file mode 100644
index 6f947db192c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineThree.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationonsameline;
-
-@Deprecated //warn
-interface SuppressionXpathRegressionAnnotationOnSameLineThree {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineTwo.java
deleted file mode 100644
index c9162d849da..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineTwo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationonsameline;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SuppressionXpathRegressionAnnotationOnSameLineTwo {
-    @Deprecated //warn
-    private List<String> names = new ArrayList<>();
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleEight.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleEight.java
new file mode 100644
index 00000000000..b8950ec7ab1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleEight.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+@SuppressWarnings({"something",}) //warn
+public class InputXpathAnnotationUseStyleEight {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleFive.java
new file mode 100644
index 00000000000..05bc97e2dd0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleFive.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+@SuppressWarnings(value={"foo", "bar"}) //warn
+public class InputXpathAnnotationUseStyleFive {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleFour.java
new file mode 100644
index 00000000000..3c0e4d2360f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleFour.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+@SuppressWarnings({}) //warn
+public class InputXpathAnnotationUseStyleFour {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleOne.java
new file mode 100644
index 00000000000..875e7f4112a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleOne.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+@Deprecated
+@SuppressWarnings({""}) //warn
+public class InputXpathAnnotationUseStyleOne {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleSeven.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleSeven.java
new file mode 100644
index 00000000000..53ed92235b8
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleSeven.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+@Deprecated
+@SuppressWarnings(value={"foo"}) //warn
+public class InputXpathAnnotationUseStyleSeven {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleSix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleSix.java
new file mode 100644
index 00000000000..919573828d1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleSix.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+@SuppressWarnings({"foo", "bar"}) //warn
+public class InputXpathAnnotationUseStyleSix {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleThree.java
new file mode 100644
index 00000000000..6563b281986
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleThree.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+public class InputXpathAnnotationUseStyleThree {
+    @SuppressWarnings({"common",}) //warn
+    public void foo() {
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleTwo.java
new file mode 100644
index 00000000000..5932ff6c020
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/InputXpathAnnotationUseStyleTwo.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.annotationusestyle;
+
+@Deprecated //warn
+public class InputXpathAnnotationUseStyleTwo {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleEight.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleEight.java
deleted file mode 100644
index 11546e6b9f8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleEight.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-@SuppressWarnings({"something",}) //warn
-public class SuppressionXpathRegressionAnnotationUseStyleEight {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleFive.java
deleted file mode 100644
index a6888344ea2..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleFive.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-@SuppressWarnings(value={"foo", "bar"}) //warn
-public class SuppressionXpathRegressionAnnotationUseStyleFive {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleFour.java
deleted file mode 100644
index 4aa1c92d31f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleFour.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-@SuppressWarnings({}) //warn
-public class SuppressionXpathRegressionAnnotationUseStyleFour {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleOne.java
deleted file mode 100644
index 7810c3ff28a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleOne.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-@Deprecated
-@SuppressWarnings({""}) //warn
-public class SuppressionXpathRegressionAnnotationUseStyleOne {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleSeven.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleSeven.java
deleted file mode 100644
index 0f2b8b72f3c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleSeven.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-@Deprecated
-@SuppressWarnings(value={"foo"}) //warn
-public class SuppressionXpathRegressionAnnotationUseStyleSeven {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleSix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleSix.java
deleted file mode 100644
index b604edb86ba..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleSix.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-@SuppressWarnings({"foo", "bar"}) //warn
-public class SuppressionXpathRegressionAnnotationUseStyleSix {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleThree.java
deleted file mode 100644
index 17d99624853..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleThree.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-public class SuppressionXpathRegressionAnnotationUseStyleThree {
-    @SuppressWarnings({"common",}) //warn
-    public void foo() {
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleTwo.java
deleted file mode 100644
index 0d382fd8e2f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/annotationusestyle/SuppressionXpathRegressionAnnotationUseStyleTwo.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.annotationusestyle;
-
-@Deprecated //warn
-public class SuppressionXpathRegressionAnnotationUseStyleTwo {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/InputXpathAnonInnerLength.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/InputXpathAnonInnerLength.java
new file mode 100644
index 00000000000..1ccacd68401
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/InputXpathAnonInnerLength.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.anoninnerlength;
+
+import java.util.Comparator;
+
+public class InputXpathAnonInnerLength {
+    public int compare(String v1, String v2) {
+        Comparator<String> comp = new Comparator<String>() { // warn: inner class is 6 lines (max=5)
+            @Override
+            public int compare(String s1, String s2) {
+                return s1.compareTo(s2);
+            }
+        };
+        return comp.compare(v1, v2);
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/InputXpathAnonInnerLengthDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/InputXpathAnonInnerLengthDefault.java
new file mode 100644
index 00000000000..2c5df7d522e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/InputXpathAnonInnerLengthDefault.java
@@ -0,0 +1,34 @@
+package org.checkstyle.suppressionxpathfilter.anoninnerlength;
+
+import java.util.Comparator;
+
+public class InputXpathAnonInnerLengthDefault {
+    public void test() {
+        Runnable runnable = new Runnable() { // warn: inner class is 26 lines (max=20)
+            @Override
+            public void run() {
+                int x = 10;
+                String s = "";
+                switch (x) {
+                    case 1:
+                        s = "A";
+                        break;
+                    case 2:
+                        s = "B";
+                        break;
+                    case 3:
+                        s = "C";
+                        break;
+                    case 4:
+                        s = "D";
+                        break;
+                    case 5:
+                        s = "E";
+                        break;
+                    default:
+                        s = "X";
+                }
+            }
+        };
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/SuppressionXpathRegressionAnonInnerLength.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/SuppressionXpathRegressionAnonInnerLength.java
deleted file mode 100644
index 35d19b502c4..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/SuppressionXpathRegressionAnonInnerLength.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.anoninnerlength;
-
-import java.util.Comparator;
-
-public class SuppressionXpathRegressionAnonInnerLength {
-    public int compare(String v1, String v2) {
-        Comparator<String> comp = new Comparator<String>() { // warn: inner class is 6 lines (max=5)
-            @Override
-            public int compare(String s1, String s2) {
-                return s1.compareTo(s2);
-            }
-        };
-        return comp.compare(v1, v2);
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/SuppressionXpathRegressionAnonInnerLengthDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/SuppressionXpathRegressionAnonInnerLengthDefault.java
deleted file mode 100644
index e1bf8c704b9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/anoninnerlength/SuppressionXpathRegressionAnonInnerLengthDefault.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.anoninnerlength;
-
-import java.util.Comparator;
-
-public class SuppressionXpathRegressionAnonInnerLengthDefault {
-    public void test() {
-        Runnable runnable = new Runnable() { // warn: inner class is 26 lines (max=20)
-            @Override
-            public void run() {
-                int x = 10;
-                String s = "";
-                switch (x) {
-                    case 1:
-                        s = "A";
-                        break;
-                    case 2:
-                        s = "B";
-                        break;
-                    case 3:
-                        s = "C";
-                        break;
-                    case 4:
-                        s = "D";
-                        break;
-                    case 5:
-                        s = "E";
-                        break;
-                    default:
-                        s = "X";
-                }
-            }
-        };
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/InputXpathArrayTrailingCommaLinear.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/InputXpathArrayTrailingCommaLinear.java
new file mode 100644
index 00000000000..9509f333bf2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/InputXpathArrayTrailingCommaLinear.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.arraytrailingcomma;
+
+public class InputXpathArrayTrailingCommaLinear
+{
+    int[] a1 = new int[]
+    {
+        1,
+        2,
+        3,
+    };
+
+    int[] a2 = new int[]
+    {
+        1,
+        2,
+        3 // warn
+    };
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/InputXpathArrayTrailingCommaMatrix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/InputXpathArrayTrailingCommaMatrix.java
new file mode 100644
index 00000000000..3b05778da78
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/InputXpathArrayTrailingCommaMatrix.java
@@ -0,0 +1,20 @@
+package org.checkstyle.suppressionxpathfilter.arraytrailingcomma;
+
+public class InputXpathArrayTrailingCommaMatrix
+{
+     int[][] d1 = new int[][]
+    {
+        {1, 2,},
+        {3, 3,},
+        {5, 6,},
+    };
+
+    int[][] d2 = new int[][]
+    {
+        {1,
+         2},
+        {3, 3,},
+        {5, 6,} // warn
+    };
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/SuppressionXpathRegressionArrayTrailingCommaOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/SuppressionXpathRegressionArrayTrailingCommaOne.java
deleted file mode 100644
index e60a014373c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/SuppressionXpathRegressionArrayTrailingCommaOne.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.arraytrailingcomma;
-
-public class SuppressionXpathRegressionArrayTrailingCommaOne
-{
-    int[] a1 = new int[]
-    {
-        1,
-        2,
-        3,
-    };
-
-    int[] a2 = new int[]
-    {
-        1,
-        2,
-        3 // warn
-    };
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/SuppressionXpathRegressionArrayTrailingCommaTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/SuppressionXpathRegressionArrayTrailingCommaTwo.java
deleted file mode 100644
index 3b00c2f10bf..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytrailingcomma/SuppressionXpathRegressionArrayTrailingCommaTwo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.arraytrailingcomma;
-
-public class SuppressionXpathRegressionArrayTrailingCommaTwo
-{
-     int[][] d1 = new int[][]
-    {
-        {1, 2,},
-        {3, 3,},
-        {5, 6,},
-    };
-
-    int[][] d2 = new int[][]
-    {
-        {1,
-         2},
-        {3, 3,},
-        {5, 6,} // warn
-    };
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/InputXpathArrayTypeStyleMethodDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/InputXpathArrayTypeStyleMethodDef.java
new file mode 100644
index 00000000000..ec4e8bafad0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/InputXpathArrayTypeStyleMethodDef.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.arraytypestyle;
+
+public class InputXpathArrayTypeStyleMethodDef {
+    byte getData()[] { // warn
+        return null;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/InputXpathArrayTypeStyleVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/InputXpathArrayTypeStyleVariable.java
new file mode 100644
index 00000000000..02ec7765a93
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/InputXpathArrayTypeStyleVariable.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.arraytypestyle;
+
+public class InputXpathArrayTypeStyleVariable {
+    String strings[]; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/SuppressionXpathRegressionArrayTypeStyleMethodDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/SuppressionXpathRegressionArrayTypeStyleMethodDef.java
deleted file mode 100644
index 4b6c0958c8f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/SuppressionXpathRegressionArrayTypeStyleMethodDef.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.arraytypestyle;
-
-public class SuppressionXpathRegressionArrayTypeStyleMethodDef {
-    byte getData()[] { // warn
-        return null;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/SuppressionXpathRegressionArrayTypeStyleVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/SuppressionXpathRegressionArrayTypeStyleVariable.java
deleted file mode 100644
index 053f033b867..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/arraytypestyle/SuppressionXpathRegressionArrayTypeStyleVariable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.arraytypestyle;
-
-public class SuppressionXpathRegressionArrayTypeStyleVariable {
-    String strings[]; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationClassFields.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationClassFields.java
new file mode 100644
index 00000000000..c7f1366fe0d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationClassFields.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.avoiddoublebraceinitialization;
+
+import java.util.*;
+
+public class InputXpathAvoidDoubleBraceInitializationClassFields {
+    List list = new ArrayList<Object>() { //warn
+        {}
+    };
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationMethodDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationMethodDef.java
new file mode 100644
index 00000000000..dc9588336c0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationMethodDef.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.avoiddoublebraceinitialization;
+
+import java.util.HashSet;
+
+public class InputXpathAvoidDoubleBraceInitializationMethodDef {
+    public void test() {
+        new HashSet<String>() {{ /** warn */
+           add("foo");
+           add("bar");
+        }};
+    }
+
+    enum InnerEnum {
+        ;
+        {}
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitialization.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitialization.java
deleted file mode 100644
index ed128f0141b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitialization.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoiddoublebraceinitialization;
-
-import java.util.*;
-
-public class SuppressionXpathRegressionAvoidDoubleBraceInitialization {
-    List list = new ArrayList<Object>() { //warn
-        {}
-    };
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java
deleted file mode 100644
index 44cce2d161e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoiddoublebraceinitialization;
-
-import java.util.HashSet;
-
-public class SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo {
-    public void test() {
-        new HashSet<String>() {{ /** warn */
-           add("foo");
-           add("bar");
-        }};
-    }
-
-    enum InnerEnum {
-        ;
-        {}
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java
new file mode 100644
index 00000000000..b5fa7ef1ce3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
+
+public class InputXpathAvoidEscapedUnicodeCharactersAllEscaped {
+    private String unitAbbrev9 = "\u03bcs"; /* warn */
+    String allCharactersEscaped = "\u03bc\u03bc";
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java
new file mode 100644
index 00000000000..86ef0415927
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
+
+public class InputXpathAvoidEscapedUnicodeCharactersControlCharacters {
+    private String unitAbbrev9 = "\u03bcs"; /* warn */
+    private String nonPrintableCharacter = "\u0008";
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersDefault.java
new file mode 100644
index 00000000000..2d476fd06e6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersDefault.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
+
+public class InputXpathAvoidEscapedUnicodeCharactersDefault {
+    private String unitAbbrev2 = "\u03bcs"; /* warn */
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java
new file mode 100644
index 00000000000..069598675a3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
+
+public class InputXpathAvoidEscapedUnicodeCharactersNonPrintable {
+    private String unitAbbrev9 = "\u03bcs"; /* warn */
+    private String nonPrintableCharacter = "\ufeff";
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersTailComment.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersTailComment.java
new file mode 100644
index 00000000000..f31f7264570
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersTailComment.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
+
+public class InputXpathAvoidEscapedUnicodeCharactersTailComment {
+    /* warn */ private String unitAbbrev9 = "\u03bcs";
+    String unitAbbrev = "\u03bcs"; // Greek letter mu, "s"
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java
deleted file mode 100644
index b3ba68b1ab6..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
-
-public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped {
-    private String unitAbbrev9 = "\u03bcs"; /* warn */
-    String allCharactersEscaped = "\u03bc\u03bc";
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java
deleted file mode 100644
index 2077c0f0476..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
-
-public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters {
-    private String unitAbbrev9 = "\u03bcs"; /* warn */
-    private String nonPrintableCharacter = "\u0008";
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java
deleted file mode 100644
index 44f22770de0..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
-
-public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault {
-    private String unitAbbrev2 = "\u03bcs"; /* warn */
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java
deleted file mode 100644
index 1802a76b5eb..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
-
-public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable {
-    private String unitAbbrev9 = "\u03bcs"; /* warn */
-    private String nonPrintableCharacter = "\ufeff";
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java
deleted file mode 100644
index c1a75705c4f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters;
-
-public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment {
-    /* warn */ private String unitAbbrev9 = "\u03bcs";
-    String unitAbbrev = "\u03bcs"; // Greek letter mu, "s"
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssert.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssert.java
new file mode 100644
index 00000000000..a1f1d82e1fa
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssert.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals;
+
+public class InputXpathAvoidInlineConditionalsAssert {
+
+    void assertA(String a) {
+        // JLS §14.10 - The assert Statement
+        // assert Expression1 : Expression2
+        assert a.equals(null) ? true : false : "Expression2"; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssign.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssign.java
new file mode 100644
index 00000000000..49ec1783c58
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssign.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals;
+
+public class InputXpathAvoidInlineConditionalsAssign {
+    String b;
+
+    void setB(String a) {
+        b = (a == null || a.length() < 1) ? null : a.substring(1); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsVariableDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsVariableDef.java
new file mode 100644
index 00000000000..a44da170dba
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsVariableDef.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals;
+
+public class InputXpathAvoidInlineConditionalsVariableDef {
+    String substring(String a) {
+        String b = (a == null || a.length() < 1) ? null : a.substring(1); // warn
+        return b;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssert.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssert.java
deleted file mode 100644
index ffe5aacf788..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssert.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals;
-
-public class SuppressionXpathRegressionAvoidInlineConditionalsAssert {
-
-    void assertA(String a) {
-        // JLS §14.10 - The assert Statement
-        // assert Expression1 : Expression2
-        assert a.equals(null) ? true : false : "Expression2"; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssign.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssign.java
deleted file mode 100644
index 9e60848ecfe..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssign.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals;
-
-public class SuppressionXpathRegressionAvoidInlineConditionalsAssign {
-    String b;
-
-    void setB(String a) {
-        b = (a == null || a.length() < 1) ? null : a.substring(1); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java
deleted file mode 100644
index 0771f55b30a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals;
-
-public class SuppressionXpathRegressionAvoidInlineConditionalsVariableDef {
-    String substring(String a) {
-        String b = (a == null || a.length() < 1) ? null : a.substring(1); // warn
-        return b;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksAllowedInSwitchCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksAllowedInSwitchCase.java
new file mode 100644
index 00000000000..ef81149e29a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksAllowedInSwitchCase.java
@@ -0,0 +1,26 @@
+package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
+
+public class InputXpathAvoidNestedBlocksAllowedInSwitchCase {
+
+    int s(int a) {
+        int x;
+        int y;
+        switch (a) {
+            case 0:
+                x = 1;
+            { // warn: statement outside block
+                y = -1;
+                break;
+            }
+            case 1: { // ok: allowInSwitchCase=true
+                x = 2;
+                y = -2;
+                break;
+            }
+            default:
+                x = 3;
+                y = -3;
+        }
+        return x + y;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksBreakOutside.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksBreakOutside.java
new file mode 100644
index 00000000000..820fef6fe29
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksBreakOutside.java
@@ -0,0 +1,19 @@
+package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
+
+public class InputXpathAvoidNestedBlocksBreakOutside {
+    int s(int a) {
+        int x;
+        int y;
+        switch (a) {
+            case 0: { // warn: break outside block
+                x = 2;
+                y = -2;
+            }
+            break;
+            default:
+                x = 3;
+                y = -3;
+        }
+        return x + y;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksEmpty.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksEmpty.java
new file mode 100644
index 00000000000..be16427fb09
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksEmpty.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
+
+public class InputXpathAvoidNestedBlocksEmpty {
+
+    void empty() {
+        {} // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java
new file mode 100644
index 00000000000..3d4f571418b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java
@@ -0,0 +1,20 @@
+package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
+
+public class InputXpathAvoidNestedBlocksNotAllowedInSwitchCase {
+
+    int s(int a) {
+        int x;
+        int y;
+        switch (a) {
+            case 0: { // warn: allowInSwitchCase=false
+                x = 2;
+                y = -2;
+                break;
+            }
+            default:
+                x = 3;
+                y = -3;
+        }
+        return x + y;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksVariable.java
new file mode 100644
index 00000000000..09ff5c51da5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksVariable.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
+
+public class InputXpathAvoidNestedBlocksVariable {
+
+    void varAssign() {
+        int whichIsWhich = 0;
+        { // warn
+            whichIsWhich = 2;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksEmpty.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksEmpty.java
deleted file mode 100644
index eacd47e4b8c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksEmpty.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
-
-public class SuppressionXpathRegressionAvoidNestedBlocksEmpty {
-
-    void empty() {
-        {} // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksSwitch1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksSwitch1.java
deleted file mode 100644
index dbd423ffd2c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksSwitch1.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
-
-public class SuppressionXpathRegressionAvoidNestedBlocksSwitch1 {
-
-    int s(int a) {
-        int x;
-        int y;
-        switch (a) {
-            case 0: { // warn: break outside block
-                x = 0;
-                y = 0;
-            }
-            break;
-            case 1:
-                x = 1;
-            { // warn: statement outside block
-                y = -1;
-                break;
-            }
-            case 2: { // warn: allowInSwitchCase=false
-                x = 2;
-                y = -2;
-                break;
-            }
-            default:
-                x = 3;
-                y = -3;
-        }
-        return x + y;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksSwitch2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksSwitch2.java
deleted file mode 100644
index f269bd95de4..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksSwitch2.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
-
-public class SuppressionXpathRegressionAvoidNestedBlocksSwitch2 {
-
-    int s(int a) {
-        int x;
-        int y;
-        switch (a) {
-            case 0: { // warn: break outside block
-                x = 0;
-                y = 0;
-            }
-            break;
-            case 1:
-                x = 1;
-            { // warn: statement outside block
-                y = -1;
-                break;
-            }
-            case 2: { // ok: allowInSwitchCase=true
-                x = 2;
-                y = -2;
-                break;
-            }
-            default:
-                x = 3;
-                y = -3;
-        }
-        return x + y;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksVariable.java
deleted file mode 100644
index 67aabc6794f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksVariable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidnestedblocks;
-
-public class SuppressionXpathRegressionAvoidNestedBlocksVariable {
-
-    void varAssign() {
-        int whichIsWhich = 0;
-        { // warn
-            whichIsWhich = 2;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/InputXpathAvoidNoArgumentSuperConstructorCallDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/InputXpathAvoidNoArgumentSuperConstructorCallDefault.java
new file mode 100644
index 00000000000..5a86328c049
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/InputXpathAvoidNoArgumentSuperConstructorCallDefault.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.avoidnoargumentsuperconstructorcall;
+
+public class InputXpathAvoidNoArgumentSuperConstructorCallDefault {
+    InputXpathAvoidNoArgumentSuperConstructorCallDefault() {
+        super(); //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/InputXpathAvoidNoArgumentSuperConstructorCallInnerClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/InputXpathAvoidNoArgumentSuperConstructorCallInnerClass.java
new file mode 100644
index 00000000000..c0323d6b5cd
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/InputXpathAvoidNoArgumentSuperConstructorCallInnerClass.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.avoidnoargumentsuperconstructorcall;
+
+public class InputXpathAvoidNoArgumentSuperConstructorCallInnerClass {
+    public void test() {
+        class Inner {
+            Inner() {
+                super(); /** warn */
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall.java
deleted file mode 100644
index 9df053da7f9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidnoargumentsuperconstructorcall;
-
-public class SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall {
-    SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCall() {
-        super(); //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCallInnerClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCallInnerClass.java
deleted file mode 100644
index d7b8b9a8609..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnoargumentsuperconstructorcall/SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCallInnerClass.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidnoargumentsuperconstructorcall;
-
-public class SuppressionXpathRegressionAvoidNoArgumentSuperConstructorCallInnerClass {
-    public void test() {
-        class Inner {
-            Inner() {
-                super(); /** warn */
-            }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/InputXpathAvoidStarImportOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/InputXpathAvoidStarImportOne.java
new file mode 100644
index 00000000000..f491d30bb65
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/InputXpathAvoidStarImportOne.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.avoidstarimport;
+
+import static javax.swing.WindowConstants.*; // warn
+
+public class InputXpathAvoidStarImportOne {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/InputXpathAvoidStarImportTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/InputXpathAvoidStarImportTwo.java
new file mode 100644
index 00000000000..428c94a9360
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/InputXpathAvoidStarImportTwo.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.avoidstarimport;
+
+import java.util.Scanner;
+import java.io.*;  // warn
+
+public class InputXpathAvoidStarImportTwo {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/SuppressionXpathRegressionAvoidStarImport1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/SuppressionXpathRegressionAvoidStarImport1.java
deleted file mode 100644
index cab4e116b7d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/SuppressionXpathRegressionAvoidStarImport1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidstarimport;
-
-import static javax.swing.WindowConstants.*; // warn
-
-public class SuppressionXpathRegressionAvoidStarImport1 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/SuppressionXpathRegressionAvoidStarImport2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/SuppressionXpathRegressionAvoidStarImport2.java
deleted file mode 100644
index 58702d9ac1b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstarimport/SuppressionXpathRegressionAvoidStarImport2.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidstarimport;
-
-import java.util.Scanner;
-import java.io.*;  // warn
-
-public class SuppressionXpathRegressionAvoidStarImport2 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/InputXpathAvoidStaticImportOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/InputXpathAvoidStaticImportOne.java
new file mode 100644
index 00000000000..ebef008acde
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/InputXpathAvoidStaticImportOne.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.avoidstaticimport;
+
+import static javax.swing.WindowConstants.*; // warn
+
+public class InputXpathAvoidStaticImportOne {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/InputXpathAvoidStaticImportTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/InputXpathAvoidStaticImportTwo.java
new file mode 100644
index 00000000000..01d11c190cf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/InputXpathAvoidStaticImportTwo.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.avoidstaticimport;
+
+import static java.io.File.createTempFile; // warn
+
+public class InputXpathAvoidStaticImportTwo {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport1.java
deleted file mode 100644
index b8c5d436fdd..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidstaticimport;
-
-import static javax.swing.WindowConstants.*; // warn
-
-public class SuppressionXpathRegressionAvoidStaticImport1 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport2.java
deleted file mode 100644
index 6bcfc7bd04a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidstaticimport/SuppressionXpathRegressionAvoidStaticImport2.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.avoidstaticimport;
-
-import static java.io.File.createTempFile; // warn
-
-public class SuppressionXpathRegressionAvoidStaticImport2 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityCatchBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityCatchBlock.java
new file mode 100644
index 00000000000..3a19cb5139f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityCatchBlock.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.booleanexpressioncomplexity;
+
+public class InputXpathBooleanExpressionComplexityCatchBlock {
+    public boolean methodOne() {
+        boolean a = true;
+        boolean b = false;
+        try {
+            a = b;
+        } catch(Exception e) {
+            boolean d = (a & b) | (b ^ a) | (a ^ b) | // warn
+                    (a & b) | (b ^ a) | (a ^ b);
+        }
+        return true;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityClassFields.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityClassFields.java
new file mode 100644
index 00000000000..e16d9af2175
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityClassFields.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.booleanexpressioncomplexity;
+
+public class InputXpathBooleanExpressionComplexityClassFields {
+    public void methodTwo() {
+        boolean a = true;
+        boolean b = false;
+
+        boolean c = (a & b) | (b ^ a); // OK
+        boolean d = (a & b) | (b ^ a) | (a ^ b) | // warn
+                (a & b) | (b ^ a) | (a ^ b);
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityConditionals.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityConditionals.java
new file mode 100644
index 00000000000..1e5dfe39b91
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityConditionals.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.booleanexpressioncomplexity;
+
+public class InputXpathBooleanExpressionComplexityConditionals {
+    public void methodThree() {
+        boolean a = true;
+        boolean b = false;
+        boolean c = true;
+
+        if (((a && (b & a)) || (b ^ a))) { // warn
+            a = b;
+        } else if ((a || b) ^ (a && b)) { // OK
+            c = b;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameAnonymous.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameAnonymous.java
new file mode 100644
index 00000000000..4eb8a94bbe9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameAnonymous.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.catchparametername;
+
+public class InputXpathCatchParameterNameAnonymous {
+    class InnerClass {
+        InnerClass() {
+            new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                    } catch (Exception e1) {
+                    } try {
+                    } catch (Exception E1) { // warn
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameEnum.java
new file mode 100644
index 00000000000..7ee62d2e901
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameEnum.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.catchparametername;
+
+public enum InputXpathCatchParameterNameEnum {
+    VALUE {
+        @Override
+        public void method(String op) {
+            switch (op) {
+                case "x":
+                    try {
+                    } catch (Exception eX) { // warn
+                    }
+                    break;
+            }
+        }
+    };
+
+    public abstract void method(String op);
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameInterface.java
new file mode 100644
index 00000000000..44e139b2352
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameInterface.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.catchparametername;
+
+interface InputXpathCatchParameterNameInterface {
+    interface InnerInterface {
+        default void method() {
+            try {
+            } catch (Exception EX) { // warn
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameLambda.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameLambda.java
new file mode 100644
index 00000000000..2bfb9cf8c87
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameLambda.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.catchparametername;
+
+import java.util.function.Function;
+
+abstract class InputXpathCatchParameterNameLambda {
+    abstract void abstracMethod();
+
+    private final Function<Integer, Integer> lambdaFunction = a -> {
+        Integer i = a;
+        for (; i > 10; i--) {
+            try {
+            } catch (Exception e) { // warn
+            }
+        }
+        return i;
+    };
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameNested.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameNested.java
new file mode 100644
index 00000000000..b81cc36c2a7
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameNested.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.catchparametername;
+
+public class InputXpathCatchParameterNameNested {
+    public static class NestedClass {
+        void method() {
+            if (true) {
+                try {
+                    try {
+                    } catch (Exception i) { // warn
+                    }
+                } catch (Exception e) {
+                }
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameSimple.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameSimple.java
new file mode 100644
index 00000000000..7fda2b7c818
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameSimple.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.catchparametername;
+
+public class InputXpathCatchParameterNameSimple {
+    void method() {
+        try {
+        } catch (Exception e1) { // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameStaticInit.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameStaticInit.java
new file mode 100644
index 00000000000..9f0f27bb31a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/catchparametername/InputXpathCatchParameterNameStaticInit.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.catchparametername;
+
+public class InputXpathCatchParameterNameStaticInit {
+    static {
+        do {
+            try {
+            } catch (Exception Ex) { // warn
+                try {
+                } catch (Exception e1) {
+                }
+            }
+        } while (false);
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/InputXpathClassMemberImpliedModifierEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/InputXpathClassMemberImpliedModifierEnum.java
new file mode 100644
index 00000000000..308f916cbe9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/InputXpathClassMemberImpliedModifierEnum.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.classmemberimpliedmodifier;
+
+public class InputXpathClassMemberImpliedModifierEnum {
+    public enum Count { //warn
+        ONE, TWO, THREE;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/InputXpathClassMemberImpliedModifierInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/InputXpathClassMemberImpliedModifierInterface.java
new file mode 100644
index 00000000000..52d9da03afc
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/InputXpathClassMemberImpliedModifierInterface.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.classmemberimpliedmodifier;
+
+public class InputXpathClassMemberImpliedModifierInterface {
+    public interface Foo { //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/SuppressionXpathRegressionClassMemberImpliedModifierOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/SuppressionXpathRegressionClassMemberImpliedModifierOne.java
deleted file mode 100644
index 69ca9275850..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/SuppressionXpathRegressionClassMemberImpliedModifierOne.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.classmemberimpliedmodifier;
-
-public class SuppressionXpathRegressionClassMemberImpliedModifierOne {
-    public interface Foo { //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/SuppressionXpathRegressionClassMemberImpliedModifierTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/SuppressionXpathRegressionClassMemberImpliedModifierTwo.java
deleted file mode 100644
index dfbfb9d42fe..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/classmemberimpliedmodifier/SuppressionXpathRegressionClassMemberImpliedModifierTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.classmemberimpliedmodifier;
-
-public class SuppressionXpathRegressionClassMemberImpliedModifierTwo {
-    public enum Count { //warn
-        ONE, TWO, THREE;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationBlock.java
new file mode 100644
index 00000000000..4fb16661a86
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationBlock.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+public class InputXpathCommentsIndentationBlock {
+          /* // warn
+           * Javadoc comment
+           */
+    float f;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationDistributedStatement.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationDistributedStatement.java
new file mode 100644
index 00000000000..98e9066a863
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationDistributedStatement.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+import java.util.Arrays;
+
+public class InputXpathCommentsIndentationDistributedStatement {
+    public void foo() {
+        String s = "";
+        int n = s
+                    .length();
+                        // Comment // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationEmptyCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationEmptyCase.java
new file mode 100644
index 00000000000..8f4dc0dfd1a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationEmptyCase.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+public class InputXpathCommentsIndentationEmptyCase {
+    int n;
+
+    public void foo() {
+        switch(n) {
+            case 1:
+// Comment // warn
+            default:
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationNonEmptyCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationNonEmptyCase.java
new file mode 100644
index 00000000000..b1ff3cbbf20
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationNonEmptyCase.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+public class InputXpathCommentsIndentationNonEmptyCase {
+    int n;
+
+    public void foo() {
+        switch(n) {
+            case 1:
+                if (true) {}
+                   // Comment // warn
+            default:
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSeparator.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSeparator.java
new file mode 100644
index 00000000000..6fa183157ed
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSeparator.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+public class InputXpathCommentsIndentationSeparator {
+    public void main(String[] args) {
+        int n;
+    }
+
+            /////////////// Comment separator // warn
+
+    public void foo() {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSingleLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSingleLine.java
new file mode 100644
index 00000000000..227bd47d3fa
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSingleLine.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+public class InputXpathCommentsIndentationSingleLine {
+    int n;
+        // Comment // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSingleLineBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSingleLineBlock.java
new file mode 100644
index 00000000000..b0a22166645
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationSingleLineBlock.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+public class InputXpathCommentsIndentationSingleLineBlock {
+    public void foo() {
+// Single Line
+// block Comment // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationWithinBlockStatement.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationWithinBlockStatement.java
new file mode 100644
index 00000000000..70bb3990841
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/InputXpathCommentsIndentationWithinBlockStatement.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.commentsindentation;
+
+public class InputXpathCommentsIndentationWithinBlockStatement {
+    public void foo() {
+        String s = "F"
+        // Comment // warn
+            + "O"
+            + "O";
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationBlock.java
deleted file mode 100644
index f760b34bdf9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationBlock.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-public class SuppressionXpathRegressionCommentsIndentationBlock {
-          /* // warn
-           * Javadoc comment
-           */
-    float f;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationDistributedStatement.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationDistributedStatement.java
deleted file mode 100644
index 40c84c8c6b9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationDistributedStatement.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-import java.util.Arrays;
-
-public class SuppressionXpathRegressionCommentsIndentationDistributedStatement {
-    public void foo() {
-        String s = "";
-        int n = s
-                    .length();
-                        // Comment // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationEmptyCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationEmptyCase.java
deleted file mode 100644
index 22effa12561..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationEmptyCase.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-public class SuppressionXpathRegressionCommentsIndentationEmptyCase {
-    int n;
-
-    public void foo() {
-        switch(n) {
-            case 1:
-// Comment // warn
-            default:
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationNonEmptyCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationNonEmptyCase.java
deleted file mode 100644
index c3f4d8f77f7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationNonEmptyCase.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-public class SuppressionXpathRegressionCommentsIndentationNonEmptyCase {
-    int n;
-
-    public void foo() {
-        switch(n) {
-            case 1:
-                if (true) {}
-                   // Comment // warn
-            default:
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSeparator.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSeparator.java
deleted file mode 100644
index 7a573524a64..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSeparator.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-public class SuppressionXpathRegressionCommentsIndentationSeparator {
-    public void main(String[] args) {
-        int n;
-    }
-
-            /////////////// Comment separator // warn
-
-    public void foo() {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSingleLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSingleLine.java
deleted file mode 100644
index c689c15c6ad..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSingleLine.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-public class SuppressionXpathRegressionCommentsIndentationSingleLine {
-    int n;
-        // Comment // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSingleLineBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSingleLineBlock.java
deleted file mode 100644
index 4c8f6feec52..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationSingleLineBlock.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-public class SuppressionXpathRegressionCommentsIndentationSingleLineBlock {
-    public void foo() {
-// Single Line
-// block Comment // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationWithinBlockStatement.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationWithinBlockStatement.java
deleted file mode 100644
index 3f6fade8191..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/commentsindentation/SuppressionXpathRegressionCommentsIndentationWithinBlockStatement.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.commentsindentation;
-
-public class SuppressionXpathRegressionCommentsIndentationWithinBlockStatement {
-    public void foo() {
-        String s = "F"
-        // Comment // warn
-            + "O"
-            + "O";
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameCamelCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameCamelCase.java
new file mode 100644
index 00000000000..a919a7c932f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameCamelCase.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.constantname;
+
+public class InputXpathConstantNameCamelCase {
+    public static final int badConstant = 2; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameLowercase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameLowercase.java
new file mode 100644
index 00000000000..20cae75b8de
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameLowercase.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.constantname;
+
+public class InputXpathConstantNameLowercase {
+    public static final int number = 7; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameWithBeginningUnderscore.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameWithBeginningUnderscore.java
new file mode 100644
index 00000000000..977b2d5b7e1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameWithBeginningUnderscore.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.constantname;
+
+public class InputXpathConstantNameWithBeginningUnderscore {
+    private static final String _CONSTANT = "a"; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameWithTwoUnderscores.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameWithTwoUnderscores.java
new file mode 100644
index 00000000000..55c52f6af36
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/InputXpathConstantNameWithTwoUnderscores.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.constantname;
+
+public class InputXpathConstantNameWithTwoUnderscores {
+    private static final int BAD__NAME = 3; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameCamelCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameCamelCase.java
deleted file mode 100644
index 95b4b1c05da..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameCamelCase.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.constantname;
-
-public class SuppressionXpathRegressionConstantNameCamelCase {
-    public static final int badConstant = 2; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameLowercase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameLowercase.java
deleted file mode 100644
index bda9d2cf6d5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameLowercase.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.constantname;
-
-public class SuppressionXpathRegressionConstantNameLowercase {
-    public static final int number = 7; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameWithBeginningUnderscore.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameWithBeginningUnderscore.java
deleted file mode 100644
index 4bff90c149a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameWithBeginningUnderscore.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.constantname;
-
-public class SuppressionXpathRegressionConstantNameWithBeginningUnderscore {
-    private static final String _CONSTANT = "a"; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameWithTwoUnderscores.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameWithTwoUnderscores.java
deleted file mode 100644
index b2c1a20ce9e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/constantname/SuppressionXpathRegressionConstantNameWithTwoUnderscores.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.constantname;
-
-public class SuppressionXpathRegressionConstantNameWithTwoUnderscores {
-    private static final int BAD__NAME = 3; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingClass.java
new file mode 100644
index 00000000000..925a9881163
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingClass.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.constructorsdeclarationgrouping;
+
+public class InputXpathConstructorsDeclarationGroupingClass {
+    InputXpathConstructorsDeclarationGroupingClass() {}
+
+    InputXpathConstructorsDeclarationGroupingClass(int a) {}
+
+    int x;
+
+    InputXpathConstructorsDeclarationGroupingClass(String str) {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingEnum.java
new file mode 100644
index 00000000000..5b41b807e06
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/constructorsdeclarationgrouping/InputXpathConstructorsDeclarationGroupingEnum.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.constructorsdeclarationgrouping;
+
+public enum InputXpathConstructorsDeclarationGroupingEnum {
+    ONE;
+
+    InputXpathConstructorsDeclarationGroupingEnum() {}
+
+    InputXpathConstructorsDeclarationGroupingEnum(String str) {}
+
+    int f;
+
+    InputXpathConstructorsDeclarationGroupingEnum(int x) {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInClass.java
new file mode 100644
index 00000000000..8a2c341fea2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInClass.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.covariantequals;
+
+public class InputXpathCovariantEqualsInClass {
+
+    public boolean equals(InputXpathCovariantEqualsInClass i) {  // warn
+        return false;
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInEnum.java
new file mode 100644
index 00000000000..80eb5e7017a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/InputXpathCovariantEqualsInEnum.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.covariantequals;
+
+public enum InputXpathCovariantEqualsInEnum {
+
+    EQUALS;
+
+    public boolean equals(InputXpathCovariantEqualsInEnum i) { // warn
+        return false;
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInClass.java
deleted file mode 100644
index 7b71091052a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInClass.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.covariantequals;
-
-public class SuppressionXpathRegressionCovariantEqualsInClass {
-
-    public boolean equals(SuppressionXpathRegressionCovariantEqualsInClass i) {  // warn
-        return false;
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInEnum.java
deleted file mode 100644
index 28de41773da..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/covariantequals/SuppressionXpathRegressionCovariantEqualsInEnum.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.covariantequals;
-
-public enum SuppressionXpathRegressionCovariantEqualsInEnum {
-
-    EQUALS;
-
-    public boolean equals(SuppressionXpathRegressionCovariantEqualsInEnum i) { // warn
-        return false;
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderFive.java
new file mode 100644
index 00000000000..9af2dd37bfd
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderFive.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.customimportorder;
+
+import static java.util.Arrays.sort;
+
+import java.io.File;
+import java.io.FileInputStream;
+import static java.lang.Math.PI; // warn
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class InputXpathCustomImportOrderFive {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderFour.java
new file mode 100644
index 00000000000..4463824e61a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderFour.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.customimportorder;
+
+import static java.util.Arrays.sort;
+import static java.lang.Math.PI;
+import com.puppycrawl.tools.checkstyle.api.DetailAST; // warn
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class InputXpathCustomImportOrderFour {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderOne.java
new file mode 100644
index 00000000000..a30e51f3e69
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderOne.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.customimportorder;
+
+import static java.util.Arrays.sort;
+import static java.lang.Math.PI; // warn
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class InputXpathCustomImportOrderOne {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderSix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderSix.java
new file mode 100644
index 00000000000..8ef832df7b9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderSix.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.customimportorder;
+
+import static java.util.Arrays.sort;
+import static java.lang.Math.PI;
+
+import com.puppycrawl.tools.checkstyle.api.DetailAST; // warn
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class InputXpathCustomImportOrderSix {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderThree.java
new file mode 100644
index 00000000000..e3148c54742
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderThree.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.customimportorder;
+
+import static java.util.Arrays.sort;
+
+import static java.lang.Math.PI; // warn
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class InputXpathCustomImportOrderThree {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderTwo.java
new file mode 100644
index 00000000000..77ee3c42279
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/InputXpathCustomImportOrderTwo.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.customimportorder;
+
+import static java.util.Arrays.sort;
+import static java.lang.Math.PI;
+import java.io.File; // warn
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class InputXpathCustomImportOrderTwo {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderFive.java
deleted file mode 100644
index eaee6967524..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderFive.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.customimportorder;
-
-import static java.util.Arrays.sort;
-
-import java.io.File;
-import java.io.FileInputStream;
-import static java.lang.Math.PI; // warn
-import java.util.HashMap;
-import java.util.Scanner;
-
-public class SuppressionXpathRegressionCustomImportOrderFive {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderFour.java
deleted file mode 100644
index bba7d260147..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderFour.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.customimportorder;
-
-import static java.util.Arrays.sort;
-import static java.lang.Math.PI;
-import com.puppycrawl.tools.checkstyle.api.DetailAST; // warn
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Scanner;
-
-public class SuppressionXpathRegressionCustomImportOrderFour {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderOne.java
deleted file mode 100644
index e9837309db8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderOne.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.customimportorder;
-
-import static java.util.Arrays.sort;
-import static java.lang.Math.PI; // warn
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Scanner;
-
-public class SuppressionXpathRegressionCustomImportOrderOne {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderSix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderSix.java
deleted file mode 100644
index 77c9b37fe26..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderSix.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.customimportorder;
-
-import static java.util.Arrays.sort;
-import static java.lang.Math.PI;
-
-import com.puppycrawl.tools.checkstyle.api.DetailAST; // warn
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Scanner;
-
-public class SuppressionXpathRegressionCustomImportOrderSix {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderThree.java
deleted file mode 100644
index cade4b0e750..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderThree.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.customimportorder;
-
-import static java.util.Arrays.sort;
-
-import static java.lang.Math.PI; // warn
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Scanner;
-
-public class SuppressionXpathRegressionCustomImportOrderThree {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderTwo.java
deleted file mode 100644
index e85ba270c0f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/customimportorder/SuppressionXpathRegressionCustomImportOrderTwo.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.customimportorder;
-
-import static java.util.Arrays.sort;
-import static java.lang.Math.PI;
-import java.io.File; // warn
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Scanner;
-
-public class SuppressionXpathRegressionCustomImportOrderTwo {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/InputXpathCyclomaticComplexityConditionals.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/InputXpathCyclomaticComplexityConditionals.java
new file mode 100644
index 00000000000..9adc4742021
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/InputXpathCyclomaticComplexityConditionals.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.cyclomaticcomplexity;
+
+public class InputXpathCyclomaticComplexityConditionals {
+    public void test(int a, int b) { //warn
+        if (a > b) {
+
+        } else {
+
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/InputXpathCyclomaticComplexitySwitchBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/InputXpathCyclomaticComplexitySwitchBlock.java
new file mode 100644
index 00000000000..fc503199de9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/InputXpathCyclomaticComplexitySwitchBlock.java
@@ -0,0 +1,25 @@
+package org.checkstyle.suppressionxpathfilter.cyclomaticcomplexity;
+
+public class InputXpathCyclomaticComplexitySwitchBlock {
+
+
+    public void foo2() { //warn
+        String programmingLanguage = "Java";
+        switch (programmingLanguage) {
+            case "Java":
+            case "C#":
+            case "C++":
+                String.CASE_INSENSITIVE_ORDER.equals(programmingLanguage
+                        + " is an object oriented programming language.");
+                break;
+            case "C":
+                String.CASE_INSENSITIVE_ORDER.equals(programmingLanguage
+                        + " is not an object oriented programming language.");
+                break;
+            default:
+                String.CASE_INSENSITIVE_ORDER.equals(programmingLanguage
+                        + " is unknown language.");
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/SuppressionXpathRegressionCyclomaticComplexityOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/SuppressionXpathRegressionCyclomaticComplexityOne.java
deleted file mode 100644
index f13c30fe797..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/SuppressionXpathRegressionCyclomaticComplexityOne.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.cyclomaticcomplexity;
-
-public class SuppressionXpathRegressionCyclomaticComplexityOne {
-    public void test(int a, int b) { //warn
-        if (a > b) {
-
-        } else {
-
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/SuppressionXpathRegressionCyclomaticComplexityTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/SuppressionXpathRegressionCyclomaticComplexityTwo.java
deleted file mode 100644
index 110b1029892..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/cyclomaticcomplexity/SuppressionXpathRegressionCyclomaticComplexityTwo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.cyclomaticcomplexity;
-
-public class SuppressionXpathRegressionCyclomaticComplexityTwo {
-
-
-    public void foo2() { //warn
-        String programmingLanguage = "Java";
-        switch (programmingLanguage) {
-            case "Java":
-            case "C#":
-            case "C++":
-                String.CASE_INSENSITIVE_ORDER.equals(programmingLanguage
-                        + " is an object oriented programming language.");
-                break;
-            case "C":
-                String.CASE_INSENSITIVE_ORDER.equals(programmingLanguage
-                        + " is not an object oriented programming language.");
-                break;
-            default:
-                String.CASE_INSENSITIVE_ORDER.equals(programmingLanguage
-                        + " is unknown language.");
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/InputXpathDeclarationOrderNonStatic.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/InputXpathDeclarationOrderNonStatic.java
new file mode 100644
index 00000000000..b49ab808fdf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/InputXpathDeclarationOrderNonStatic.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.declarationorder;
+
+public class InputXpathDeclarationOrderNonStatic {
+    private int age;
+    public String name;  //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/InputXpathDeclarationOrderStatic.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/InputXpathDeclarationOrderStatic.java
new file mode 100644
index 00000000000..a0b19c7f25a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/InputXpathDeclarationOrderStatic.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.declarationorder;
+
+public class InputXpathDeclarationOrderStatic {
+    public static void foo1() {}
+    public static final double MAX = 0.60; //warn
+    public static void foo2() {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/SuppressionXpathRegressionDeclarationOrderOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/SuppressionXpathRegressionDeclarationOrderOne.java
deleted file mode 100644
index e2f252f4781..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/SuppressionXpathRegressionDeclarationOrderOne.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.declarationorder;
-
-public class SuppressionXpathRegressionDeclarationOrderOne {
-    private int age;
-    public String name;  //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/SuppressionXpathRegressionDeclarationOrderTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/SuppressionXpathRegressionDeclarationOrderTwo.java
deleted file mode 100644
index da419e17099..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/declarationorder/SuppressionXpathRegressionDeclarationOrderTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.declarationorder;
-
-public class SuppressionXpathRegressionDeclarationOrderTwo {
-    public static void foo1() {}
-    public static final double MAX = 0.60; //warn
-    public static void foo2() {}
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/InputXpathDefaultComesLastEmptyCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/InputXpathDefaultComesLastEmptyCase.java
new file mode 100644
index 00000000000..04cbd0b4e98
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/InputXpathDefaultComesLastEmptyCase.java
@@ -0,0 +1,22 @@
+package org.checkstyle.suppressionxpathfilter.defaultcomeslast;
+
+public class InputXpathDefaultComesLastEmptyCase {
+    public void test(int i) {
+        switch (i) {
+            case 1:
+            default:
+                break;
+            case 2:
+                break;
+        }
+
+        switch (i) {
+            case 1:
+            default: //warn
+            case 2:
+                break;
+            case 3:
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/InputXpathDefaultComesLastNonEmptyCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/InputXpathDefaultComesLastNonEmptyCase.java
new file mode 100644
index 00000000000..63ca796837c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/InputXpathDefaultComesLastNonEmptyCase.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.defaultcomeslast;
+
+public class InputXpathDefaultComesLastNonEmptyCase {
+    public void test() {
+        String lang = "Java";
+        int id = 0;
+        switch (lang) {
+            default : id = -1; //warn
+            case "C++" : id = 1; break;
+            case "Python" : id = 2; break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/SuppressionXpathRegressionDefaultComesLastOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/SuppressionXpathRegressionDefaultComesLastOne.java
deleted file mode 100644
index f05f9b2422b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/SuppressionXpathRegressionDefaultComesLastOne.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.defaultcomeslast;
-
-public class SuppressionXpathRegressionDefaultComesLastOne {
-    public void test() {
-        String lang = "Java";
-        int id = 0;
-        switch (lang) {
-            default : id = -1; //warn
-            case "C++" : id = 1; break;
-            case "Python" : id = 2; break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/SuppressionXpathRegressionDefaultComesLastTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/SuppressionXpathRegressionDefaultComesLastTwo.java
deleted file mode 100644
index 6e401ea4208..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/defaultcomeslast/SuppressionXpathRegressionDefaultComesLastTwo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.defaultcomeslast;
-
-public class SuppressionXpathRegressionDefaultComesLastTwo {
-    public void test(int i) {
-        switch (i) {
-            case 1:
-            default:
-                break;
-            case 2:
-                break;
-        }
-
-        switch (i) {
-            case 1:
-            default: //warn
-            case 2:
-                break;
-            case 3:
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyblock/InputXpathEmptyBlockEmpty.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyblock/InputXpathEmptyBlockEmpty.java
new file mode 100644
index 00000000000..110b46909c4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyblock/InputXpathEmptyBlockEmpty.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.emptyblock;
+
+public class InputXpathEmptyBlockEmpty {
+    private void emptyLoop() {
+        for (int i = 0; i < 10; i++) {} // warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyblock/SuppressionXpathRegressionEmptyBlockEmpty.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyblock/SuppressionXpathRegressionEmptyBlockEmpty.java
deleted file mode 100644
index 7a078b8dcee..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyblock/SuppressionXpathRegressionEmptyBlockEmpty.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptyblock;
-
-public class SuppressionXpathRegressionEmptyBlockEmpty {
-    private void emptyLoop() {
-        for (int i = 0; i < 10; i++) {} // warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/InputXpathEmptyCatchBlockOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/InputXpathEmptyCatchBlockOne.java
new file mode 100644
index 00000000000..aa61045cbbf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/InputXpathEmptyCatchBlockOne.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.emptycatchblock;
+
+public class InputXpathEmptyCatchBlockOne {
+    public static void main(String[] args) {
+
+        try {
+            throw new RuntimeException();
+        } catch (RuntimeException e) {} //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/InputXpathEmptyCatchBlockTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/InputXpathEmptyCatchBlockTwo.java
new file mode 100644
index 00000000000..dc90e2be539
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/InputXpathEmptyCatchBlockTwo.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.emptycatchblock;
+
+public class InputXpathEmptyCatchBlockTwo {
+    public static void main(String[] args) {
+
+        try {
+            throw new RuntimeException();
+        } catch (RuntimeException e) /*warn*/ {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/SuppressionXpathRegressionEmptyCatchBlock1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/SuppressionXpathRegressionEmptyCatchBlock1.java
deleted file mode 100644
index 97c58ccac5b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/SuppressionXpathRegressionEmptyCatchBlock1.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptycatchblock;
-
-public class SuppressionXpathRegressionEmptyCatchBlock1 {
-    public static void main(String[] args) {
-
-        try {
-            throw new RuntimeException();
-        } catch (RuntimeException e) {} //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/SuppressionXpathRegressionEmptyCatchBlock2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/SuppressionXpathRegressionEmptyCatchBlock2.java
deleted file mode 100644
index 8627de4634e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptycatchblock/SuppressionXpathRegressionEmptyCatchBlock2.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptycatchblock;
-
-public class SuppressionXpathRegressionEmptyCatchBlock2 {
-    public static void main(String[] args) {
-
-        try {
-            throw new RuntimeException();
-        } catch (RuntimeException e) /*warn*/ {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/InputXpathEmptyForInitializerPadNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/InputXpathEmptyForInitializerPadNotPreceded.java
new file mode 100644
index 00000000000..3e1d4aa2160
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/InputXpathEmptyForInitializerPadNotPreceded.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.emptyforinitializerpad;
+
+public class InputXpathEmptyForInitializerPadNotPreceded {
+    void method(int bad, int good) {
+        for (; bad < 1; bad++ ) {//warn
+        }
+        for ( ; good < 2; good++ ) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/InputXpathEmptyForInitializerPadPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/InputXpathEmptyForInitializerPadPreceded.java
new file mode 100644
index 00000000000..ee94d554412
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/InputXpathEmptyForInitializerPadPreceded.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.emptyforinitializerpad;
+
+public class InputXpathEmptyForInitializerPadPreceded {
+    void method(int bad, int good) {
+        for ( ; bad < 1; bad++ ) {//warn
+        }
+        for (; good < 2; good++ ) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/SuppressionXpathRegressionEmptyForInitializerPadNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/SuppressionXpathRegressionEmptyForInitializerPadNotPreceded.java
deleted file mode 100644
index ea29614aba3..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/SuppressionXpathRegressionEmptyForInitializerPadNotPreceded.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptyforinitializerpad;
-
-public class SuppressionXpathRegressionEmptyForInitializerPadNotPreceded {
-    void method(int bad, int good) {
-        for (; bad < 1; bad++ ) {//warn
-        }
-        for ( ; good < 2; good++ ) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/SuppressionXpathRegressionEmptyForInitializerPadPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/SuppressionXpathRegressionEmptyForInitializerPadPreceded.java
deleted file mode 100644
index 56787308207..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforinitializerpad/SuppressionXpathRegressionEmptyForInitializerPadPreceded.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptyforinitializerpad;
-
-public class SuppressionXpathRegressionEmptyForInitializerPadPreceded {
-    void method(int bad, int good) {
-        for ( ; bad < 1; bad++ ) {//warn
-        }
-        for (; good < 2; good++ ) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/InputXpathEmptyForIteratorPadFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/InputXpathEmptyForIteratorPadFollowed.java
new file mode 100644
index 00000000000..96b10544294
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/InputXpathEmptyForIteratorPadFollowed.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.emptyforiteratorpad;
+
+public class InputXpathEmptyForIteratorPadFollowed {
+    void method(int bad, int good) {
+        for (bad = 0; ++bad < 1; ) {//warn
+        }
+        for (good = 0; ++good < 2;) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/InputXpathEmptyForIteratorPadNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/InputXpathEmptyForIteratorPadNotFollowed.java
new file mode 100644
index 00000000000..1b538b9a706
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/InputXpathEmptyForIteratorPadNotFollowed.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.emptyforiteratorpad;
+
+public class InputXpathEmptyForIteratorPadNotFollowed {
+    void method(int bad, int good) {
+        for (bad = 0; ++bad < 2;) {//warn
+        }
+        for (good = 0; ++good < 1; ) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/SuppressionXpathRegressionEmptyForIteratorPadFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/SuppressionXpathRegressionEmptyForIteratorPadFollowed.java
deleted file mode 100644
index cceae02bd9f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/SuppressionXpathRegressionEmptyForIteratorPadFollowed.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptyforiteratorpad;
-
-public class SuppressionXpathRegressionEmptyForIteratorPadFollowed {
-    void method(int bad, int good) {
-        for (bad = 0; ++bad < 1; ) {//warn
-        }
-        for (good = 0; ++good < 2;) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/SuppressionXpathRegressionEmptyForIteratorPadNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/SuppressionXpathRegressionEmptyForIteratorPadNotFollowed.java
deleted file mode 100644
index 282516add90..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptyforiteratorpad/SuppressionXpathRegressionEmptyForIteratorPadNotFollowed.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptyforiteratorpad;
-
-public class SuppressionXpathRegressionEmptyForIteratorPadNotFollowed {
-    void method(int bad, int good) {
-        for (bad = 0; ++bad < 2;) {//warn
-        }
-        for (good = 0; ++good < 1; ) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFive.java
new file mode 100644
index 00000000000..cc9486393f5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFive.java
@@ -0,0 +1,22 @@
+package org.checkstyle.suppressionxpathfilter.emptylineseparator;
+
+import java.io.IOException;
+
+public class InputXpathEmptyLineSeparatorFive {
+
+    int foo1() throws Exception {
+        int a = 1;
+        int b = 2;
+        try {
+            if (a != b) {
+                throw new IOException();
+            }
+            // warn
+
+
+        } catch(IOException e) {
+            return 1;
+        }
+        return 0;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFour.java
new file mode 100644
index 00000000000..9ebe69cf295
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFour.java
@@ -0,0 +1,15 @@
+///////////////////////////////////////////////////
+//HEADER
+///////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter.emptylineseparator;
+
+class InputXpathEmptyLineSeparatorFour {
+    public static final int FOO_CONST = 1;
+
+    public void foo() {}
+
+    public void foo1() {} // warn
+
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorOne.java
similarity index 100%
rename from src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator1.java
rename to src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorOne.java
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorThree.java
new file mode 100644
index 00000000000..f2beb9314cf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorThree.java
@@ -0,0 +1,10 @@
+///////////////////////////////////////////////////
+//HEADER
+///////////////////////////////////////////////////
+package org.checkstyle.suppressionxpathfilter.emptylineseparator;
+import java.io.*;
+class InputXpathEmptyLineSeparatorThree {
+    public static final int FOO_CONST = 1;
+    public void foo() {}
+    public void foo1() {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorTwo.java
similarity index 100%
rename from src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator2.java
rename to src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorTwo.java
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator3.java
deleted file mode 100644
index 84616eb5f39..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator3.java
+++ /dev/null
@@ -1,10 +0,0 @@
-///////////////////////////////////////////////////
-//HEADER
-///////////////////////////////////////////////////
-package org.checkstyle.suppressionxpathfilter.emptylineseparator;
-import java.io.*;
-class SuppressionXpathRegressionEmptyLineSeparator3 {
-    public static final int FOO_CONST = 1;
-    public void foo() {}
-    public void foo1() {} // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator4.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator4.java
deleted file mode 100644
index 6a23443ad00..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator4.java
+++ /dev/null
@@ -1,15 +0,0 @@
-///////////////////////////////////////////////////
-//HEADER
-///////////////////////////////////////////////////
-
-package org.checkstyle.suppressionxpathfilter.emptylineseparator;
-
-class SuppressionXpathRegressionEmptyLineSeparator4 {
-    public static final int FOO_CONST = 1;
-
-    public void foo() {}
-
-    public void foo1() {} // warn
-
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java
deleted file mode 100644
index 38086505d84..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptylineseparator;
-
-import java.io.IOException;
-
-public class SuppressionXpathRegressionEmptyLineSeparator5 {
-
-    int foo1() throws Exception {
-        int a = 1;
-        int b = 2;
-        try {
-            if (a != b) {
-                throw new IOException();
-            }
-            // warn
-
-
-        } catch(IOException e) {
-            return 1;
-        }
-        return 0;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/InputXpathEmptyStatementConditionals.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/InputXpathEmptyStatementConditionals.java
new file mode 100644
index 00000000000..5b9babce63f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/InputXpathEmptyStatementConditionals.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.emptystatement;
+
+public class InputXpathEmptyStatementConditionals {
+    public void foo() {
+        int i = 0;
+        if (i > 3); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/InputXpathEmptyStatementLoops.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/InputXpathEmptyStatementLoops.java
new file mode 100644
index 00000000000..217c0cef2ad
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/InputXpathEmptyStatementLoops.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.emptystatement;
+
+public class InputXpathEmptyStatementLoops {
+    public void foo() {
+        for (int i = 0; i < 5; i++); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement1.java
deleted file mode 100644
index 7fcc83dd48b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement1.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptystatement;
-
-public class SuppressionXpathRegressionEmptyStatement1 {
-    public void foo() {
-        for (int i = 0; i < 5; i++); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement2.java
deleted file mode 100644
index 3e254e5764a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.emptystatement;
-
-public class SuppressionXpathRegressionEmptyStatement2 {
-    public void foo() {
-        int i = 0;
-        if (i > 3); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNull.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNull.java
new file mode 100644
index 00000000000..1e7c41945d6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNull.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.equalsavoidnull;
+
+public class InputXpathEqualsAvoidNull {
+    public void test() {
+        String nullString = null;
+        nullString.equals("Another string"); //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNullIgnoreCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNullIgnoreCase.java
new file mode 100644
index 00000000000..a6762b01f47
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNullIgnoreCase.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.equalsavoidnull;
+
+public class InputXpathEqualsAvoidNullIgnoreCase {
+    public void test() {
+        String nullString = null;
+        nullString.equalsIgnoreCase("Another string"); //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNull.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNull.java
deleted file mode 100644
index 551cecbfc48..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNull.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.equalsavoidnull;
-
-public class SuppressionXpathRegressionEqualsAvoidNull {
-    public void test() {
-        String nullString = null;
-        nullString.equals("Another string"); //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java
deleted file mode 100644
index 892fcb79a27..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.equalsavoidnull;
-
-public class SuppressionXpathRegressionEqualsAvoidNullIgnoreCase {
-    public void test() {
-        String nullString = null;
-        nullString.equalsIgnoreCase("Another string"); //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeEqualsOnly.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeEqualsOnly.java
new file mode 100644
index 00000000000..f18f089bd3e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeEqualsOnly.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.equalshashcode;
+
+public class InputXpathEqualsHashCodeEqualsOnly {
+    public boolean equals(Object obj) { // warn
+        return false;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeHashCodeOnly.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeHashCodeOnly.java
new file mode 100644
index 00000000000..377992f1472
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeHashCodeOnly.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.equalshashcode;
+
+public class InputXpathEqualsHashCodeHashCodeOnly {
+    public int hashCode() { // warn
+        return 0;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeNestedCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeNestedCase.java
new file mode 100644
index 00000000000..69b2c7b6403
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeNestedCase.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.equalshashcode;
+
+public class InputXpathEqualsHashCodeNestedCase {
+    public static class innerClass {
+        public boolean equals(Object obj) { // warn
+            return false;
+        }
+    }
+}
+
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountCustomMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountCustomMax.java
new file mode 100644
index 00000000000..71af3de777b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountCustomMax.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.executablestatementcount;
+
+public class InputXpathExecutableStatementCountCustomMax {
+    public InputXpathExecutableStatementCountCustomMax() // warn
+    {
+        int i = 1;
+        if (System.currentTimeMillis() == 0) {
+        } else if (System.currentTimeMillis() == 0) {
+        } else {
+        }
+    }
+    /** Empty constructor */
+    public InputXpathExecutableStatementCountCustomMax(int i) {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountDefault.java
new file mode 100644
index 00000000000..dda072f955f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountDefault.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.executablestatementcount;
+
+public class InputXpathExecutableStatementCountDefault {
+    public void ElseIfLadder() { // warn
+        if (System.currentTimeMillis() == 0) {
+        } else {
+            if (System.currentTimeMillis() == 0) {
+            } else {
+                if (System.currentTimeMillis() == 0) {
+                }
+            }
+
+            if (System.currentTimeMillis() == 0) {
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountLambdas.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountLambdas.java
new file mode 100644
index 00000000000..1905a2d469e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/executablestatementcount/InputXpathExecutableStatementCountLambdas.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.executablestatementcount;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class InputXpathExecutableStatementCountLambdas {
+    Consumer c = (s) -> { // warn
+        String str = s.toString();
+        str = str + "!";
+    };
+
+    Consumer t = a -> a.toString().trim(); // ok
+    Function x1 = a -> a; // ok
+    Function y = a -> null; // ok
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationObjectType.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationObjectType.java
new file mode 100644
index 00000000000..47b032e5cc4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationObjectType.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.explicitinitialization;
+
+public class InputXpathExplicitInitializationObjectType {
+    private int a;
+
+    private Object bar = null; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationPrimitiveType.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationPrimitiveType.java
new file mode 100644
index 00000000000..508b9debe19
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationPrimitiveType.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.explicitinitialization;
+
+public class InputXpathExplicitInitializationPrimitiveType {
+    private int a = 0; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationOne.java
deleted file mode 100644
index 8fff9736304..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationOne.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.explicitinitialization;
-
-public class SuppressionXpathRegressionExplicitInitializationOne {
-    private int a = 0; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationTwo.java
deleted file mode 100644
index 2576ccdec13..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.explicitinitialization;
-
-public class SuppressionXpathRegressionExplicitInitializationTwo {
-    private int a;
-
-    private Object bar = null; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThrough.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThrough.java
new file mode 100644
index 00000000000..90b245bb840
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThrough.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.fallthrough;
+
+public class InputXpathFallThrough {
+    public void test() {
+        int id = 0;
+        switch (id) {
+            case 0: break;
+            case 1: if (1 == 0) {
+                break;
+            };
+            case 2: break; //warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThroughDefaultCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThroughDefaultCase.java
new file mode 100644
index 00000000000..57e60f0b97d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThroughDefaultCase.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.fallthrough;
+
+public class InputXpathFallThroughDefaultCase {
+    void methodFallThruCustomWords(int i, int j, boolean cond) {
+        while (true) {
+            switch (i){
+                case 0:
+                    i++;
+                    break;
+                default: //warn
+                    i++;
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughOne.java
deleted file mode 100644
index 8fa1f7cb6c5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughOne.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.fallthrough;
-
-public class SuppressionXpathRegressionFallThroughOne {
-    public void test() {
-        int id = 0;
-        switch (id) {
-            case 0: break;
-            case 1: if (1 == 0) {
-                break;
-            };
-            case 2: break; //warn
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughTwo.java
deleted file mode 100644
index 69bcf349797..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughTwo.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.fallthrough;
-
-public class SuppressionXpathRegressionFallThroughTwo {
-    void methodFallThruCustomWords(int i, int j, boolean cond) {
-        while (true) {
-            switch (i){
-                case 0:
-                    i++;
-                    break;
-                default: //warn
-                    i++;
-            }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassDefault.java
new file mode 100644
index 00000000000..2295ed6e864
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassDefault.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.finalclass;
+
+public class InputXpathFinalClassDefault { // warn
+    private InputXpathFinalClassDefault() {
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassInnerClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassInnerClass.java
new file mode 100644
index 00000000000..a86934321b3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassInnerClass.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.finalclass;
+
+public class InputXpathFinalClassInnerClass {
+    class Test { // warn
+        private Test(){
+
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass1.java
deleted file mode 100644
index be192f9e2b3..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass1.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.finalclass;
-
-public class SuppressionXpathRegressionFinalClass1 { // warn
-    private SuppressionXpathRegressionFinalClass1() {
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass2.java
deleted file mode 100644
index 36ac58ec39d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass2.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.finalclass;
-
-public class SuppressionXpathRegressionFinalClass2 {
-    class Test { // warn
-        private Test(){
-
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableConditionals.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableConditionals.java
new file mode 100644
index 00000000000..b797dbf73ae
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableConditionals.java
@@ -0,0 +1,22 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableConditionals {
+    private void checkCodeBlock() {
+        try {
+
+            final int from;
+            if (true) {
+                from = 0;
+            } else if (true) {
+                boolean body = false; // warn
+                if (body) return;
+                from = 0;
+            } else {
+                return;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
+
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableCtor.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableCtor.java
new file mode 100644
index 00000000000..b65ca947381
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableCtor.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableCtor {
+    InputXpathFinalLocalVariableCtor(int a) { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableEnhancedFor.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableEnhancedFor.java
new file mode 100644
index 00000000000..b3eb6bb6118
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableEnhancedFor.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableEnhancedFor {
+    public void method1()
+    {
+        final java.util.List<Object> list = new java.util.ArrayList<>();
+
+        for(Object a : list){ // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableForLoop.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableForLoop.java
new file mode 100644
index 00000000000..0532b9fe878
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableForLoop.java
@@ -0,0 +1,20 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableForLoop {
+    public void method2() {
+        for (int i = 0; i < 5; i++) {
+            int x; // warn
+            x = 3;
+        }
+        int y;
+        for (int i = 0; i < 5; i++) {
+            y = 3;
+        }
+        for (int i = 0; i < 5; i++) {
+            int z;
+            for (int j = 0; j < 5; j++) {
+                z = 3;
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableInnerClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableInnerClass.java
new file mode 100644
index 00000000000..11c2118c219
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableInnerClass.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableInnerClass {
+    class InnerClass {
+        public void test1() {
+            final boolean b = true;
+            int shouldBeFinal; // warn
+
+            if (b) {
+                shouldBeFinal = 1;
+            } else {
+                shouldBeFinal = 2;
+            }
+        }
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableMethodDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableMethodDef.java
new file mode 100644
index 00000000000..ce6e4a69268
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableMethodDef.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableMethodDef {
+    public void testMethod() {
+        int x; // warn
+        x = 3;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableParameterDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableParameterDef.java
new file mode 100644
index 00000000000..397d16d05fc
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableParameterDef.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableParameterDef {
+    public void method(int aArg, final int aFinal, int aArg2) // warn
+    {
+        int z = 0;
+
+        z++;
+
+        aArg2++;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableSwitchCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableSwitchCase.java
new file mode 100644
index 00000000000..20586314afc
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableSwitchCase.java
@@ -0,0 +1,23 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableSwitchCase {
+    class InnerClass {
+        public void method(final int i) {
+            switch (i) {
+                case 1:
+                    int foo = 1; // warn
+                    break;
+                default:
+            }
+            switch (i) {
+                case 1:
+                    int foo = 1;
+                    break;
+                case 2:
+                    foo = 2;
+                    break;
+                default:
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableTryBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableTryBlock.java
new file mode 100644
index 00000000000..a8f11e7851d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finallocalvariable/InputXpathFinalLocalVariableTryBlock.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.finallocalvariable;
+
+public class InputXpathFinalLocalVariableTryBlock {
+    private void checkCodeBlock() {
+        try {
+            int start = 0; // warn
+
+            final int from;
+            if (true) {
+                from = 0;
+            } else {
+                return;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersAnonymous.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersAnonymous.java
new file mode 100644
index 00000000000..bc55f331780
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersAnonymous.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.finalparameters;
+
+public class InputXpathFinalParametersAnonymous {
+
+    class AnonymousClass {
+        public void method(int argOne, int argTwo) {} // ok, int is primitive
+    }
+
+    public void createClass() {
+        AnonymousClass obj = new AnonymousClass() {
+            public void method(String[] argOne, final String[] argTwo) {} // warn
+        };
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersCtor.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersCtor.java
new file mode 100644
index 00000000000..b13701fc3f6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersCtor.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.finalparameters;
+
+public class InputXpathFinalParametersCtor {
+
+    public InputXpathFinalParametersCtor(int argOne, final int argTwo) { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersMethod.java
new file mode 100644
index 00000000000..136df31d81c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalparameters/InputXpathFinalParametersMethod.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.finalparameters;
+
+public class InputXpathFinalParametersMethod {
+
+    public void method(int argOne, final int argTwo) { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceEnd.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceEnd.java
new file mode 100644
index 00000000000..951c9a4b9b4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceEnd.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.util.Collections;
+
+public class InputXpathGenericWhitespaceEnd {
+    void bad(Class<? > cls) {//warn
+    }
+    void good(Class<?> cls) {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedOne.java
new file mode 100644
index 00000000000..6950860b8af
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedOne.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.io.Serializable;
+
+public class InputXpathGenericWhitespaceNestedOne {
+    <E extends Enum<E>& Serializable> void bad() {//warn
+    }
+    <E extends Enum<E> & Serializable> void good() {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedThree.java
new file mode 100644
index 00000000000..2438476eccd
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedThree.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.io.Serializable;
+
+public class InputXpathGenericWhitespaceNestedThree {
+    <E extends Enum<E> , X> void bad() {//warn
+    }
+    <E extends Enum<E>, X> void good() {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedTwo.java
new file mode 100644
index 00000000000..f7b155f9ce9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceNestedTwo.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.io.Serializable;
+
+public class InputXpathGenericWhitespaceNestedTwo {
+    <E extends Enum<E>  & Serializable> void bad() {//warn
+    }
+    <E extends Enum<E> & Serializable> void good() {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceSingleOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceSingleOne.java
new file mode 100644
index 00000000000..69859ea87b6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceSingleOne.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.util.Collections;
+
+public class InputXpathGenericWhitespaceSingleOne {
+    Object bad = Collections.<Object> emptySet();//warn
+    Object good = Collections.<Object>emptySet();
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceSingleTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceSingleTwo.java
new file mode 100644
index 00000000000..2bf83017b4b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceSingleTwo.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.io.Serializable;
+
+public class InputXpathGenericWhitespaceSingleTwo {
+    <E>void bad() {//warn
+    }
+    <E> void good() {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartOne.java
new file mode 100644
index 00000000000..01865d2d7aa
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartOne.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.util.Collections;
+
+public class InputXpathGenericWhitespaceStartOne {
+    public<E> void bad() {//warn
+    }
+    public <E> void good() {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartThree.java
new file mode 100644
index 00000000000..b6214eb4fc5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartThree.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.util.Collections;
+
+public class InputXpathGenericWhitespaceStartThree {
+    < E> void bad() {//warn
+    }
+    <E> void good() {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartTwo.java
new file mode 100644
index 00000000000..ee0ce7f39bb
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/InputXpathGenericWhitespaceStartTwo.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.genericwhitespace;
+
+import java.util.function.Consumer;
+
+public class InputXpathGenericWhitespaceStartTwo {
+    public <E> void bad(Consumer <E> consumer) {//warn
+    }
+    public <E> void good(Consumer<E> consumer) {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceEnd.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceEnd.java
deleted file mode 100644
index 6ac5e5a4c32..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceEnd.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.util.Collections;
-
-public class SuppressionXpathRegressionGenericWhitespaceEnd {
-    void bad(Class<? > cls) {//warn
-    }
-    void good(Class<?> cls) {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsOne.java
deleted file mode 100644
index a392d6dd912..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsOne.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.io.Serializable;
-
-public class SuppressionXpathRegressionGenericWhitespaceNestedGenericsOne {
-    <E extends Enum<E>& Serializable> void bad() {//warn
-    }
-    <E extends Enum<E> & Serializable> void good() {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsThree.java
deleted file mode 100644
index d6f8f921541..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsThree.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.io.Serializable;
-
-public class SuppressionXpathRegressionGenericWhitespaceNestedGenericsThree {
-    <E extends Enum<E> , X> void bad() {//warn
-    }
-    <E extends Enum<E>, X> void good() {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsTwo.java
deleted file mode 100644
index 19e37368b33..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceNestedGenericsTwo.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.io.Serializable;
-
-public class SuppressionXpathRegressionGenericWhitespaceNestedGenericsTwo {
-    <E extends Enum<E>  & Serializable> void bad() {//warn
-    }
-    <E extends Enum<E> & Serializable> void good() {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceSingleGenericOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceSingleGenericOne.java
deleted file mode 100644
index 80a1a543c59..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceSingleGenericOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.util.Collections;
-
-public class SuppressionXpathRegressionGenericWhitespaceSingleGenericOne {
-    Object bad = Collections.<Object> emptySet();//warn
-    Object good = Collections.<Object>emptySet();
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceSingleGenericTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceSingleGenericTwo.java
deleted file mode 100644
index 33fbc9af078..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceSingleGenericTwo.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.io.Serializable;
-
-public class SuppressionXpathRegressionGenericWhitespaceSingleGenericTwo {
-    <E>void bad() {//warn
-    }
-    <E> void good() {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartOne.java
deleted file mode 100644
index 5d18b475ff9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartOne.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.util.Collections;
-
-public class SuppressionXpathRegressionGenericWhitespaceStartOne {
-    public<E> void bad() {//warn
-    }
-    public <E> void good() {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartThree.java
deleted file mode 100644
index a2ebac7dedd..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartThree.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.util.Collections;
-
-public class SuppressionXpathRegressionGenericWhitespaceStartThree {
-    < E> void bad() {//warn
-    }
-    <E> void good() {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartTwo.java
deleted file mode 100644
index a216fdb85ef..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/genericwhitespace/SuppressionXpathRegressionGenericWhitespaceStartTwo.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.genericwhitespace;
-
-import java.util.function.Consumer;
-
-public class SuppressionXpathRegressionGenericWhitespaceStartTwo {
-    public <E> void bad(Consumer <E> consumer) {//warn
-    }
-    public <E> void good(Consumer<E> consumer) {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/InputXpathHiddenFieldLambdaExpInMethodCall.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/InputXpathHiddenFieldLambdaExpInMethodCall.java
new file mode 100644
index 00000000000..1577c14246d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/InputXpathHiddenFieldLambdaExpInMethodCall.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.hiddenfield;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class InputXpathHiddenFieldLambdaExpInMethodCall {
+    List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
+    Integer value = Integer.valueOf(1);
+    {
+        numbers.forEach((Integer value) -> String.valueOf(value)); //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/InputXpathHiddenFieldMethodParam.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/InputXpathHiddenFieldMethodParam.java
new file mode 100644
index 00000000000..892405607b4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/InputXpathHiddenFieldMethodParam.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.hiddenfield;
+
+public class InputXpathHiddenFieldMethodParam {
+    static int someField;
+    static Object other = null;
+    Object field = null;
+
+    static void method(Object field, Object other) { //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/SuppressionXpathRegressionHiddenFieldOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/SuppressionXpathRegressionHiddenFieldOne.java
deleted file mode 100644
index 165a18b7e8a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/SuppressionXpathRegressionHiddenFieldOne.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.hiddenfield;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class SuppressionXpathRegressionHiddenFieldOne {
-    List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
-    Integer value = Integer.valueOf(1);
-    {
-        numbers.forEach((Integer value) -> String.valueOf(value)); //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/SuppressionXpathRegressionHiddenFieldTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/SuppressionXpathRegressionHiddenFieldTwo.java
deleted file mode 100644
index b5d4aed3a51..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/hiddenfield/SuppressionXpathRegressionHiddenFieldTwo.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.hiddenfield;
-
-public class SuppressionXpathRegressionHiddenFieldTwo {
-    static int someField;
-    static Object other = null;
-    Object field = null;
-
-    static void method(Object field, Object other) { //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/InputXpathIllegalCatchOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/InputXpathIllegalCatchOne.java
new file mode 100644
index 00000000000..14482345101
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/InputXpathIllegalCatchOne.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.illegalcatch;
+
+public class InputXpathIllegalCatchOne {
+    public void fun() {
+        try {
+        } catch (RuntimeException e) { // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/InputXpathIllegalCatchTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/InputXpathIllegalCatchTwo.java
new file mode 100644
index 00000000000..f31c6d844d0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/InputXpathIllegalCatchTwo.java
@@ -0,0 +1,19 @@
+package org.checkstyle.suppressionxpathfilter.illegalcatch;
+
+public class InputXpathIllegalCatchTwo {
+    public void methodOne() {
+        try {
+            foo();
+        } catch (java.sql.SQLException e) {
+        }
+    }
+
+    private void foo() throws java.sql.SQLException {
+    }
+
+    public void methodTwo() {
+        try {
+        } catch (java.lang.RuntimeException e) { // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/SuppressionXpathRegressionIllegalCatchOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/SuppressionXpathRegressionIllegalCatchOne.java
deleted file mode 100644
index 7f39b3a5fac..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/SuppressionXpathRegressionIllegalCatchOne.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegalcatch;
-
-public class SuppressionXpathRegressionIllegalCatchOne {
-    public void fun() {
-        try {
-        } catch (RuntimeException e) { // warn
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/SuppressionXpathRegressionIllegalCatchTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/SuppressionXpathRegressionIllegalCatchTwo.java
deleted file mode 100644
index 109e09b7dd7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalcatch/SuppressionXpathRegressionIllegalCatchTwo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegalcatch;
-
-public class SuppressionXpathRegressionIllegalCatchTwo {
-    public void methodOne() {
-        try {
-            foo();
-        } catch (java.sql.SQLException e) {
-        }
-    }
-
-    private void foo() throws java.sql.SQLException {
-    }
-
-    public void methodTwo() {
-        try {
-        } catch (java.lang.RuntimeException e) { // warn
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/InputXpathIllegalImportDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/InputXpathIllegalImportDefault.java
new file mode 100644
index 00000000000..da8c6e2938a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/InputXpathIllegalImportDefault.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.illegalimport;
+
+import java.util.List; // warn
+
+public class InputXpathIllegalImportDefault {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/InputXpathIllegalImportStatic.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/InputXpathIllegalImportStatic.java
new file mode 100644
index 00000000000..6846efe69d2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/InputXpathIllegalImportStatic.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.illegalimport;
+
+import static java.lang.Math.pow; // warn
+
+public class InputXpathIllegalImportStatic {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/SuppressionXpathRegressionIllegalImportOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/SuppressionXpathRegressionIllegalImportOne.java
deleted file mode 100644
index 163fdbffc49..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/SuppressionXpathRegressionIllegalImportOne.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegalimport;
-
-import java.util.List; // warn
-
-public class SuppressionXpathRegressionIllegalImportOne {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/SuppressionXpathRegressionIllegalImportTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/SuppressionXpathRegressionIllegalImportTwo.java
deleted file mode 100644
index 8f208c7d35d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalimport/SuppressionXpathRegressionIllegalImportTwo.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegalimport;
-
-import static java.lang.Math.pow; // warn
-
-public class SuppressionXpathRegressionIllegalImportTwo {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/InputXpathIllegalThrowsError.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/InputXpathIllegalThrowsError.java
new file mode 100644
index 00000000000..98c2979ed43
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/InputXpathIllegalThrowsError.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.illegalthrows;
+
+public class InputXpathIllegalThrowsError {
+    public void methodOne() throws NullPointerException
+    {
+    }
+
+    public void methodTwo() throws java.lang.Error //warn
+    {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/InputXpathIllegalThrowsRuntimeException.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/InputXpathIllegalThrowsRuntimeException.java
new file mode 100644
index 00000000000..e430da5a1cb
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/InputXpathIllegalThrowsRuntimeException.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.illegalthrows;
+
+public class InputXpathIllegalThrowsRuntimeException {
+    public void sayHello() throws RuntimeException //warn
+    {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/SuppressionXpathRegressionIllegalThrowsOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/SuppressionXpathRegressionIllegalThrowsOne.java
deleted file mode 100644
index e755b26b8c9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/SuppressionXpathRegressionIllegalThrowsOne.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegalthrows;
-
-public class SuppressionXpathRegressionIllegalThrowsOne {
-    public void sayHello() throws RuntimeException //warn
-    {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/SuppressionXpathRegressionIllegalThrowsTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/SuppressionXpathRegressionIllegalThrowsTwo.java
deleted file mode 100644
index f9e9728160a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegalthrows/SuppressionXpathRegressionIllegalThrowsTwo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegalthrows;
-
-public class SuppressionXpathRegressionIllegalThrowsTwo {
-    public void methodOne() throws NullPointerException
-    {
-    }
-
-    public void methodTwo() throws java.lang.Error //warn
-    {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/InputXpathIllegalTokenLabel.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/InputXpathIllegalTokenLabel.java
new file mode 100644
index 00000000000..2f223e483ac
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/InputXpathIllegalTokenLabel.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.illegaltoken;
+
+public class InputXpathIllegalTokenLabel {
+  public void myTest() {
+    outer: // warn
+    for (int i = 0; i < 5; i++) {
+      if (i == 1) {
+        break outer;
+      }
+    }
+  }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/InputXpathIllegalTokenNative.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/InputXpathIllegalTokenNative.java
new file mode 100644
index 00000000000..8498f354548
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/InputXpathIllegalTokenNative.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.illegaltoken;
+
+public class InputXpathIllegalTokenNative {
+  public native void myTest(); // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/SuppressionXpathRegressionIllegalToken1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/SuppressionXpathRegressionIllegalToken1.java
deleted file mode 100644
index 438fa7cfa49..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/SuppressionXpathRegressionIllegalToken1.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegaltoken;
-
-public class SuppressionXpathRegressionIllegalToken1 {
-  public void myTest() {
-    outer: // warn
-    for (int i = 0; i < 5; i++) {
-      if (i == 1) {
-        break outer;
-      }
-    }
-  }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/SuppressionXpathRegressionIllegalToken2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/SuppressionXpathRegressionIllegalToken2.java
deleted file mode 100644
index a35dbc16ec8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltoken/SuppressionXpathRegressionIllegalToken2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegaltoken;
-
-public class SuppressionXpathRegressionIllegalToken2 {
-  public native void myTest(); // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextField.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextField.java
new file mode 100644
index 00000000000..bbaaf4e9cdd
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextField.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.illegaltokentext;
+
+public class InputXpathIllegalTokenTextField {
+    private int illegalNumber = 12345; //warn
+
+    public void someMethod() {
+        // some code here
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextInterface.java
new file mode 100644
index 00000000000..7e751ee733b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextInterface.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.illegaltokentext;
+
+public interface InputXpathIllegalTokenTextInterface {
+    void invalidIdentifier(); // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextMethod.java
new file mode 100644
index 00000000000..1d9b994a209
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltokentext/InputXpathIllegalTokenTextMethod.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.illegaltokentext;
+
+public class InputXpathIllegalTokenTextMethod {
+    public void myMethod() {
+        String illegalString = "forbiddenText"; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeOne.java
new file mode 100644
index 00000000000..d2dbd2b0442
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeOne.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.illegaltype;
+
+public class InputXpathIllegalTypeOne {
+    public <T extends java.util.HashSet> void typeParam(T t) {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeTwo.java
new file mode 100644
index 00000000000..9b1c95a9b5b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeTwo.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.illegaltype;
+
+import java.io.Serializable;
+
+public class InputXpathIllegalTypeTwo {
+ public <T extends Boolean, U extends Serializable> void typeParam(T a) {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeOne.java
deleted file mode 100644
index 08238330e26..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeOne.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegaltype;
-
-public class SuppressionXpathRegressionIllegalTypeOne {
-    public <T extends java.util.HashSet> void typeParam(T t) {} // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeTwo.java
deleted file mode 100644
index ef0c166dff0..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.illegaltype;
-
-import java.io.Serializable;
-
-public class SuppressionXpathRegressionIllegalTypeTwo {
- public <T extends Boolean, U extends Serializable> void typeParam(T a) {} // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlFour.java
new file mode 100644
index 00000000000..6cb2e14cc0f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlFour.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.importcontrol;
+
+import java.io.*;
+import java.util.Scanner; //warn
+import java.util.Arrays;
+
+
+public class InputXpathImportControlFour {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlFour.xml b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlFour.xml
similarity index 100%
rename from src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlFour.xml
rename to src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlFour.xml
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlOne.java
new file mode 100644
index 00000000000..4e9d88566e7
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlOne.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.importcontrol;
+
+import java.util.Scanner; //warn
+
+public class InputXpathImportControlOne {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlOne.xml b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlOne.xml
similarity index 100%
rename from src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlOne.xml
rename to src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlOne.xml
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlThree.java
new file mode 100644
index 00000000000..a5bf4169f07
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlThree.java
@@ -0,0 +1,4 @@
+package org.checkstyle.suppressionxpathfilter.importcontrol; //warn
+
+public class InputXpathImportControlThree {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlTwo.java
new file mode 100644
index 00000000000..d89e5768484
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlTwo.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.importcontrol; //warn
+
+import java.util.Scanner;
+
+public class InputXpathImportControlTwo {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlTwo.xml b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlTwo.xml
similarity index 100%
rename from src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlTwo.xml
rename to src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/InputXpathImportControlTwo.xml
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlFour.java
deleted file mode 100644
index 2081c94e500..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlFour.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importcontrol;
-
-import java.io.*;
-import java.util.Scanner; //warn
-import java.util.Arrays;
-
-
-public class SuppressionXpathRegressionImportControlFour {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlOne.java
deleted file mode 100644
index 7537508e57e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlOne.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importcontrol;
-
-import java.util.Scanner; //warn
-
-public class SuppressionXpathRegressionImportControlOne {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlThree.java
deleted file mode 100644
index db7dcf2006c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlThree.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importcontrol; //warn
-
-public class SuppressionXpathRegressionImportControlThree {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlTwo.java
deleted file mode 100644
index 8684e39e164..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importcontrol/SuppressionXpathRegressionImportControlTwo.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importcontrol; //warn
-
-import java.util.Scanner;
-
-public class SuppressionXpathRegressionImportControlTwo {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderFive.java
new file mode 100644
index 00000000000..e7936860360
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderFive.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.importorder;
+
+import java.util.List;
+import static org.junit.After.*;
+import java.util.Date; // warn
+
+public class InputXpathImportOrderFive {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderFour.java
new file mode 100644
index 00000000000..6749a39e31d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderFour.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.importorder;
+
+import java.io.*;
+import java.util.Set;
+import static java.lang.Math.PI; // warn
+
+public class InputXpathImportOrderFour {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderOne.java
new file mode 100644
index 00000000000..4ad72eb7567
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderOne.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.importorder;
+
+import static java.lang.Math.PI;
+import java.util.Set; // warn
+
+public class InputXpathImportOrderOne {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderThree.java
new file mode 100644
index 00000000000..2db8f80660d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderThree.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.importorder;
+
+import java.io.*;
+import org.junit.*; // warn
+
+public class InputXpathImportOrderThree {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderTwo.java
new file mode 100644
index 00000000000..4b0089e9ec3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/InputXpathImportOrderTwo.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.importorder;
+
+import java.util.List;
+
+import java.util.Set; // warn
+
+public class InputXpathImportOrderTwo {
+    // code
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderFive.java
deleted file mode 100644
index 338c1a89897..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderFive.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importorder;
-
-import java.util.List;
-import static org.junit.After.*;
-import java.util.Date; // warn
-
-public class SuppressionXpathRegressionImportOrderFive {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderFour.java
deleted file mode 100644
index e378ad0dcff..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderFour.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importorder;
-
-import java.io.*;
-import java.util.Set;
-import static java.lang.Math.PI; // warn
-
-public class SuppressionXpathRegressionImportOrderFour {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderOne.java
deleted file mode 100644
index 5bdd7e4a5e7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importorder;
-
-import static java.lang.Math.PI;
-import java.util.Set; // warn
-
-public class SuppressionXpathRegressionImportOrderOne {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderThree.java
deleted file mode 100644
index 7b802a66f66..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderThree.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importorder;
-
-import java.io.*;
-import org.junit.*; // warn
-
-public class SuppressionXpathRegressionImportOrderThree {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderTwo.java
deleted file mode 100644
index 688d26055bb..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/importorder/SuppressionXpathRegressionImportOrderTwo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.importorder;
-
-import java.util.List;
-
-import java.util.Set; // warn
-
-public class SuppressionXpathRegressionImportOrderTwo {
-    // code
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationBasicOffset.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationBasicOffset.java
new file mode 100644
index 00000000000..3974eaefe3e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationBasicOffset.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.indentation;
+
+public class InputXpathIndentationBasicOffset {
+    void test() {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationDefault.java
new file mode 100644
index 00000000000..f3158e5142a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationDefault.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.indentation;
+
+public class InputXpathIndentationDefault {
+void wrongIntend() { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationElseWithoutCurly.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationElseWithoutCurly.java
new file mode 100644
index 00000000000..a2a4c28d86b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationElseWithoutCurly.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.indentation;
+
+public class InputXpathIndentationElseWithoutCurly {
+    void test() {
+        if (true)
+            exp();
+        else exp();
+
+        if (true)
+            exp();
+        else
+        exp(); // warn
+    }
+    void exp() {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationIfWithoutCurly.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationIfWithoutCurly.java
new file mode 100644
index 00000000000..1b55b1489c1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationIfWithoutCurly.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.indentation;
+
+public class InputXpathIndentationIfWithoutCurly {
+    void test() {
+        if (true)
+                e();
+        if (true)
+        e(); // warn
+    }
+    void e() {};
+}
+
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationLambdaOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationLambdaOne.java
new file mode 100644
index 00000000000..536bbf08056
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationLambdaOne.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.indentation;
+
+public class InputXpathIndentationLambdaOne {
+    void test() {
+        MyLambda getA =
+        (a) -> a; // warn
+    }
+}
+
+interface MyLambda {
+    int myMethod(int a);
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationLambdaTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationLambdaTwo.java
new file mode 100644
index 00000000000..68877ecfba7
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationLambdaTwo.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.indentation;
+
+interface MyLambdaInterface {
+    int foo(int a, int b);
+};
+
+public class InputXpathIndentationLambdaTwo {
+    void test() {
+        MyLambdaInterface div = (a, b)
+            -> {
+                if(b != 0) {
+                    return a/b;
+                }
+              return 0; // warn
+        };
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationSwitchCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationSwitchCase.java
new file mode 100644
index 00000000000..0a8a3fd97cc
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/InputXpathIndentationSwitchCase.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.indentation;
+
+public class InputXpathIndentationSwitchCase {
+    void test() {
+        int key = 5;
+        switch (key) {
+        case 1: // warn
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationElseWithoutCurly.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationElseWithoutCurly.java
deleted file mode 100644
index ee89db624b5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationElseWithoutCurly.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.indentation;
-
-public class SuppressionXpathRegressionIndentationElseWithoutCurly {
-    void test() {
-        if (true)
-            exp();
-        else exp();
-
-        if (true)
-            exp();
-        else
-        exp(); // warn
-    }
-    void exp() {}
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationIfWithoutCurly.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationIfWithoutCurly.java
deleted file mode 100644
index 7abb87187fd..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationIfWithoutCurly.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.indentation;
-
-public class SuppressionXpathRegressionIndentationIfWithoutCurly {
-    void test() {
-        if (true)
-                e();
-        if (true)
-        e(); // warn
-    }
-    void e() {};
-}
-
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationLambdaTest1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationLambdaTest1.java
deleted file mode 100644
index e0344b87380..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationLambdaTest1.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.indentation;
-
-public class SuppressionXpathRegressionIndentationLambdaTest1 {
-    void test() {
-        MyLambda getA =
-        (a) -> a; // warn
-    }
-}
-
-interface MyLambda {
-    int myMethod(int a);
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationLambdaTest2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationLambdaTest2.java
deleted file mode 100644
index e8adc875385..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationLambdaTest2.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.indentation;
-
-interface MyLambdaInterface {
-    int foo(int a, int b);
-};
-
-public class SuppressionXpathRegressionIndentationLambdaTest2 {
-    void test() {
-        MyLambdaInterface div = (a, b)
-            -> {
-                if(b != 0) {
-                    return a/b;
-                }
-              return 0; // warn
-        };
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestOne.java
deleted file mode 100644
index d60de1ccc71..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestOne.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.indentation;
-
-public class SuppressionXpathRegressionIndentationTestOne {
-void wrongIntend() { // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestThree.java
deleted file mode 100644
index eba8876cfe5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestThree.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.indentation;
-
-public class SuppressionXpathRegressionIndentationTestThree {
-    void test() {
-        int key = 5;
-        switch (key) {
-        case 1: // warn
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestTwo.java
deleted file mode 100644
index e2dc66af019..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/indentation/SuppressionXpathRegressionIndentationTestTwo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.indentation;
-
-public class SuppressionXpathRegressionIndentationTestTwo {
-    void test() {} // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignment.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignment.java
new file mode 100644
index 00000000000..e0ae9ba571a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignment.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.innerassignment;
+
+public class InputXpathInnerAssignment {
+
+    public void testMethod() {
+        int a, b;
+        a = b = 5; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignmentArrays.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignmentArrays.java
new file mode 100644
index 00000000000..5da5022b68c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignmentArrays.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.innerassignment;
+
+public class InputXpathInnerAssignmentArrays {
+    public void testMethod() {
+        double myDouble;
+        double[] doubleArray = new double[] {myDouble = 4.5, 15.5}; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastOne.java
new file mode 100644
index 00000000000..41fd10810ee
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastOne.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.innertypelast;
+
+public class InputXpathInnerTypeLastOne {
+
+    public class Inner {
+    }
+
+    public InputXpathInnerTypeLastOne() { // warn
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastThree.java
new file mode 100644
index 00000000000..16c2f9bf3ff
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastThree.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.innertypelast;
+
+public class InputXpathInnerTypeLastThree {
+
+    static {} // OK
+
+    interface Inner {
+    }
+
+    public InputXpathInnerTypeLastThree() { // warn
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastTwo.java
new file mode 100644
index 00000000000..78f8b1ec362
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastTwo.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.innertypelast;
+
+public class InputXpathInnerTypeLastTwo {
+
+    static {}; // OK
+
+    public void innerMethod() {} // OK
+
+    class Inner {
+        class InnerInInner {}
+        public void innerMethod() {}  // warn
+
+    };
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsType.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsType.java
new file mode 100644
index 00000000000..8f1fbf8a98c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsType.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.interfaceistype;
+
+public interface InputXpathInterfaceIsType { // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsTypeAllowMarker.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsTypeAllowMarker.java
new file mode 100644
index 00000000000..d0dd03c9bf7
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsTypeAllowMarker.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.interfaceistype;
+
+public interface InputXpathInterfaceIsTypeAllowMarker { // warn
+    int a = 3;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType1.java
deleted file mode 100644
index 030bf25f5cc..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType1.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.interfaceistype;
-
-public interface SuppressionXpathRegressionInterfaceIsType1 { // warn
-    int a = 3;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType2.java
deleted file mode 100644
index fd9b930be36..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.interfaceistype;
-
-public interface SuppressionXpathRegressionInterfaceIsType2 { // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierField.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierField.java
new file mode 100644
index 00000000000..043d2095cc7
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierField.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier;
+
+public interface InputXpathInterfaceMemberImpliedModifierField {
+    public static String str = "random string"; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierInner.java
new file mode 100644
index 00000000000..2cf4c78c72c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierInner.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier;
+
+public interface InputXpathInterfaceMemberImpliedModifierInner {
+    public interface Data {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierMethod.java
new file mode 100644
index 00000000000..bffb6af5808
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierMethod.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier;
+
+public interface InputXpathInterfaceMemberImpliedModifierMethod {
+    abstract void setData(); // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java
deleted file mode 100644
index 74c81b11e8c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier;
-
-public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier1 {
-    public static String str = "random string"; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java
deleted file mode 100644
index d38d975fb3a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier;
-
-public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier2 {
-    abstract void setData(); // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java
deleted file mode 100644
index 18b982cbe19..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier;
-
-public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier3 {
-    public interface Data {} // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFive.java
new file mode 100644
index 00000000000..6f050e510a0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFive.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
+
+public class InputXpathInvalidJavadocPositionFive {
+    public void foo() {
+        /** // warn
+         * Javadoc comment
+         */
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFour.java
new file mode 100644
index 00000000000..04adbf2c2c9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFour.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
+
+public class InputXpathInvalidJavadocPositionFour {
+    /** // warn
+     * Javadoc Comment
+     */
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionOne.java
new file mode 100644
index 00000000000..82b85797327
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionOne.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
+
+@SuppressWarnings("serial")
+/** // warn
+ * Javadoc Comment
+ */
+public class InputXpathInvalidJavadocPositionOne {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionSix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionSix.java
new file mode 100644
index 00000000000..763e720c073
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionSix.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
+
+public class InputXpathInvalidJavadocPositionSix {
+    int a;
+    /** // warn
+     * Javadoc Comment
+     */
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionThree.java
new file mode 100644
index 00000000000..98b397511ce
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionThree.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
+
+public class InputXpathInvalidJavadocPositionThree {
+    public void foo(){
+    }
+    /** // warn
+     * Javadoc comment
+     */
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionTwo.java
new file mode 100644
index 00000000000..7d6d961e37f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionTwo.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
+
+public class InputXpathInvalidJavadocPositionTwo {
+}
+/** // warn
+ * Javadoc comment
+ */
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFive.java
deleted file mode 100644
index 2cb5606536c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFive.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
-
-public class SuppressionXpathRegressionInvalidJavadocPositionFive {
-    public void foo() {
-        /** // warn
-         * Javadoc comment
-         */
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFour.java
deleted file mode 100644
index 5d65ecc150a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFour.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
-
-public class SuppressionXpathRegressionInvalidJavadocPositionFour {
-    /** // warn
-     * Javadoc Comment
-     */
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionOne.java
deleted file mode 100644
index 89405e83077..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
-
-@SuppressWarnings("serial")
-/** // warn
- * Javadoc Comment
- */
-public class SuppressionXpathRegressionInvalidJavadocPositionOne {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionSix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionSix.java
deleted file mode 100644
index 7f73f25e92e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionSix.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
-
-public class SuppressionXpathRegressionInvalidJavadocPositionSix {
-    int a;
-    /** // warn
-     * Javadoc Comment
-     */
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionThree.java
deleted file mode 100644
index 6e64de7f644..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionThree.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
-
-public class SuppressionXpathRegressionInvalidJavadocPositionThree {
-    public void foo(){
-    }
-    /** // warn
-     * Javadoc comment
-     */
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionTwo.java
deleted file mode 100644
index bf9852b86af..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.invalidjavadocposition;
-
-public class SuppressionXpathRegressionInvalidJavadocPositionTwo {
-}
-/** // warn
- * Javadoc comment
- */
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationOne.java
new file mode 100644
index 00000000000..d2a274c469f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationOne.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.javadoccontentlocation;
+
+public interface InputXpathJavadocContentLocationOne {
+
+    /** Text. // warn
+     */
+    void test();
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationTwo.java
new file mode 100644
index 00000000000..e1ecc2f9505
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationTwo.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.javadoccontentlocation;
+
+public interface InputXpathJavadocContentLocationTwo {
+
+    /* warn */ /**
+     * Text.
+     */
+    void test();
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationOne.java
deleted file mode 100644
index 80a285ecd14..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadoccontentlocation;
-
-public interface SuppressionXpathRegressionJavadocContentLocationOne {
-
-    /** Text. // warn
-     */
-    void test();
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationTwo.java
deleted file mode 100644
index 6ddc0aaedfd..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationTwo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadoccontentlocation;
-
-public interface SuppressionXpathRegressionJavadocContentLocationTwo {
-
-    /* warn */ /**
-     * Text.
-     */
-    void test();
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFive.java
new file mode 100644
index 00000000000..3394b3fcb60
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFive.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.javadocmethod;
+
+/**
+ * Config:
+ * validateThrows = true
+ */
+public class InputXpathJavadocMethodFive {
+
+    /**
+     * Needs a throws tag.
+     */
+    public void bar() {
+        throw new org.apache.tools.ant.BuildException(""); //warn
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFour.java
new file mode 100644
index 00000000000..272ac80d5cd
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFour.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.javadocmethod;
+
+/**
+ * Config:
+ * validateThrows = true
+ */
+public class InputXpathJavadocMethodFour {
+
+    /**
+     * Needs a throws tag.
+     */
+    public void foo() throws Exception { //warn
+
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodOne.java
new file mode 100644
index 00000000000..4f915d594cf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodOne.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.javadocmethod;
+
+/**
+ * Config:
+ */
+public class InputXpathJavadocMethodOne {
+
+    /** {@inheritDoc} */
+    public void inheritableMethod() {
+        // may be inherited and overridden
+    }
+
+    /** {@inheritDoc} */
+    private void uninheritableMethod() { //warn
+        // not possible to be inherited
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodThree.java
new file mode 100644
index 00000000000..42db3882c3e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodThree.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.javadocmethod;
+
+/**
+ * Config:
+ */
+public class InputXpathJavadocMethodThree {
+
+    /**
+     * Needs a param tag for T.
+     *
+     * @param x the input
+     * @return hashcode of x
+     */
+    public <T> int checkTypeParam(T x) { //warn
+        return x.hashCode();
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodTwo.java
new file mode 100644
index 00000000000..94b0468b06c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodTwo.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.javadocmethod;
+
+/**
+ * Config:
+ */
+public class InputXpathJavadocMethodTwo {
+
+    /**
+     * Needs a param tag for x.
+     *
+     * @return identity
+     */
+    public int checkParam(int x) { //warn
+        return x;
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFive.java
deleted file mode 100644
index 0a74583fb40..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFive.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadocmethod;
-
-/**
- * Config:
- * validateThrows = true
- */
-public class SuppressionXpathRegressionJavadocMethodFive {
-
-    /**
-     * Needs a throws tag.
-     */
-    public void bar() {
-        throw new org.apache.tools.ant.BuildException(""); //warn
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFour.java
deleted file mode 100644
index 44224218b0d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFour.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadocmethod;
-
-/**
- * Config:
- * validateThrows = true
- */
-public class SuppressionXpathRegressionJavadocMethodFour {
-
-    /**
-     * Needs a throws tag.
-     */
-    public void foo() throws Exception { //warn
-
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodOne.java
deleted file mode 100644
index 0308db07484..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodOne.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadocmethod;
-
-/**
- * Config:
- */
-public class SuppressionXpathRegressionJavadocMethodOne {
-
-    /** {@inheritDoc} */
-    public void inheritableMethod() {
-        // may be inherited and overridden
-    }
-
-    /** {@inheritDoc} */
-    private void uninheritableMethod() { //warn
-        // not possible to be inherited
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodThree.java
deleted file mode 100644
index 60461bd20f8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodThree.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadocmethod;
-
-/**
- * Config:
- */
-public class SuppressionXpathRegressionJavadocMethodThree {
-
-    /**
-     * Needs a param tag for T.
-     *
-     * @param x the input
-     * @return hashcode of x
-     */
-    public <T> int checkTypeParam(T x) { //warn
-        return x.hashCode();
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodTwo.java
deleted file mode 100644
index 569b02b44aa..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodTwo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadocmethod;
-
-/**
- * Config:
- */
-public class SuppressionXpathRegressionJavadocMethodTwo {
-
-    /**
-     * Needs a param tag for x.
-     *
-     * @return identity
-     */
-    public int checkParam(int x) { //warn
-        return x;
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeIncomplete.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeIncomplete.java
new file mode 100644
index 00000000000..ffd74088d4c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeIncomplete.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.javadoctype;
+
+/**
+ * Need type param tags.
+ * @param <A>
+ * @param <B>
+ */
+public class InputXpathJavadocTypeIncomplete<A, B, C> { //warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeMissingTag.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeMissingTag.java
new file mode 100644
index 00000000000..dc80e9b7b5e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeMissingTag.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.javadoctype;
+
+/**
+ * Needs an author tag.
+ */
+public class InputXpathJavadocTypeMissingTag { //warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeWrongFormat.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeWrongFormat.java
new file mode 100644
index 00000000000..9ae8ea05b0f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeWrongFormat.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.javadoctype;
+
+/**
+ * Has an author tag but wrong format.
+ * @author bar
+ */
+public class InputXpathJavadocTypeWrongFormat { //warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeOne.java
deleted file mode 100644
index 02335e0f1e8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadoctype;
-
-/**
- * Needs an author tag.
- */
-public class SuppressionXpathRegressionJavadocTypeOne { //warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeThree.java
deleted file mode 100644
index 800e5e359ee..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeThree.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadoctype;
-
-/**
- * Need type param tags.
- * @param <A>
- * @param <B>
- */
-public class SuppressionXpathRegressionJavadocTypeThree<A, B, C> { //warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeTwo.java
deleted file mode 100644
index 4fe5cffd17f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeTwo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadoctype;
-
-/**
- * Has an author tag but wrong format.
- * @author bar
- */
-public class SuppressionXpathRegressionJavadocTypeTwo { //warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariableInnerClassFields.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariableInnerClassFields.java
new file mode 100644
index 00000000000..1ec67e4111d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariableInnerClassFields.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.javadocvariable;
+
+public class InputXpathJavadocVariableInnerClassFields {
+    class InnerInner2
+    {
+        public int fData; //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariablePrivateClassFields.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariablePrivateClassFields.java
new file mode 100644
index 00000000000..53d7148e507
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariablePrivateClassFields.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.javadocvariable;
+
+public class InputXpathJavadocVariablePrivateClassFields {
+
+    private int age; //warn
+
+    public void helloWorld(String name)
+    {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableOne.java
deleted file mode 100644
index f7ba64bd6de..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableOne.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadocvariable;
-
-public class SuppressionXpathRegressionJavadocVariableOne {
-
-    private int age; //warn
-
-    public void helloWorld(String name)
-    {
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableTwo.java
deleted file mode 100644
index 57a3515893c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableTwo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.javadocvariable;
-
-public class SuppressionXpathRegressionJavadocVariableTwo {
-    class InnerInner2
-    {
-        public int fData; //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSOne.java
new file mode 100644
index 00000000000..cb5370ce6f5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSOne.java
@@ -0,0 +1,63 @@
+package org.checkstyle.suppressionxpathfilter.javancss;
+
+public class InputXpathJavaNCSSOne {
+
+    public void test() { // warn
+        int a1 = 1;
+        int a2 = 1;
+        int a3 = 1;
+        int a4 = 1;
+        int a5 = 1;
+        int a6 = 1;
+        int a7 = 1;
+        int a8 = 1;
+        int a9 = 1;
+        int a10 = 1;
+        int a11 = 1;
+        int a12 = 1;
+        int a13 = 1;
+        int a14 = 1;
+        int a15 = 1;
+        int a16 = 1;
+        int a17 = 1;
+        int a18 = 1;
+        int a19 = 1;
+        int a20 = 1;
+        int a21 = 1;
+        int a22 = 1;
+        int a23 = 1;
+        int a24 = 1;
+        int a25 = 1;
+        int a26 = 1;
+        int a27 = 1;
+        int a28 = 1;
+        int a29 = 1;
+        int a30 = 1;
+        int a31 = 1;
+        int a32 = 1;
+        int a33 = 1;
+        int a34 = 1;
+        int a35 = 1;
+        int a36 = 1;
+        int a37 = 1;
+        int a38 = 1;
+        int a39 = 1;
+        int a40 = 1;
+        int a41 = 1;
+        int a42 = 1;
+        int a43 = 1;
+        int a44 = 1;
+        int a45 = 1;
+        int a46 = 1;
+        int a47 = 1;
+        int a48 = 1;
+        int a49 = 1;
+        int a50 = 1;
+    }
+
+    public void test2() { // ok, method does not exceed the 50 lines limit.
+        int a1 = 1;
+        int a2 = 1;
+        int a3 = 1;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSThree.java
new file mode 100644
index 00000000000..151530f901e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSThree.java
@@ -0,0 +1,58 @@
+package org.checkstyle.suppressionxpathfilter.javancss; // warn
+
+public class InputXpathJavaNCSSThree {
+    int a1 = 1;
+    int a2 = 1;
+    int a3 = 1;
+    int a4 = 1;
+    int a5 = 1;
+    int a6 = 1;
+    int a7 = 1;
+    int a8 = 1;
+    int a9 = 1;
+    int a10 = 1;
+    int a11 = 1;
+    int a12 = 1;
+    int a13 = 1;
+    int a14 = 1;
+    int a15 = 1;
+    int a16 = 1;
+    int a17 = 1;
+    int a18 = 1;
+    int a19 = 1;
+    int a20 = 1;
+    int a21 = 1;
+    int a22 = 1;
+    int a23 = 1;
+    int a24 = 1;
+    int a25 = 1;
+}
+
+
+class Test1 {
+    int a1 = 1;
+    int a2 = 1;
+    int a3 = 1;
+    int a4 = 1;
+    int a5 = 1;
+    int a6 = 1;
+    int a7 = 1;
+    int a8 = 1;
+    int a9 = 1;
+    int a10 = 1;
+    int a11 = 1;
+    int a12 = 1;
+}
+
+class Test2 {
+    int a1 = 1;
+    int a2 = 1;
+    int a3 = 1;
+    int a4 = 1;
+    int a5 = 1;
+    int a6 = 1;
+    int a7 = 1;
+    int a8 = 1;
+    int a9 = 1;
+    int a10 = 1;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSTwo.java
new file mode 100644
index 00000000000..9eb109cb487
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSTwo.java
@@ -0,0 +1,61 @@
+package org.checkstyle.suppressionxpathfilter.javancss;
+
+public class InputXpathJavaNCSSTwo { // warn
+
+    int a1 = 1;
+    int a2 = 1;
+    int a3 = 1;
+    int a4 = 1;
+    int a5 = 1;
+    int a6 = 1;
+    int a7 = 1;
+    int a8 = 1;
+    int a9 = 1;
+    int a10 = 1;
+    int a11 = 1;
+    int a12 = 1;
+    int a13 = 1;
+    int a14 = 1;
+    int a15 = 1;
+    int a16 = 1;
+    int a17 = 1;
+    int a18 = 1;
+    int a19 = 1;
+    int a20 = 1;
+    int a21 = 1;
+    int a22 = 1;
+    int a23 = 1;
+    int a24 = 1;
+    int a25 = 1;
+    int a26 = 1;
+    int a27 = 1;
+    int a28 = 1;
+    int a29 = 1;
+    int a30 = 1;
+    int a31 = 1;
+    int a32 = 1;
+    int a33 = 1;
+    int a34 = 1;
+    int a35 = 1;
+    int a36 = 1;
+    int a37 = 1;
+    int a38 = 1;
+    int a39 = 1;
+    int a40 = 1;
+    int a41 = 1;
+    int a42 = 1;
+    int a43 = 1;
+    int a44 = 1;
+    int a45 = 1;
+    int a46 = 1;
+    int a47 = 1;
+    int a48 = 1;
+    int a49 = 1;
+    int a50 = 1;
+}
+
+class Test { // ok, class does not exceed the 50 lines limit.
+    int a1 = 1;
+    int a2 = 1;
+    int a3 = 1;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/InputXpathLambdaBodyLengthCustomMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/InputXpathLambdaBodyLengthCustomMax.java
new file mode 100644
index 00000000000..a31622499c5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/InputXpathLambdaBodyLengthCustomMax.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.lambdabodylength;
+
+import java.util.function.Function;
+
+public class InputXpathLambdaBodyLengthCustomMax {
+    void test() {
+        Runnable r = () -> { // warn
+            method(2);
+            method(3);
+            method(4);
+            method(5);
+        };
+    }
+
+    void method(int i) {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/InputXpathLambdaBodyLengthDefaultMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/InputXpathLambdaBodyLengthDefaultMax.java
new file mode 100644
index 00000000000..abe56dbe16b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/InputXpathLambdaBodyLengthDefaultMax.java
@@ -0,0 +1,20 @@
+package org.checkstyle.suppressionxpathfilter.lambdabodylength;
+
+import java.util.function.Function;
+
+public class InputXpathLambdaBodyLengthDefaultMax {
+    void test() {
+        Function<String, String> trimmer = (s) -> // warn
+            s.trim()
+             .trim()
+             .trim()
+             .trim()
+             .trim()
+             .trim()
+             .trim()
+             .trim()
+             .trim()
+             .trim()
+             .trim();
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/SuppressionXpathRegressionLambdaBodyLength1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/SuppressionXpathRegressionLambdaBodyLength1.java
deleted file mode 100644
index c0d12288038..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/SuppressionXpathRegressionLambdaBodyLength1.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.lambdabodylength;
-
-import java.util.function.Function;
-
-public class SuppressionXpathRegressionLambdaBodyLength1 {
-    void test() {
-        Function<String, String> trimmer = (s) -> // warn
-            s.trim()
-             .trim()
-             .trim()
-             .trim()
-             .trim()
-             .trim()
-             .trim()
-             .trim()
-             .trim()
-             .trim()
-             .trim();
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/SuppressionXpathRegressionLambdaBodyLength2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/SuppressionXpathRegressionLambdaBodyLength2.java
deleted file mode 100644
index d552ae4fafb..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdabodylength/SuppressionXpathRegressionLambdaBodyLength2.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.lambdabodylength;
-
-import java.util.function.Function;
-
-public class SuppressionXpathRegressionLambdaBodyLength2 {
-    void test() {
-        Runnable r = () -> { // warn
-            method(2);
-            method(3);
-            method(4);
-            method(5);
-        };
-    }
-
-    void method(int i) {}
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/InputXpathLambdaParameterNameDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/InputXpathLambdaParameterNameDefault.java
new file mode 100644
index 00000000000..94cb1ec502b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/InputXpathLambdaParameterNameDefault.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.lambdaparametername;
+
+import java.util.function.Function;
+
+public class InputXpathLambdaParameterNameDefault {
+    void test() {
+        Function<String, String> trimmer = S -> S.trim(); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/InputXpathLambdaParameterNameNonDefaultPattern.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/InputXpathLambdaParameterNameNonDefaultPattern.java
new file mode 100644
index 00000000000..cbb3c42980a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/InputXpathLambdaParameterNameNonDefaultPattern.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.lambdaparametername;
+
+import java.util.function.Function;
+
+public class InputXpathLambdaParameterNameNonDefaultPattern {
+    void test() {
+        Function<String, String> trimmer = (s) -> s.trim(); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/SuppressionXpathRegressionLambdaParameterName1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/SuppressionXpathRegressionLambdaParameterName1.java
deleted file mode 100644
index f720010fe9d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/SuppressionXpathRegressionLambdaParameterName1.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.lambdaparametername;
-
-import java.util.function.Function;
-
-public class SuppressionXpathRegressionLambdaParameterName1 {
-    void test() {
-        Function<String, String> trimmer = S -> S.trim(); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/SuppressionXpathRegressionLambdaParameterName2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/SuppressionXpathRegressionLambdaParameterName2.java
deleted file mode 100644
index 8b818ed11e0..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/lambdaparametername/SuppressionXpathRegressionLambdaParameterName2.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.lambdaparametername;
-
-import java.util.function.Function;
-
-public class SuppressionXpathRegressionLambdaParameterName2 {
-    void test() {
-        Function<String, String> trimmer = (s) -> s.trim(); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyOne.java
new file mode 100644
index 00000000000..5315bcdddf8
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyOne.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.leftcurly;
+
+public class InputXpathLeftCurlyOne
+{ //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyThree.java
new file mode 100644
index 00000000000..3a840197762
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyThree.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.leftcurly;
+
+public class InputXpathLeftCurlyThree {
+    public void sample(boolean flag) {
+        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyTwo.java
new file mode 100644
index 00000000000..3cfc1b20c9b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/InputXpathLeftCurlyTwo.java
@@ -0,0 +1,4 @@
+package org.checkstyle.suppressionxpathfilter.leftcurly;
+
+public class InputXpathLeftCurlyTwo { //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyOne.java
deleted file mode 100644
index 3f95f5fef05..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyOne.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.leftcurly;
-
-public class SuppressionXpathRegressionLeftCurlyOne
-{ //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyThree.java
deleted file mode 100644
index e130365a253..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyThree.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.leftcurly;
-
-public class SuppressionXpathRegressionLeftCurlyThree {
-    public void sample(boolean flag) {
-        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyTwo.java
deleted file mode 100644
index 7dca41d3c95..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/leftcurly/SuppressionXpathRegressionLeftCurlyTwo.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.leftcurly;
-
-public class SuppressionXpathRegressionLeftCurlyTwo { //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameInner.java
new file mode 100644
index 00000000000..2645870893a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameInner.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.localfinalvariablename;
+
+import java.util.Scanner;
+
+public class InputXpathLocalFinalVariableNameInner {
+    class InnerClass {
+        void MyMethod() {
+            final int VAR1 = 10; // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameResource.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameResource.java
new file mode 100644
index 00000000000..3a59a808674
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameResource.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.localfinalvariablename;
+
+import java.util.Scanner;
+
+public class InputXpathLocalFinalVariableNameResource {
+    void MyMethod() {
+        try(Scanner scanner = new Scanner("ABC")) { // warn
+            final int VAR1 = 5;
+            final int var1 = 10;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameVar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameVar.java
new file mode 100644
index 00000000000..96d6ac4dc05
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/localfinalvariablename/InputXpathLocalFinalVariableNameVar.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.localfinalvariablename;
+
+public class InputXpathLocalFinalVariableNameVar {
+    void MyMethod() {
+        final int VAR1 = 5; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberAnotherVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberAnotherVariable.java
new file mode 100644
index 00000000000..f94a62b58f3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberAnotherVariable.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.magicnumber;
+
+public class InputXpathMagicNumberAnotherVariable {
+    public void performOperation() {
+        try {
+            int result = 0;
+        } catch(Exception e) {
+            int a = 0;
+            boolean someCondition = false;
+            if (someCondition) {
+                a = 1; // ok
+            } else {
+                a = 20; // warn
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberMethodDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberMethodDef.java
new file mode 100644
index 00000000000..33f778e6342
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberMethodDef.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.magicnumber;
+
+public class InputXpathMagicNumberMethodDef {
+    public void methodWithMagicNumber() {
+        int x = 20; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberVariable.java
new file mode 100644
index 00000000000..0e8854fa0e1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/magicnumber/InputXpathMagicNumberVariable.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.magicnumber;
+
+public class InputXpathMagicNumberVariable {
+    private int a = 1; // ok
+    int d = 5; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAmpChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAmpChar.java
new file mode 100644
index 00000000000..4d0e9c55935
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAmpChar.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedAmpChar {
+    char ampChar = '&'; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAmpString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAmpString.java
new file mode 100644
index 00000000000..5cab2abd388
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAmpString.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedAmpString {
+    String ampersandChar = "&testThree"; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAposChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAposChar.java
new file mode 100644
index 00000000000..67466b6b0ad
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAposChar.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedAposChar {
+    char aposChar = '\''; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAposString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAposString.java
new file mode 100644
index 00000000000..398ac8001ac
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedAposString.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedAposString {
+    String aposChar = "'SingleQuoteOnBothSide'"; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedCarriageString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedCarriageString.java
new file mode 100644
index 00000000000..32092a516cd
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedCarriageString.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedCarriageString {
+    String carriageChar = "carriageCharAtEnd\r"; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedGreaterChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedGreaterChar.java
new file mode 100644
index 00000000000..8ce257cbd6f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedGreaterChar.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedGreaterChar {
+    char greaterChar = '>'; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedGreaterString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedGreaterString.java
new file mode 100644
index 00000000000..642e15b5a08
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedGreaterString.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedGreaterString {
+    String greaterChar = ">testFour"; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedLessChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedLessChar.java
new file mode 100644
index 00000000000..51eda2ef634
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedLessChar.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedLessChar {
+    char lessChar = '<'; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedLessString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedLessString.java
new file mode 100644
index 00000000000..b1e2971ce52
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedLessString.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedLessString {
+    String lessChar = "<testTwo"; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedNewLineString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedNewLineString.java
new file mode 100644
index 00000000000..b56f808bcc9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedNewLineString.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedNewLineString {
+    String newLineChar = "testFive\n"; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedQuoteChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedQuoteChar.java
new file mode 100644
index 00000000000..1cc3ded1ed6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedQuoteChar.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedQuoteChar {
+    char quotChar = '\"'; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedQuoteString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedQuoteString.java
new file mode 100644
index 00000000000..6ef51002b36
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathEncodedQuoteString.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathEncodedQuoteString {
+    String quoteChar = "\"testOne\""; // warning
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathOne.java
new file mode 100644
index 00000000000..1616989fb9f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathOne.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathOne {
+    public void test() { } // warning
+
+    public void correct() { }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathThree.java
new file mode 100644
index 00000000000..0b0965ba002
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathThree.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathThree {
+    public void testOne() { }
+} // warning
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathTwo.java
new file mode 100644
index 00000000000..2f80fed1a43
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/InputXpathMatchXpathTwo.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.matchxpath;
+
+public class InputXpathMatchXpathTwo {
+    public void func1() throws RuntimeException {} // warning
+    public void func2() throws Exception {}  // ok
+    public void func5() throws NullPointerException {} // ok
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAmpChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAmpChar.java
deleted file mode 100644
index c873b176007..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAmpChar.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedAmpChar {
-    char ampChar = '&'; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAmpString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAmpString.java
deleted file mode 100644
index a0204e0241b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAmpString.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedAmpString {
-    String ampersandChar = "&testThree"; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAposChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAposChar.java
deleted file mode 100644
index b620b2f8d33..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAposChar.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedAposChar {
-    char aposChar = '\''; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAposString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAposString.java
deleted file mode 100644
index 5c5b324abfd..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedAposString.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedAposString {
-    String aposChar = "'SingleQuoteOnBothSide'"; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedCarriageString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedCarriageString.java
deleted file mode 100644
index 23c68ddc5bf..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedCarriageString.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedCarriageString {
-    String carriageChar = "carriageCharAtEnd\r"; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedGreaterChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedGreaterChar.java
deleted file mode 100644
index aba759e2418..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedGreaterChar.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedGreaterChar {
-    char greaterChar = '>'; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedGreaterString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedGreaterString.java
deleted file mode 100644
index 7e76c466bed..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedGreaterString.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedGreaterString {
-    String greaterChar = ">testFour"; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedLessChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedLessChar.java
deleted file mode 100644
index 9568465f845..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedLessChar.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedLessChar {
-    char lessChar = '<'; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedLessString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedLessString.java
deleted file mode 100644
index fb9bd2bf571..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedLessString.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedLessString {
-    String lessChar = "<testTwo"; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedNewLineString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedNewLineString.java
deleted file mode 100644
index e250ccfb59d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedNewLineString.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedNewLineString {
-    String newLineChar = "testFive\n"; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedQuotChar.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedQuotChar.java
deleted file mode 100644
index 6b86486f307..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedQuotChar.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedQuotChar {
-    char quotChar = '\"'; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedQuoteString.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedQuoteString.java
deleted file mode 100644
index c52eb430b7a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathEncodedQuoteString.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathEncodedQuoteString {
-    String quoteChar = "\"testOne\""; // warning
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathOne.java
deleted file mode 100644
index 03dedf7ced1..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathOne.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathOne {
-    public void test() { } // warning
-
-    public void correct() { }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathThree.java
deleted file mode 100644
index 1599f491d1b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathThree.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathThree {
-    public void testOne() { }
-} // warning
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathTwo.java
deleted file mode 100644
index ae9508f8554..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/matchxpath/SuppressionXpathRegressionMatchXpathTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.matchxpath;
-
-public class SuppressionXpathRegressionMatchXpathTwo {
-    public void func1() throws RuntimeException {} // warning
-    public void func2() throws Exception {}  // ok
-    public void func5() throws NullPointerException {} // ok
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/InputXpathMemberNameDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/InputXpathMemberNameDefault.java
new file mode 100644
index 00000000000..83840f1a6ec
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/InputXpathMemberNameDefault.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.membername;
+
+public class InputXpathMemberNameDefault {
+     public int num1; // OK
+     public int NUM2; // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/InputXpathMemberNameIgnoreProtected.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/InputXpathMemberNameIgnoreProtected.java
new file mode 100644
index 00000000000..f1633bfc973
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/InputXpathMemberNameIgnoreProtected.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.membername;
+
+public class InputXpathMemberNameIgnoreProtected {
+
+    class Inner {
+        public int NUM1; // warn
+        protected int num2; // OK
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/SuppressionXpathRegressionMemberName1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/SuppressionXpathRegressionMemberName1.java
deleted file mode 100644
index f86e45658e7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/SuppressionXpathRegressionMemberName1.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.membername;
-
-public class SuppressionXpathRegressionMemberName1 {
-     public int num1; // OK
-     public int NUM2; // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/SuppressionXpathRegressionMemberName2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/SuppressionXpathRegressionMemberName2.java
deleted file mode 100644
index eb6b2787296..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/membername/SuppressionXpathRegressionMemberName2.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.membername;
-
-public class SuppressionXpathRegressionMemberName2 {
-
-    class Inner {
-        public int NUM1; // warn
-        protected int num2; // OK
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountDefault.java
new file mode 100644
index 00000000000..9428563e326
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountDefault.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.methodcount;
+
+class InputXpathMethodCountDefault { // warn
+    void foo() {}
+    void foo1() {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountPrivate.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountPrivate.java
new file mode 100644
index 00000000000..c68867fa717
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountPrivate.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.methodcount;
+
+class InputXpathMethodCountPrivate { // warn
+    private void foo() {}
+    private void foo1() {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountProtected.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountProtected.java
new file mode 100644
index 00000000000..2fcd916f85e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountProtected.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.methodcount;
+
+class InputXpathMethodCountProtected { // warn
+    protected void foo() {}
+    protected void foo1() {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountPublic.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountPublic.java
new file mode 100644
index 00000000000..c51cee7e11f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/InputXpathMethodCountPublic.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.methodcount;
+
+class InputXpathMethodCountPublic { // warn
+    public void foo() {}
+    public void foo1() {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount1.java
deleted file mode 100644
index 4ba8a069bf9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodcount;
-
-class SuppressionXpathRegressionMethodCount1 { // warn
-    void foo() {}
-    void foo1() {}
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount2.java
deleted file mode 100644
index 1550af7bc66..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount2.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodcount;
-
-class SuppressionXpathRegressionMethodCount2 { // warn
-    private void foo() {}
-    private void foo1() {}
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount3.java
deleted file mode 100644
index da7f3d30478..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount3.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodcount;
-
-class SuppressionXpathRegressionMethodCount3 { // warn
-    protected void foo() {}
-    protected void foo1() {}
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount4.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount4.java
deleted file mode 100644
index afd8c1b61b0..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodcount/SuppressionXpathRegressionMethodCount4.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodcount;
-
-class SuppressionXpathRegressionMethodCount4 { // warn
-    public void foo() {}
-    public void foo1() {}
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthNoEmptyLines.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthNoEmptyLines.java
new file mode 100644
index 00000000000..317f4b0c6bc
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthNoEmptyLines.java
@@ -0,0 +1,22 @@
+package org.checkstyle.suppressionxpathfilter.methodlength;
+
+public class InputXpathMethodLengthNoEmptyLines {
+
+    public InputXpathMethodLengthNoEmptyLines(){
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+
+
+    }
+
+    protected void methodOne(){ // warn
+        if(true){
+            if(true){
+            }
+        }
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthSimple.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthSimple.java
new file mode 100644
index 00000000000..0266e740116
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthSimple.java
@@ -0,0 +1,27 @@
+package org.checkstyle.suppressionxpathfilter.methodlength;
+
+public class InputXpathMethodLengthSimple {
+    protected InputXpathMethodLengthSimple() { // warn
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+
+    }
+
+    private void methodOne(){
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthSingleToken.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthSingleToken.java
new file mode 100644
index 00000000000..0e3a3babfda
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodlength/InputXpathMethodLengthSingleToken.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.methodlength;
+
+public class InputXpathMethodLengthSingleToken {
+
+    public void methodOne() { }
+
+    InputXpathMethodLengthSingleToken a =
+            new InputXpathMethodLengthSingleToken(){
+        public void methodOne(){ // warn
+
+        }
+    };
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameCustomProperties.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameCustomProperties.java
new file mode 100644
index 00000000000..263a7404629
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameCustomProperties.java
@@ -0,0 +1,22 @@
+package org.checkstyle.suppressionxpathfilter.methodname;
+
+interface Check {
+     int i = 10;
+     default void FirstMethod() {} // OK
+     default void SecondMethod() {} // OK
+     private void ThirdMethod() {} // warn
+
+}
+
+public class InputXpathMethodNameCustomProperties implements Check {
+
+     @Override
+     public void FirstMethod() {
+
+     }
+
+     @Override
+     public void SecondMethod() {
+
+     }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameDefault.java
new file mode 100644
index 00000000000..5389c62b80b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameDefault.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.methodname;
+
+public class InputXpathMethodNameDefault {
+
+  protected void firstMethod() {} // OK
+  private void SecondMethod() {} // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameInner.java
new file mode 100644
index 00000000000..6f0c846f4be
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/InputXpathMethodNameInner.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.methodname;
+
+public class InputXpathMethodNameInner {
+    public void myMethod1() { // OK
+        }
+    class Inner {
+        public void MyMethod2() { // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName1.java
deleted file mode 100644
index 43292d90090..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodname;
-
-public class SuppressionXpathRegressionMethodName1 {
-
-  protected void firstMethod() {} // OK
-  private void SecondMethod() {} // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName2.java
deleted file mode 100644
index 9c6d9479457..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName2.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodname;
-
-public class SuppressionXpathRegressionMethodName2 {
-    public void myMethod1() { // OK
-        }
-    class Inner {
-        public void MyMethod2() { // warn
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName3.java
deleted file mode 100644
index 940b52db858..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodname/SuppressionXpathRegressionMethodName3.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodname;
-
-interface Check {
-     int i = 10;
-     default void FirstMethod() {} // OK
-     default void SecondMethod() {} // OK
-     private void ThirdMethod() {} // warn
-
-}
-
-public class SuppressionXpathRegressionMethodName3 implements Check {
-
-     @Override
-     public void FirstMethod() {
-
-     }
-
-     @Override
-     public void SecondMethod() {
-
-     }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadOne.java
new file mode 100644
index 00000000000..25368c9f2b9
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadOne.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.methodparampad;
+
+public class InputXpathMethodParamPadOne {
+    public void InputMethodParamPad (int aParam) { //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadThree.java
new file mode 100644
index 00000000000..ee83b6c4bed
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadThree.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.methodparampad;
+
+public class InputXpathMethodParamPadThree {
+    public void sayHello(String name) { //warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadTwo.java
new file mode 100644
index 00000000000..12eecd1a455
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/InputXpathMethodParamPadTwo.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.methodparampad;
+
+public class InputXpathMethodParamPadTwo {
+    public void sayHello
+            (String name) { //warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadOne.java
deleted file mode 100644
index 2102470de60..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadOne.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodparampad;
-
-public class SuppressionXpathRegressionMethodParamPadOne {
-    public void InputMethodParamPad (int aParam) { //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadThree.java
deleted file mode 100644
index 34ef7828b5f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadThree.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodparampad;
-
-public class SuppressionXpathRegressionMethodParamPadThree {
-    public void sayHello(String name) { //warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadTwo.java
deleted file mode 100644
index 495b8b40481..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodparampad/SuppressionXpathRegressionMethodParamPadTwo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.methodparampad;
-
-public class SuppressionXpathRegressionMethodParamPadTwo {
-    public void sayHello
-            (String name) { //warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameDefault.java
new file mode 100644
index 00000000000..9eb8e54129f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameDefault.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.methodtypeparametername;
+
+public class InputXpathMethodTypeParameterNameDefault {
+  public <TT> void foo() { } // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameInner.java
new file mode 100644
index 00000000000..10d51c6fdac
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameInner.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.methodtypeparametername;
+
+public class InputXpathMethodTypeParameterNameInner<T>{
+
+    static class Junk <T> {
+        <fo_ extends T> void foo() { // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameLowercase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameLowercase.java
new file mode 100644
index 00000000000..20b3a9f24bf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/methodtypeparametername/InputXpathMethodTypeParameterNameLowercase.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.methodtypeparametername;
+
+import java.util.List;
+
+public class InputXpathMethodTypeParameterNameLowercase<T> {
+
+    <a_a> a_a myMethod(List<? super T> list) {return null;} // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/InputXpathMissingCtor.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/InputXpathMissingCtor.java
new file mode 100644
index 00000000000..d70ef35a124
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/InputXpathMissingCtor.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.missingctor;
+
+public class InputXpathMissingCtor { // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/InputXpathMissingCtorInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/InputXpathMissingCtorInner.java
new file mode 100644
index 00000000000..ba5bc93a5e6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/InputXpathMissingCtorInner.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.missingctor;
+
+public class InputXpathMissingCtorInner {
+
+    private InputXpathMissingCtorInner() {
+
+    }
+
+    class InnerClass { // warn
+
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/SuppressionXpathRegressionMissingCtor1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/SuppressionXpathRegressionMissingCtor1.java
deleted file mode 100644
index da17df52919..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/SuppressionXpathRegressionMissingCtor1.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingctor;
-
-public class SuppressionXpathRegressionMissingCtor1 { // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/SuppressionXpathRegressionMissingCtor2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/SuppressionXpathRegressionMissingCtor2.java
deleted file mode 100644
index b0e36ea3aa3..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingctor/SuppressionXpathRegressionMissingCtor2.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingctor;
-
-public class SuppressionXpathRegressionMissingCtor2 {
-
-    private SuppressionXpathRegressionMissingCtor2() {
-
-    }
-
-    class InnerClass { // warn
-
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/InputXpathMissingJavadocMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/InputXpathMissingJavadocMethod.java
new file mode 100644
index 00000000000..4caf025cb63
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/InputXpathMissingJavadocMethod.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.missingjavadocmethod;
+
+public class InputXpathMissingJavadocMethod {
+    public void foo() { // warn
+        // code
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/InputXpathMissingJavadocMethodCtor.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/InputXpathMissingJavadocMethodCtor.java
new file mode 100644
index 00000000000..b2661726d09
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/InputXpathMissingJavadocMethodCtor.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.missingjavadocmethod;
+
+public class InputXpathMissingJavadocMethodCtor {
+    public InputXpathMissingJavadocMethodCtor() { // warn
+        // code
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/SuppressionXpathRegressionMissingJavadocMethod1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/SuppressionXpathRegressionMissingJavadocMethod1.java
deleted file mode 100644
index 4d0803600c1..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/SuppressionXpathRegressionMissingJavadocMethod1.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingjavadocmethod;
-
-public class SuppressionXpathRegressionMissingJavadocMethod1 {
-    public SuppressionXpathRegressionMissingJavadocMethod1() { // warn
-        // code
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/SuppressionXpathRegressionMissingJavadocMethod2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/SuppressionXpathRegressionMissingJavadocMethod2.java
deleted file mode 100644
index f305328408f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadocmethod/SuppressionXpathRegressionMissingJavadocMethod2.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingjavadocmethod;
-
-public class SuppressionXpathRegressionMissingJavadocMethod2 {
-    public void foo() { // warn
-        // code
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeAnnotation.java
new file mode 100644
index 00000000000..6a19806a6d2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeAnnotation.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
+
+@TestAnnotation
+public class InputXpathMissingJavadocTypeAnnotation {
+    @TestAnnotation2 // warn
+    public class innerClass {
+
+    }
+}
+
+@interface TestAnnotation {
+
+}
+
+@interface TestAnnotation2 {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeClass.java
new file mode 100644
index 00000000000..eec949f6236
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeClass.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
+
+public class InputXpathMissingJavadocTypeClass {  // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeExcluded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeExcluded.java
new file mode 100644
index 00000000000..28e1249992d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeExcluded.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
+
+public class InputXpathMissingJavadocTypeExcluded {
+    private class Test { // warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeScope.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeScope.java
new file mode 100644
index 00000000000..ab4a6d21af4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeScope.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
+
+/**
+ * ok
+ */
+public class InputXpathMissingJavadocTypeScope {
+    private class Test { // warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeToken.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeToken.java
new file mode 100644
index 00000000000..f3422cdd487
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/InputXpathMissingJavadocTypeToken.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
+
+public interface InputXpathMissingJavadocTypeToken { // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeAnnotation.java
deleted file mode 100644
index b5de3a8d6d7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeAnnotation.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
-
-@TestAnnotation
-public class SuppressionXpathRegressionMissingJavadocTypeAnnotation {
-    @TestAnnotation2 // warn
-    public class innerClass {
-
-    }
-}
-
-@interface TestAnnotation {
-
-}
-
-@interface TestAnnotation2 {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeClass.java
deleted file mode 100644
index 0f684ba89f5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeClass.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
-
-public class SuppressionXpathRegressionMissingJavadocTypeClass {  // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeExcluded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeExcluded.java
deleted file mode 100644
index 1732b0d55a9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeExcluded.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
-
-public class SuppressionXpathRegressionMissingJavadocTypeExcluded {
-    private class Test { // warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeScope.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeScope.java
deleted file mode 100644
index f7316a511ec..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeScope.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
-
-/**
- * ok
- */
-public class SuppressionXpathRegressionMissingJavadocTypeScope {
-    private class Test { // warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeToken.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeToken.java
deleted file mode 100644
index a32f9012128..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingjavadoctype/SuppressionXpathRegressionMissingJavadocTypeToken.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingjavadoctype;
-
-public interface SuppressionXpathRegressionMissingJavadocTypeToken { // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideAnonymous.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideAnonymous.java
new file mode 100644
index 00000000000..3659d65da65
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideAnonymous.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.missingoverride;
+
+public class InputXpathMissingOverrideAnonymous {
+    Runnable r = new Runnable() {
+        /**
+         * {@inheritDoc}
+         */
+        public void run() { // warn
+
+        }
+    };
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideClass.java
new file mode 100644
index 00000000000..f40149dcc14
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideClass.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.missingoverride;
+
+public class InputXpathMissingOverrideClass {
+    /**
+     * {@inheritDoc}
+     */
+    public boolean equals(Object obj) { // warn
+        return false;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInheritDocInvalidPrivateMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInheritDocInvalidPrivateMethod.java
new file mode 100644
index 00000000000..45727e88ec7
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInheritDocInvalidPrivateMethod.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.missingoverride;
+
+public class InputXpathMissingOverrideInheritDocInvalidPrivateMethod {
+    /**
+     * {@inheritDoc}
+     */
+    private void test() { // warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInheritDocInvalidPublicMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInheritDocInvalidPublicMethod.java
new file mode 100644
index 00000000000..99cdbd3108d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInheritDocInvalidPublicMethod.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.missingoverride;
+
+public class InputXpathMissingOverrideInheritDocInvalidPublicMethod {
+    /**
+     * {@inheritDoc}
+     */
+    public static void test() { // warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInterface.java
new file mode 100644
index 00000000000..7d04fec524b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/InputXpathMissingOverrideInterface.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.missingoverride;
+
+public interface InputXpathMissingOverrideInterface {
+    /**
+     * {@inheritDoc}
+     */
+    boolean test(Object obj); // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideAnonymous.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideAnonymous.java
deleted file mode 100644
index 8c9b8750975..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideAnonymous.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingoverride;
-
-public class SuppressionXpathRegressionMissingOverrideAnonymous {
-    Runnable r = new Runnable() {
-        /**
-         * {@inheritDoc}
-         */
-        public void run() { // warn
-
-        }
-    };
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideClass.java
deleted file mode 100644
index 4105a6589d8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideClass.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingoverride;
-
-public class SuppressionXpathRegressionMissingOverrideClass {
-    /**
-     * {@inheritDoc}
-     */
-    public boolean equals(Object obj) { // warn
-        return false;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInheritDocInvalid1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInheritDocInvalid1.java
deleted file mode 100644
index f946a95f591..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInheritDocInvalid1.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingoverride;
-
-public class SuppressionXpathRegressionMissingOverrideInheritDocInvalid1 {
-    /**
-     * {@inheritDoc}
-     */
-    private void test() { // warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInheritDocInvalid2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInheritDocInvalid2.java
deleted file mode 100644
index 283ce5dff25..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInheritDocInvalid2.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingoverride;
-
-public class SuppressionXpathRegressionMissingOverrideInheritDocInvalid2 {
-    /**
-     * {@inheritDoc}
-     */
-    public static void test() { // warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInterface.java
deleted file mode 100644
index 6c449ebc57a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingoverride/SuppressionXpathRegressionMissingOverrideInterface.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingoverride;
-
-public interface SuppressionXpathRegressionMissingOverrideInterface {
-    /**
-     * {@inheritDoc}
-     */
-    boolean test(Object obj); // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/InputXpathMissingSwitchDefaultNested.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/InputXpathMissingSwitchDefaultNested.java
new file mode 100644
index 00000000000..a81e629b58d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/InputXpathMissingSwitchDefaultNested.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.missingswitchdefault;
+
+public class InputXpathMissingSwitchDefaultNested {
+    public static void test2() {
+        int key = 2;
+        switch (key) {
+            case 1:
+                break;
+            case 2:
+                break;
+            default:
+                switch (key) { // warn
+                    case 2:
+                        break;
+                }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/InputXpathMissingSwitchDefaultSimple.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/InputXpathMissingSwitchDefaultSimple.java
new file mode 100644
index 00000000000..50ddffcbcae
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/InputXpathMissingSwitchDefaultSimple.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.missingswitchdefault;
+
+public class InputXpathMissingSwitchDefaultSimple {
+    public static void test1() {
+        int key = 2;
+        switch (key) { // warn
+            case 1:
+                break;
+            case 2:
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/SuppressionXpathRegressionMissingSwitchDefaultOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/SuppressionXpathRegressionMissingSwitchDefaultOne.java
deleted file mode 100644
index 17290bd306d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/SuppressionXpathRegressionMissingSwitchDefaultOne.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingswitchdefault;
-
-public class SuppressionXpathRegressionMissingSwitchDefaultOne {
-    public static void test1() {
-        int key = 2;
-        switch (key) { // warn
-            case 1:
-                break;
-            case 2:
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/SuppressionXpathRegressionMissingSwitchDefaultTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/SuppressionXpathRegressionMissingSwitchDefaultTwo.java
deleted file mode 100644
index 0daa65cdf1f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/missingswitchdefault/SuppressionXpathRegressionMissingSwitchDefaultTwo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.missingswitchdefault;
-
-public class SuppressionXpathRegressionMissingSwitchDefaultTwo {
-    public static void test2() {
-        int key = 2;
-        switch (key) {
-            case 1:
-                break;
-            case 2:
-                break;
-            default:
-                switch (key) { // warn
-                    case 2:
-                        break;
-                }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderAnnotation.java
new file mode 100644
index 00000000000..0069004e538
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderAnnotation.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.modifierorder;
+
+public @InterfaceAnnotation @interface InputXpathModifierOrderAnnotation { //warn
+    int foo();
+}
+
+@interface InterfaceAnnotation {}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderMethod.java
new file mode 100644
index 00000000000..dff854b99ab
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderMethod.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.modifierorder;
+
+public class InputXpathModifierOrderMethod {
+    private @MethodAnnotation void foo() {} // warn
+}
+
+@interface MethodAnnotation {}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderVariable.java
new file mode 100644
index 00000000000..f6b3ae5d435
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/InputXpathModifierOrderVariable.java
@@ -0,0 +1,4 @@
+package org.checkstyle.suppressionxpathfilter.modifierorder;
+public class InputXpathModifierOrderVariable {
+    static private boolean var = false; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderAnnotation.java
deleted file mode 100644
index 88b9ca8e8a4..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderAnnotation.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.modifierorder;
-
-public @InterfaceAnnotation @interface SuppressionXpathRegressionModifierOrderAnnotation { //warn
-    int foo();
-}
-
-@interface InterfaceAnnotation {}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderMethod.java
deleted file mode 100644
index 074d67590c8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderMethod.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.modifierorder;
-
-public class SuppressionXpathRegressionModifierOrderMethod {
-    private @MethodAnnotation void foo() {} // warn
-}
-
-@interface MethodAnnotation {}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderVariable.java
deleted file mode 100644
index 54b5c6be4ff..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/modifierorder/SuppressionXpathRegressionModifierOrderVariable.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.modifierorder;
-public class SuppressionXpathRegressionModifierOrderVariable {
-    static private boolean var = false; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsAllowDuplicates.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsAllowDuplicates.java
new file mode 100644
index 00000000000..59b5d599378
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsAllowDuplicates.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.multiplestringliterals;
+
+public class InputXpathMultipleStringLiteralsAllowDuplicates {
+    String a = "StringContents"; // ok
+    public void myTest() {
+      String a2 = "StringContents";
+      String a3 = "DoubleString" + "DoubleString"; // ok
+      String a5 = ", " + ", " + ", "; // warn
+   }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsDefault.java
new file mode 100644
index 00000000000..84637f29d55
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsDefault.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.multiplestringliterals;
+
+public class InputXpathMultipleStringLiteralsDefault {
+    String a = "StringContents"; // warn
+    String a1 = "unchecked";
+
+    @SuppressWarnings("unchecked") // ok
+    public void myTest() {
+      String a2 = "StringContents";
+      String a4 = "SingleString";
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsIgnoreOccurrenceContext.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsIgnoreOccurrenceContext.java
new file mode 100644
index 00000000000..92335c4dc88
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsIgnoreOccurrenceContext.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.multiplestringliterals;
+
+public class InputXpathMultipleStringLiteralsIgnoreOccurrenceContext {
+    String a = "StringContents";
+    String a1 = "unchecked"; // warn
+
+    @SuppressWarnings("unchecked")
+    public void myTest() {
+       String a3 = "DoubleString"; // ok
+       String a5 = "unchecked";
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsIgnoreRegexp.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsIgnoreRegexp.java
new file mode 100644
index 00000000000..8f3efbb657b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplestringliterals/InputXpathMultipleStringLiteralsIgnoreRegexp.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.multiplestringliterals;
+
+public class InputXpathMultipleStringLiteralsIgnoreRegexp {
+
+    public void myTest() {
+
+      String a3 = "DoubleString" + "DoubleString"; // warn
+      String a4 = "SingleString"; // ok
+      String a5 = ", " + ", " + ", "; // ok
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/InputXpathMultipleVariableDeclarations.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/InputXpathMultipleVariableDeclarations.java
new file mode 100644
index 00000000000..96106d9c7ea
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/InputXpathMultipleVariableDeclarations.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.multiplevariabledeclarations;
+
+public class InputXpathMultipleVariableDeclarations {
+    int i1; int j1; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/InputXpathMultipleVariableDeclarationsCommaSeparator.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/InputXpathMultipleVariableDeclarationsCommaSeparator.java
new file mode 100644
index 00000000000..844c8e07885
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/InputXpathMultipleVariableDeclarationsCommaSeparator.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.multiplevariabledeclarations;
+
+public class InputXpathMultipleVariableDeclarationsCommaSeparator {
+    int i, j; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/SuppressionXpathRegressionMultipleVariableDeclarationsOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/SuppressionXpathRegressionMultipleVariableDeclarationsOne.java
deleted file mode 100644
index 47d4f34e090..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/SuppressionXpathRegressionMultipleVariableDeclarationsOne.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.multiplevariabledeclarations;
-
-public class SuppressionXpathRegressionMultipleVariableDeclarationsOne {
-    int i, j; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/SuppressionXpathRegressionMultipleVariableDeclarationsTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/SuppressionXpathRegressionMultipleVariableDeclarationsTwo.java
deleted file mode 100644
index c0b83f3e330..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/multiplevariabledeclarations/SuppressionXpathRegressionMultipleVariableDeclarationsTwo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.multiplevariabledeclarations;
-
-public class SuppressionXpathRegressionMultipleVariableDeclarationsTwo {
-    int i1; int j1; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesDo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesDo.java
new file mode 100644
index 00000000000..fd1d577d5f4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesDo.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.needbraces;
+
+public class InputXpathNeedBracesDo {
+    /** @return helper func **/
+    boolean condition()
+    {
+        return false;
+    }
+
+    /** Test do/while loops **/
+    public void test() {
+        // Invalid
+        do test(); while (condition()); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesEmptyLoopBody.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesEmptyLoopBody.java
new file mode 100644
index 00000000000..92a1f319adf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesEmptyLoopBody.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.needbraces;
+
+public class InputXpathNeedBracesEmptyLoopBody {
+    private int incrementValue() {
+        return 1;
+    }
+
+    public void test() {
+        while(incrementValue() < 5);; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesSingleLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesSingleLine.java
new file mode 100644
index 00000000000..9b701198375
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesSingleLine.java
@@ -0,0 +1,20 @@
+package org.checkstyle.suppressionxpathfilter.needbraces;
+
+import com.puppycrawl.tools.checkstyle.checks.blocks.needbraces.InputNeedBracesSingleLineStatements;
+
+public class InputXpathNeedBracesSingleLine {
+    private static class SomeClass {
+        boolean flag = true;
+        private static boolean test(boolean k) {
+            return k;
+        }
+    }
+
+    /** Test do/while loops **/
+    public int test() {
+        // Invalid
+        if (SomeClass.test(true) == true) // warn
+            return 4;
+        return 0;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesSingleLineLambda.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesSingleLineLambda.java
new file mode 100644
index 00000000000..7707fdaa6d6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/InputXpathNeedBracesSingleLineLambda.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.needbraces;
+
+public class InputXpathNeedBracesSingleLineLambda {
+    static Runnable r3 = () -> // warn
+            String.CASE_INSENSITIVE_ORDER.equals("Hello world two!");
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesDo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesDo.java
deleted file mode 100644
index c210f82cc86..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesDo.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.needbraces;
-
-public class SuppressionXpathRegressionNeedBracesDo {
-    /** @return helper func **/
-    boolean condition()
-    {
-        return false;
-    }
-
-    /** Test do/while loops **/
-    public void test() {
-        // Invalid
-        do test(); while (condition()); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesEmptyLoopBody.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesEmptyLoopBody.java
deleted file mode 100644
index 185130872fb..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesEmptyLoopBody.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.needbraces;
-
-public class SuppressionXpathRegressionNeedBracesEmptyLoopBody {
-    private int incrementValue() {
-        return 1;
-    }
-
-    public void test() {
-        while(incrementValue() < 5);; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesSingleLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesSingleLine.java
deleted file mode 100644
index ae011c01eb7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesSingleLine.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.needbraces;
-
-import com.puppycrawl.tools.checkstyle.checks.blocks.needbraces.InputNeedBracesSingleLineStatements;
-
-public class SuppressionXpathRegressionNeedBracesSingleLine {
-    private static class SomeClass {
-        boolean flag = true;
-        private static boolean test(boolean k) {
-            return k;
-        }
-    }
-
-    /** Test do/while loops **/
-    public int test() {
-        // Invalid
-        if (SomeClass.test(true) == true) // warn
-            return 4;
-        return 0;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesSingleLineLambda.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesSingleLineLambda.java
deleted file mode 100644
index f81b3480f80..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/needbraces/SuppressionXpathRegressionNeedBracesSingleLineLambda.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.needbraces;
-
-public class SuppressionXpathRegressionNeedBracesSingleLineLambda {
-    static Runnable r3 = () -> // warn
-            String.CASE_INSENSITIVE_ORDER.equals("Hello world two!");
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/InputXpathNestedForDepth.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/InputXpathNestedForDepth.java
new file mode 100644
index 00000000000..3bfaae6b5e8
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/InputXpathNestedForDepth.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.nestedfordepth;
+
+public class InputXpathNestedForDepth {
+    public void test() {
+        for (int i = 0; i < 100; i++) {
+            for (int j = 0; j < 100; j++) {
+                for (int k = 0; k < 100; k++) { //warn
+
+                }
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/InputXpathNestedForDepthMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/InputXpathNestedForDepthMax.java
new file mode 100644
index 00000000000..728e48d0bb6
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/InputXpathNestedForDepthMax.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.nestedfordepth;
+
+public class InputXpathNestedForDepthMax {
+    public void test() {
+        for (int i1 = 0; i1 < 10; i1++) {
+            for (int i2 = 0; i2 < 10; i2++) {
+                for (int i3 = 0; i3 < 10; i3++) {
+                    for (int i4 = 0; i4 < 10; i4++) { // warn
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/SuppressionXpathRegressionNestedForDepth.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/SuppressionXpathRegressionNestedForDepth.java
deleted file mode 100644
index c26f2962d4b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/SuppressionXpathRegressionNestedForDepth.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nestedfordepth;
-
-public class SuppressionXpathRegressionNestedForDepth {
-    public void test() {
-        for (int i = 0; i < 100; i++) {
-            for (int j = 0; j < 100; j++) {
-                for (int k = 0; k < 100; k++) { //warn
-
-                }
-            }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/SuppressionXpathRegressionNestedForDepthMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/SuppressionXpathRegressionNestedForDepthMax.java
deleted file mode 100644
index 9e67551a24f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedfordepth/SuppressionXpathRegressionNestedForDepthMax.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nestedfordepth;
-
-public class SuppressionXpathRegressionNestedForDepthMax {
-    public void test() {
-        for (int i1 = 0; i1 < 10; i1++) {
-            for (int i2 = 0; i2 < 10; i2++) {
-                for (int i3 = 0; i3 < 10; i3++) {
-                    for (int i4 = 0; i4 < 10; i4++) { // warn
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/InputXpathNestedIfDepth.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/InputXpathNestedIfDepth.java
new file mode 100644
index 00000000000..f5a7076e73c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/InputXpathNestedIfDepth.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.nestedifdepth;
+
+public class InputXpathNestedIfDepth {
+    public void test() {
+        int a = 1;
+        int b = 2;
+        int c = 3;
+        if (a > b) {
+            if (c > b) {
+                if (c > a) { //warn
+
+                }
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/InputXpathNestedIfDepthMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/InputXpathNestedIfDepthMax.java
new file mode 100644
index 00000000000..98dc6be6cb4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/InputXpathNestedIfDepthMax.java
@@ -0,0 +1,20 @@
+package org.checkstyle.suppressionxpathfilter.nestedifdepth;
+
+public class InputXpathNestedIfDepthMax {
+    public void test() {
+        int a = 1;
+        int b = 2;
+        int c = 3;
+        if (a > b) {
+            if (c > b) {
+                if (c > a) {
+                    if (1 == 2) {
+                        if (2 == 3) { // warn
+
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/SuppressionXpathRegressionNestedIfDepth.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/SuppressionXpathRegressionNestedIfDepth.java
deleted file mode 100644
index 1f58b2981ae..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/SuppressionXpathRegressionNestedIfDepth.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nestedifdepth;
-
-public class SuppressionXpathRegressionNestedIfDepth {
-    public void test() {
-        int a = 1;
-        int b = 2;
-        int c = 3;
-        if (a > b) {
-            if (c > b) {
-                if (c > a) { //warn
-
-                }
-            }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/SuppressionXpathRegressionNestedIfDepthMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/SuppressionXpathRegressionNestedIfDepthMax.java
deleted file mode 100644
index 6bdd7fb3dce..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedifdepth/SuppressionXpathRegressionNestedIfDepthMax.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nestedifdepth;
-
-public class SuppressionXpathRegressionNestedIfDepthMax {
-    public void test() {
-        int a = 1;
-        int b = 2;
-        int c = 3;
-        if (a > b) {
-            if (c > b) {
-                if (c > a) {
-                    if (1 == 2) {
-                        if (2 == 3) { // warn
-
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/InputXpathNestedTryDepth.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/InputXpathNestedTryDepth.java
new file mode 100644
index 00000000000..a12d1c4d8a2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/InputXpathNestedTryDepth.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.nestedtrydepth;
+
+public class InputXpathNestedTryDepth {
+    public void test() {
+        try {
+            try {
+                try { //warn
+
+                } catch (Exception e) {}
+            } catch (Exception e) {}
+        } catch (Exception e) {}
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/InputXpathNestedTryDepthMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/InputXpathNestedTryDepthMax.java
new file mode 100644
index 00000000000..95a2f8cb2a2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/InputXpathNestedTryDepthMax.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.nestedtrydepth;
+
+public class InputXpathNestedTryDepthMax {
+    public void test() {
+        try {
+            try {
+                try {
+                    try {
+                        try { // warn
+
+                        } catch (Exception e) {}
+                    } catch (Exception e) {}
+                } catch (Exception e) {}
+            } catch (Exception e) {}
+        } catch (Exception e) {}
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/SuppressionXpathRegressionNestedTryDepth.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/SuppressionXpathRegressionNestedTryDepth.java
deleted file mode 100644
index 6f97898c0ef..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/SuppressionXpathRegressionNestedTryDepth.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nestedtrydepth;
-
-public class SuppressionXpathRegressionNestedTryDepth {
-    public void test() {
-        try {
-            try {
-                try { //warn
-
-                } catch (Exception e) {}
-            } catch (Exception e) {}
-        } catch (Exception e) {}
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/SuppressionXpathRegressionNestedTryDepthMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/SuppressionXpathRegressionNestedTryDepthMax.java
deleted file mode 100644
index 693e8fa6257..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nestedtrydepth/SuppressionXpathRegressionNestedTryDepthMax.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nestedtrydepth;
-
-public class SuppressionXpathRegressionNestedTryDepthMax {
-    public void test() {
-        try {
-            try {
-                try {
-                    try {
-                        try { // warn
-
-                        } catch (Exception e) {}
-                    } catch (Exception e) {}
-                } catch (Exception e) {}
-            } catch (Exception e) {}
-        } catch (Exception e) {}
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/InputXpathNoArrayTrailingCommaOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/InputXpathNoArrayTrailingCommaOne.java
new file mode 100644
index 00000000000..eb9713038d1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/InputXpathNoArrayTrailingCommaOne.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.noarraytrailingcomma;
+
+public class InputXpathNoArrayTrailingCommaOne {
+
+    int[] t1 = new int[] {1, 2, 3, 4, }; //warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/InputXpathNoArrayTrailingCommaTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/InputXpathNoArrayTrailingCommaTwo.java
new file mode 100644
index 00000000000..d1e635ca4d8
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/InputXpathNoArrayTrailingCommaTwo.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.noarraytrailingcomma;
+
+public class InputXpathNoArrayTrailingCommaTwo {
+    int[] t4 = new int[] {1,}; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/SuppressionXpathRegressionNoArrayTrailingCommaOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/SuppressionXpathRegressionNoArrayTrailingCommaOne.java
deleted file mode 100644
index 3f6f7baa40c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/SuppressionXpathRegressionNoArrayTrailingCommaOne.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.noarraytrailingcomma;
-
-public class SuppressionXpathRegressionNoArrayTrailingCommaOne {
-
-    int[] t1 = new int[] {1, 2, 3, 4, }; //warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/SuppressionXpathRegressionNoArrayTrailingCommaTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/SuppressionXpathRegressionNoArrayTrailingCommaTwo.java
deleted file mode 100644
index 5635678bfb3..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/noarraytrailingcomma/SuppressionXpathRegressionNoArrayTrailingCommaTwo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.noarraytrailingcomma;
-
-public class SuppressionXpathRegressionNoArrayTrailingCommaTwo {
-    int[] t4 = new int[] {1,}; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/InputXpathNoCloneInnerClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/InputXpathNoCloneInnerClass.java
new file mode 100644
index 00000000000..13271f94854
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/InputXpathNoCloneInnerClass.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.noclone;
+
+public class InputXpathNoCloneInnerClass {
+
+  class InnerClass {
+    public Object clone() { return null; } // warn
+  }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/InputXpathNoCloneMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/InputXpathNoCloneMethod.java
new file mode 100644
index 00000000000..b88c530eed1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/InputXpathNoCloneMethod.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.noclone;
+
+public class InputXpathNoCloneMethod {
+
+    public Object clone() { return null; } // warn
+
+    public <T> T clone(T t) { return null; }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/SuppressionXpathRegressionNoCloneOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/SuppressionXpathRegressionNoCloneOne.java
deleted file mode 100644
index 4b6a363cd60..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/SuppressionXpathRegressionNoCloneOne.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.noclone;
-
-public class SuppressionXpathRegressionNoCloneOne {
-
-    public Object clone() { return null; } // warn
-
-    public <T> T clone(T t) { return null; }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/SuppressionXpathRegressionNoCloneTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/SuppressionXpathRegressionNoCloneTwo.java
deleted file mode 100644
index 3fe3d1a445b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/noclone/SuppressionXpathRegressionNoCloneTwo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.noclone;
-
-public class SuppressionXpathRegressionNoCloneTwo {
-
-  class InnerClass {
-    public Object clone() { return null; } // warn
-  }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/InputXpathNoEnumTrailingCommaOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/InputXpathNoEnumTrailingCommaOne.java
new file mode 100644
index 00000000000..b81f8648f73
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/InputXpathNoEnumTrailingCommaOne.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.noenumtrailingcomma;
+
+public class InputXpathNoEnumTrailingCommaOne {
+
+    enum Foo3 {
+        FOO,
+        BAR, //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/InputXpathNoEnumTrailingCommaTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/InputXpathNoEnumTrailingCommaTwo.java
new file mode 100644
index 00000000000..2600db9db5f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/InputXpathNoEnumTrailingCommaTwo.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.noenumtrailingcomma;
+
+public class InputXpathNoEnumTrailingCommaTwo {
+
+    enum Foo6 { FOO, BAR,; } //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/SuppressionXpathRegressionNoEnumTrailingCommaOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/SuppressionXpathRegressionNoEnumTrailingCommaOne.java
deleted file mode 100644
index 349e2069176..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/SuppressionXpathRegressionNoEnumTrailingCommaOne.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.noenumtrailingcomma;
-
-public class SuppressionXpathRegressionNoEnumTrailingCommaOne {
-
-    enum Foo3 {
-        FOO,
-        BAR, //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/SuppressionXpathRegressionNoEnumTrailingCommaTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/SuppressionXpathRegressionNoEnumTrailingCommaTwo.java
deleted file mode 100644
index 2733921418b..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/noenumtrailingcomma/SuppressionXpathRegressionNoEnumTrailingCommaTwo.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.noenumtrailingcomma;
-
-public class SuppressionXpathRegressionNoEnumTrailingCommaTwo {
-
-    enum Foo6 { FOO, BAR,; } //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/InputXpathNoFinalizerInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/InputXpathNoFinalizerInner.java
new file mode 100644
index 00000000000..40a4d575686
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/InputXpathNoFinalizerInner.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.nofinalizer;
+
+public class InputXpathNoFinalizerInner {
+    public static void doStuff() {
+        // some code here
+    }
+
+    class InnerClass {
+
+        @Override // warn
+        @Deprecated
+        protected void finalize() throws Throwable {
+
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/InputXpathNoFinalizerMain.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/InputXpathNoFinalizerMain.java
new file mode 100644
index 00000000000..617d3c04f72
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/InputXpathNoFinalizerMain.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.nofinalizer;
+
+public class InputXpathNoFinalizerMain {
+    public static void main(String[] args) {
+        // some code here
+    }
+
+    protected void finalize() throws Throwable { // warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer1.java
deleted file mode 100644
index fb137c2c600..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nofinalizer;
-
-public class SuppressionXpathRegressionNoFinalizer1 {
-    public static void main(String[] args) {
-        // some code here
-    }
-
-    protected void finalize() throws Throwable { // warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer2.java
deleted file mode 100644
index c4deb695894..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nofinalizer/SuppressionXpathRegressionNoFinalizer2.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nofinalizer;
-
-public class SuppressionXpathRegressionNoFinalizer2 {
-    public static void doStuff() {
-        // some code here
-    }
-
-    class InnerClass {
-
-        @Override // warn
-        @Deprecated
-        protected void finalize() throws Throwable {
-
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapDefault.java
new file mode 100644
index 00000000000..c6a3031ec30
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapDefault.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter // warn
+        .nolinewrap;
+
+public class InputXpathNoLineWrapDefault {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapTokensCtorDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapTokensCtorDef.java
new file mode 100644
index 00000000000..59d554554eb
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapTokensCtorDef.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.nolinewrap;
+
+public class InputXpathNoLineWrapTokensCtorDef {
+    InputXpathNoLineWrapTokensCtorDef //warn
+            (String input1, String input2) {
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapTokensMethodDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapTokensMethodDef.java
new file mode 100644
index 00000000000..e1d608419a3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/InputXpathNoLineWrapTokensMethodDef.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.nolinewrap;
+
+public class InputXpathNoLineWrapTokensMethodDef {
+    public static // warn
+        void test2() {
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap1.java
deleted file mode 100644
index bb9cefce7a7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap1.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter // warn
-        .nolinewrap;
-
-public class SuppressionXpathRegressionNoLineWrap1 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap2.java
deleted file mode 100644
index 2595020ab6e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nolinewrap;
-
-public class SuppressionXpathRegressionNoLineWrap2 {
-    public static // warn
-        void test2() {
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap3.java
deleted file mode 100644
index 986d6d952e4..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nolinewrap/SuppressionXpathRegressionNoLineWrap3.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nolinewrap;
-
-public class SuppressionXpathRegressionNoLineWrap3 {
-    SuppressionXpathRegressionNoLineWrap3 //warn
-            (String input1, String input2) {
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfter.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfter.java
new file mode 100644
index 00000000000..7f9c9cef157
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfter.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespaceafter;
+
+public class InputXpathNoWhitespaceAfter {
+    int bad = - 1;//warn
+    int good = -1;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfterLineBreaks.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfterLineBreaks.java
new file mode 100644
index 00000000000..2ca6cd75568
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfterLineBreaks.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespaceafter;
+
+public class InputXpathNoWhitespaceAfterLineBreaks {
+    public void test() {
+        java.lang
+            . String s = "Test"; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfterTokens.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfterTokens.java
new file mode 100644
index 00000000000..d1f4d27d228
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/InputXpathNoWhitespaceAfterTokens.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespaceafter;
+
+public class InputXpathNoWhitespaceAfterTokens {
+    public java. lang.String test() { // warn
+        return "";
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfter.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfter.java
deleted file mode 100644
index 141773369f8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfter.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespaceafter;
-
-public class SuppressionXpathRegressionNoWhitespaceAfter {
-    int bad = - 1;//warn
-    int good = -1;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfterLineBreaks.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfterLineBreaks.java
deleted file mode 100644
index 2067e5d0635..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfterLineBreaks.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespaceafter;
-
-public class SuppressionXpathRegressionNoWhitespaceAfterLineBreaks {
-    public void test() {
-        java.lang
-            . String s = "Test"; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfterTokens.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfterTokens.java
deleted file mode 100644
index 028dc7e4154..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespaceafter/SuppressionXpathRegressionNoWhitespaceAfterTokens.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespaceafter;
-
-public class SuppressionXpathRegressionNoWhitespaceAfterTokens {
-    public java. lang.String test() { // warn
-        return "";
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBefore.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBefore.java
new file mode 100644
index 00000000000..62dd223c6a0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBefore.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespacebefore;
+
+public class InputXpathNoWhitespaceBefore {
+    int bad ;//warn
+    int good;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBeforeLineBreaks.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBeforeLineBreaks.java
new file mode 100644
index 00000000000..d48b0db5d73
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBeforeLineBreaks.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespacebefore;
+
+public class InputXpathNoWhitespaceBeforeLineBreaks {
+    public void test() {
+        int[][] array = { { 1, 2 }
+            , { 3, 4 } }; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBeforeTokens.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBeforeTokens.java
new file mode 100644
index 00000000000..5ec7cca9a8c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/InputXpathNoWhitespaceBeforeTokens.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespacebefore;
+
+public class InputXpathNoWhitespaceBeforeTokens {
+    public java .lang.String test() { // warn
+        return "";
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBefore.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBefore.java
deleted file mode 100644
index ebeceb659df..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBefore.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespacebefore;
-
-public class SuppressionXpathRegressionNoWhitespaceBefore {
-    int bad ;//warn
-    int good;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBeforeLineBreaks.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBeforeLineBreaks.java
deleted file mode 100644
index f4134b2d3f5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBeforeLineBreaks.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespacebefore;
-
-public class SuppressionXpathRegressionNoWhitespaceBeforeLineBreaks {
-    public void test() {
-        int[][] array = { { 1, 2 }
-            , { 3, 4 } }; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBeforeTokens.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBeforeTokens.java
deleted file mode 100644
index bc3a2c79796..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebefore/SuppressionXpathRegressionNoWhitespaceBeforeTokens.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespacebefore;
-
-public class SuppressionXpathRegressionNoWhitespaceBeforeTokens {
-    public java .lang.String test() { // warn
-        return "";
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonFour.java
new file mode 100644
index 00000000000..e38b14a5571
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonFour.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
+
+public class InputXpathNoWhitespaceBeforeCaseDefaultColonFour {
+    {
+        switch(1) {
+            case 1:
+                break;
+            case 2:
+                break;
+            default
+                    : // warn
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonOne.java
new file mode 100644
index 00000000000..2657856d2fc
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonOne.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
+
+public class InputXpathNoWhitespaceBeforeCaseDefaultColonOne {
+    {
+        switch(1) {
+            case 1 : // warn
+                break;
+            case 2:
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonThree.java
new file mode 100644
index 00000000000..e4d9c877655
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonThree.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
+
+public class InputXpathNoWhitespaceBeforeCaseDefaultColonThree {
+    {
+        switch(1) {
+            case 1
+                    : // warn
+                break;
+            case 2:
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonTwo.java
new file mode 100644
index 00000000000..e14bc60b92a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/InputXpathNoWhitespaceBeforeCaseDefaultColonTwo.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
+
+public class InputXpathNoWhitespaceBeforeCaseDefaultColonTwo {
+    {
+        switch(1) {
+            case 1:
+                break;
+            case 2:
+                break;
+            default : // warn
+                break;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java
deleted file mode 100644
index 3ba4b0d5412..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
-
-public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonFour {
-    {
-        switch(1) {
-            case 1:
-                break;
-            case 2:
-                break;
-            default
-                    : // warn
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java
deleted file mode 100644
index 24c82569eb9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
-
-public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonOne {
-    {
-        switch(1) {
-            case 1 : // warn
-                break;
-            case 2:
-                break;
-            default:
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java
deleted file mode 100644
index b0c3287d227..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
-
-public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonThree {
-    {
-        switch(1) {
-            case 1
-                    : // warn
-                break;
-            case 2:
-                break;
-            default:
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java
deleted file mode 100644
index 8561a7c132a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/nowhitespacebeforecasedefaultcolon/SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.nowhitespacebeforecasedefaultcolon;
-
-public class SuppressionXpathRegressionNoWhitespaceBeforeCaseDefaultColonTwo {
-    {
-        switch(1) {
-            case 1:
-                break;
-            case 2:
-                break;
-            default : // warn
-                break;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/InputXpathNPathComplexityMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/InputXpathNPathComplexityMethod.java
new file mode 100644
index 00000000000..a6c6179b127
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/InputXpathNPathComplexityMethod.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.npathcomplexity;
+
+public class InputXpathNPathComplexityMethod {
+    public void test() { //warn
+        while (true) {
+            if (1 > 0) {
+
+            } else {
+
+            }
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/InputXpathNPathComplexityStaticBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/InputXpathNPathComplexityStaticBlock.java
new file mode 100644
index 00000000000..a104b95c63b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/InputXpathNPathComplexityStaticBlock.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.npathcomplexity;
+
+public class InputXpathNPathComplexityStaticBlock {
+    static { //warn
+        int i = 1;
+        // NP = (if-range=1) + (else-range=2) + 0 = 3
+        if (System.currentTimeMillis() == 0) {
+            // NP(else-range) = (if-range=1) + (else-range=1) + (expr=0) = 2
+        } else if (System.currentTimeMillis() == 0) {
+        } else {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/SuppressionXpathRegressionNPathComplexityOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/SuppressionXpathRegressionNPathComplexityOne.java
deleted file mode 100644
index b03267b6a65..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/SuppressionXpathRegressionNPathComplexityOne.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.npathcomplexity;
-
-public class SuppressionXpathRegressionNPathComplexityOne {
-    public void test() { //warn
-        while (true) {
-            if (1 > 0) {
-
-            } else {
-
-            }
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/SuppressionXpathRegressionNPathComplexityTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/SuppressionXpathRegressionNPathComplexityTwo.java
deleted file mode 100644
index 00cbcc8f587..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/npathcomplexity/SuppressionXpathRegressionNPathComplexityTwo.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.npathcomplexity;
-
-public class SuppressionXpathRegressionNPathComplexityTwo {
-    static { //warn
-        int i = 1;
-        // NP = (if-range=1) + (else-range=2) + 0 = 3
-        if (System.currentTimeMillis() == 0) {
-            // NP(else-range) = (if-range=1) + (else-range=1) + (expr=0) = 2
-        } else if (System.currentTimeMillis() == 0) {
-        } else {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/InputXpathOneStatementPerLineClassFields.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/InputXpathOneStatementPerLineClassFields.java
new file mode 100644
index 00000000000..c41fa31a92c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/InputXpathOneStatementPerLineClassFields.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.onestatementperline;
+
+public class InputXpathOneStatementPerLineClassFields {
+    int i; int j; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/InputXpathOneStatementPerLineForLoopBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/InputXpathOneStatementPerLineForLoopBlock.java
new file mode 100644
index 00000000000..f9231a04b62
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/InputXpathOneStatementPerLineForLoopBlock.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.onestatementperline;
+
+public class InputXpathOneStatementPerLineForLoopBlock {
+    private void foo5(int var1, int var2) {
+        for(int n = 0,
+            k = 1
+            ; n<5
+                ;
+            n++, k--) { var1++; var2++; } //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/SuppressionXpathRegressionOneStatementPerLineOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/SuppressionXpathRegressionOneStatementPerLineOne.java
deleted file mode 100644
index 60c5e687ffb..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/SuppressionXpathRegressionOneStatementPerLineOne.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.onestatementperline;
-
-public class SuppressionXpathRegressionOneStatementPerLineOne {
-    int i; int j; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/SuppressionXpathRegressionOneStatementPerLineTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/SuppressionXpathRegressionOneStatementPerLineTwo.java
deleted file mode 100644
index 33b09a0156a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/onestatementperline/SuppressionXpathRegressionOneStatementPerLineTwo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.onestatementperline;
-
-public class SuppressionXpathRegressionOneStatementPerLineTwo {
-    private void foo5(int var1, int var2) {
-        for(int n = 0,
-            k = 1
-            ; n<5
-                ;
-            n++, k--) { var1++; var2++; } //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/InputXpathOneTopLevelClassFirst.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/InputXpathOneTopLevelClassFirst.java
new file mode 100644
index 00000000000..70e67a3b01a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/InputXpathOneTopLevelClassFirst.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.onetoplevelclass;
+
+public class InputXpathOneTopLevelClassFirst {
+    // methods
+}
+
+class ViolatingSecondClass { //warn
+    // methods
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/InputXpathOneTopLevelClassSecond.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/InputXpathOneTopLevelClassSecond.java
new file mode 100644
index 00000000000..456a4374283
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/InputXpathOneTopLevelClassSecond.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.onetoplevelclass;
+
+public class InputXpathOneTopLevelClassSecond {
+    // methods
+}
+
+enum ViolationClass { // warn
+    // methods
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/SuppressionXpathRegressionOneTopLevelClassFirst.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/SuppressionXpathRegressionOneTopLevelClassFirst.java
deleted file mode 100644
index 7165ca9f7d9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/SuppressionXpathRegressionOneTopLevelClassFirst.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.onetoplevelclass;
-
-public class SuppressionXpathRegressionOneTopLevelClassFirst {
-    // methods
-}
-
-class ViolatingSecondClass { //warn
-    // methods
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/SuppressionXpathRegressionOneTopLevelClassSecond.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/SuppressionXpathRegressionOneTopLevelClassSecond.java
deleted file mode 100644
index 4c304fe7d45..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/onetoplevelclass/SuppressionXpathRegressionOneTopLevelClassSecond.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.onetoplevelclass;
-
-public class SuppressionXpathRegressionOneTopLevelClassSecond {
-    // methods
-}
-
-enum ViolationClass { // warn
-    // methods
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/InputXpathOperatorWrapNewLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/InputXpathOperatorWrapNewLine.java
new file mode 100644
index 00000000000..81a58400df5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/InputXpathOperatorWrapNewLine.java
@@ -0,0 +1,27 @@
+package org.checkstyle.suppressionxpathfilter.operatorwrap;
+
+public class InputXpathOperatorWrapNewLine {
+
+    void test() {
+        int x = 1 + // warn
+             2
+             -
+             3
+             -
+             4;
+     x = x + 2;
+
+   }
+
+   void test2() {
+        int x = 1
+             +
+             2
+             -
+             3
+             -
+             4;
+     x = x + 2;
+
+   }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/InputXpathOperatorWrapPreviousLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/InputXpathOperatorWrapPreviousLine.java
new file mode 100644
index 00000000000..495fda44ae4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/InputXpathOperatorWrapPreviousLine.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.operatorwrap;
+
+public class InputXpathOperatorWrapPreviousLine {
+    int b
+          = 10; // warn
+    int c =
+             10;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/SuppressionXpathRegressionOperatorWrapNewLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/SuppressionXpathRegressionOperatorWrapNewLine.java
deleted file mode 100644
index cf2114921c9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/SuppressionXpathRegressionOperatorWrapNewLine.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.operatorwrap;
-
-public class SuppressionXpathRegressionOperatorWrapNewLine {
-
-    void test() {
-        int x = 1 + // warn
-             2
-             -
-             3
-             -
-             4;
-     x = x + 2;
-
-   }
-
-   void test2() {
-        int x = 1
-             +
-             2
-             -
-             3
-             -
-             4;
-     x = x + 2;
-
-   }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/SuppressionXpathRegressionOperatorWrapPreviousLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/SuppressionXpathRegressionOperatorWrapPreviousLine.java
deleted file mode 100644
index a00623cf2b6..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/operatorwrap/SuppressionXpathRegressionOperatorWrapPreviousLine.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.operatorwrap;
-
-public class SuppressionXpathRegressionOperatorWrapPreviousLine {
-    int b
-          = 10; // warn
-    int c =
-             10;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/SuppressionXpathRegressionOuterTypeFilename1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/InputXpathOuterTypeFilenameOne.java
similarity index 100%
rename from src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/SuppressionXpathRegressionOuterTypeFilename1.java
rename to src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/InputXpathOuterTypeFilenameOne.java
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/SuppressionXpathRegressionOuterTypeFilename2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/InputXpathOuterTypeFilenameTwo.java
similarity index 100%
rename from src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/SuppressionXpathRegressionOuterTypeFilename2.java
rename to src/it/resources/org/checkstyle/suppressionxpathfilter/outertypefilename/InputXpathOuterTypeFilenameTwo.java
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/InputXpathOuterTypeNumber.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/InputXpathOuterTypeNumber.java
new file mode 100644
index 00000000000..101251efb09
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/InputXpathOuterTypeNumber.java
@@ -0,0 +1,30 @@
+package org.checkstyle.suppressionxpathfilter.outertypenumber; //warn
+
+public class InputXpathOuterTypeNumber {
+    int i; int j;
+}
+class InputOuterTypeNumberSimple2
+{
+    /** Some more Javadoc. */
+    public void doSomething()
+    {
+        //"O" should be named "o"
+        for (Object O : new java.util.ArrayList())
+        {
+
+        }
+    }
+}
+
+/** Test enum for member naming check */
+enum MyEnum1
+{
+    /** ABC constant */
+    ABC,
+
+    /** XYZ constant */
+    XYZ;
+
+    /** Should be mSomeMember */
+    private int someMember;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/InputXpathOuterTypeNumberDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/InputXpathOuterTypeNumberDefault.java
new file mode 100644
index 00000000000..06d85533fcf
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/InputXpathOuterTypeNumberDefault.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.outertypenumber; // warn
+
+public class InputXpathOuterTypeNumberDefault {
+    public void test() {}
+}
+
+interface Constants {
+    int X = 10;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/SuppressionXpathRegressionOuterTypeNumber.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/SuppressionXpathRegressionOuterTypeNumber.java
deleted file mode 100644
index 167f05aa701..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/SuppressionXpathRegressionOuterTypeNumber.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.outertypenumber; //warn
-
-public class SuppressionXpathRegressionOuterTypeNumber {
-    int i; int j;
-}
-class InputOuterTypeNumberSimple2
-{
-    /** Some more Javadoc. */
-    public void doSomething()
-    {
-        //"O" should be named "o"
-        for (Object O : new java.util.ArrayList())
-        {
-
-        }
-    }
-}
-
-/** Test enum for member naming check */
-enum MyEnum1
-{
-    /** ABC constant */
-    ABC,
-
-    /** XYZ constant */
-    XYZ;
-
-    /** Should be mSomeMember */
-    private int someMember;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/SuppressionXpathRegressionOuterTypeNumberDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/SuppressionXpathRegressionOuterTypeNumberDefault.java
deleted file mode 100644
index 13ec9062daa..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/outertypenumber/SuppressionXpathRegressionOuterTypeNumberDefault.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.outertypenumber; // warn
-
-public class SuppressionXpathRegressionOuterTypeNumberDefault {
-    public void test() {}
-}
-
-interface Constants {
-    int X = 10;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/InputXpathOverloadMethodsDeclarationOrderAnonymous.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/InputXpathOverloadMethodsDeclarationOrderAnonymous.java
new file mode 100644
index 00000000000..9025224f211
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/InputXpathOverloadMethodsDeclarationOrderAnonymous.java
@@ -0,0 +1,34 @@
+package org.checkstyle.suppressionxpathfilter.overloadmethodsdeclarationorder;
+
+public class InputXpathOverloadMethodsDeclarationOrderAnonymous {
+    private InputXpathOverloadMethodsDeclarationOrderAnonymous anonymous
+            = new MyInputXpathOverloadMethodsDeclarationOrderAnonymous();
+
+    public InputXpathOverloadMethodsDeclarationOrderAnonymous getAnonymous() {
+        return anonymous;
+    }
+
+    public void setAnonymous(InputXpathOverloadMethodsDeclarationOrderAnonymous anonymous) {
+        this.anonymous = anonymous;
+    }
+
+    private static class MyInputXpathOverloadMethodsDeclarationOrderAnonymous
+            extends InputXpathOverloadMethodsDeclarationOrderAnonymous {
+        public void overloadMethod(int i) {
+            //do stuff
+        }
+
+        public void overloadMethod(String s) {
+            //do more stuff
+        }
+
+        public void separatorMethod() {
+            //do other stuff
+        }
+
+        //violation because overloads shouldn't be separated
+        public void overloadMethod(String s, Boolean b, int i) { //warn
+            //do stuff
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/InputXpathOverloadMethodsDeclarationOrderDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/InputXpathOverloadMethodsDeclarationOrderDefault.java
new file mode 100644
index 00000000000..2884ebff7f5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/InputXpathOverloadMethodsDeclarationOrderDefault.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.overloadmethodsdeclarationorder;
+
+public class InputXpathOverloadMethodsDeclarationOrderDefault {
+
+    public void overloadMethod(String s) {
+        //do stuff
+    }
+
+    public void separatorMethod() {
+        //do stuff
+    }
+
+    //violation because overloads shouldn't be separated
+    public void overloadMethod(String s, Boolean b, int i) { //warn
+        //do stuff
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/SuppressionXpathRegressionOverloadMethodsDeclarationOrder1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/SuppressionXpathRegressionOverloadMethodsDeclarationOrder1.java
deleted file mode 100644
index 84091a090cc..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/SuppressionXpathRegressionOverloadMethodsDeclarationOrder1.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.overloadmethodsdeclarationorder;
-
-public class SuppressionXpathRegressionOverloadMethodsDeclarationOrder1 {
-
-    public void overloadMethod(String s) {
-        //do stuff
-    }
-
-    public void separatorMethod() {
-        //do stuff
-    }
-
-    //violation because overloads shouldn't be separated
-    public void overloadMethod(String s, Boolean b, int i) { //warn
-        //do stuff
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/SuppressionXpathRegressionOverloadMethodsDeclarationOrder2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/SuppressionXpathRegressionOverloadMethodsDeclarationOrder2.java
deleted file mode 100644
index 1ec1212cc55..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/overloadmethodsdeclarationorder/SuppressionXpathRegressionOverloadMethodsDeclarationOrder2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.overloadmethodsdeclarationorder;
-
-public class SuppressionXpathRegressionOverloadMethodsDeclarationOrder2 {
-    private SuppressionXpathRegressionOverloadMethodsDeclarationOrder2 anonymous
-            = new MySuppressionXpathRegressionOverloadMethodsDeclarationOrder2();
-
-    public SuppressionXpathRegressionOverloadMethodsDeclarationOrder2 getAnonymous() {
-        return anonymous;
-    }
-
-    public void setAnonymous(SuppressionXpathRegressionOverloadMethodsDeclarationOrder2 anonymous) {
-        this.anonymous = anonymous;
-    }
-
-    private static class MySuppressionXpathRegressionOverloadMethodsDeclarationOrder2
-            extends SuppressionXpathRegressionOverloadMethodsDeclarationOrder2 {
-        public void overloadMethod(int i) {
-            //do stuff
-        }
-
-        public void overloadMethod(String s) {
-            //do more stuff
-        }
-
-        public void separatorMethod() {
-            //do other stuff
-        }
-
-        //violation because overloads shouldn't be separated
-        public void overloadMethod(String s, Boolean b, int i) { //warn
-            //do stuff
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameOne.java
new file mode 100644
index 00000000000..832d8899737
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameOne.java
@@ -0,0 +1,4 @@
+package org.checkstyle.suppressionxpathfilter.packagename; // warn
+
+public class InputXpathPackageNameOne {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameTwo.java
new file mode 100644
index 00000000000..22bf8aa0a12
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/packagename/InputXpathPackageNameTwo.java
@@ -0,0 +1,7 @@
+/* test comment */ package
+        org.checkstyle. // warn
+        suppressionxpathfilter.
+        packagename;
+
+public interface InputXpathPackageNameTwo {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentCtor.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentCtor.java
new file mode 100644
index 00000000000..7e22c64126b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentCtor.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.parameterassignment;
+
+public class InputXpathParameterAssignmentCtor {
+    int field;
+    InputXpathParameterAssignmentCtor(int field) {
+        int i = field;
+        this.field = field;
+        i++;
+        field += 1; // warn
+        this.field++;
+    }
+    // without parameters
+    InputXpathParameterAssignmentCtor() {
+        field = 0;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentLambdas.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentLambdas.java
new file mode 100644
index 00000000000..16c84804a7e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentLambdas.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.parameterassignment;
+
+public class InputXpathParameterAssignmentLambdas {
+
+    public interface SomeInterface {
+        void method(int a);
+    }
+
+    SomeInterface obj1 = q -> q++; // warn
+    void method() {
+        int q = 12;
+        SomeInterface obj = (d) -> {
+            SomeInterface b = (c) -> obj1.equals(this); // ok
+            int c = 12;
+            c++;
+        };
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentMethods.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentMethods.java
new file mode 100644
index 00000000000..ef9132890ca
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameterassignment/InputXpathParameterAssignmentMethods.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.parameterassignment;
+
+public class InputXpathParameterAssignmentMethods {
+    int field;
+    void Test1(int field) {
+        int i = field;
+        this.field = field;
+        i++;
+        field += 1; // warn
+        this.field++;
+    }
+    // without parameters
+    void Test2() {
+        field = 0;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameAccessModifier.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameAccessModifier.java
new file mode 100644
index 00000000000..db8191c9b5e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameAccessModifier.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.parametername;
+
+class InputXpathParameterNameAccessModifier {
+
+    private void method1(int a) { // ok
+    }
+
+    public void method2(int b) { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameDefaultPattern.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameDefaultPattern.java
new file mode 100644
index 00000000000..a992146e5ed
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameDefaultPattern.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.parametername;
+
+class InputXpathParameterNameDefaultPattern {
+
+    void method1(int v_1) { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameDifferentPattern.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameDifferentPattern.java
new file mode 100644
index 00000000000..d53bb33a709
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameDifferentPattern.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.parametername;
+
+class InputXpathParameterNameDifferentPattern {
+
+    void method2(int V2) { // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameIgnoreOverridden.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameIgnoreOverridden.java
new file mode 100644
index 00000000000..9615a078850
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/InputXpathParameterNameIgnoreOverridden.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.parametername;
+
+class InputXpathParameterNameIgnoreOverridden {
+
+    void method2(int V2) { // warn
+    }
+
+    @Override
+    public boolean equals(Object V3) { // ok
+        return true;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameAccessModifier.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameAccessModifier.java
deleted file mode 100644
index 73e3ae929fa..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameAccessModifier.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parametername;
-
-class SuppressionXpathRegressionParameterNameAccessModifier {
-
-    private void method1(int a) { // ok
-    }
-
-    public void method2(int b) { // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameDefaultPattern.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameDefaultPattern.java
deleted file mode 100644
index b4a3d4b3245..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameDefaultPattern.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parametername;
-
-class SuppressionXpathRegressionParameterNameDefaultPattern {
-
-    void method1(int v_1) { // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameDifferentPattern.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameDifferentPattern.java
deleted file mode 100644
index 4e798765568..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameDifferentPattern.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parametername;
-
-class SuppressionXpathRegressionParameterNameDifferentPattern {
-
-    void method2(int V2) { // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameIgnoreOverridden.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameIgnoreOverridden.java
deleted file mode 100644
index b8f3af489b8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parametername/SuppressionXpathRegressionParameterNameIgnoreOverridden.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parametername;
-
-class SuppressionXpathRegressionParameterNameIgnoreOverridden {
-
-    void method2(int V2) { // warn
-    }
-
-    @Override
-    public boolean equals(Object V3) { // ok
-        return true;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberDefault.java
new file mode 100644
index 00000000000..94f790ce682
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberDefault.java
@@ -0,0 +1,15 @@
+package org.checkstyle.suppressionxpathfilter.parameternumber;
+
+public class InputXpathParameterNumberDefault {
+
+    void myMethod(int a, int b, int c, int d, int e, int f, int g, int h, // warn
+                  int i, int j, int k) {
+    }
+
+    public InputXpathParameterNumberDefault() { // ok
+    }
+
+    void myMethod2(int a, int b, int c, int d) { // ok
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberIgnoreAnnotatedBy.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberIgnoreAnnotatedBy.java
new file mode 100644
index 00000000000..b1a43262c49
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberIgnoreAnnotatedBy.java
@@ -0,0 +1,26 @@
+package org.checkstyle.suppressionxpathfilter.parameternumber;
+
+public class InputXpathParameterNumberIgnoreAnnotatedBy {
+    static class InnerClass {
+        static {
+            new Object() {
+                void method() {
+                    if (true) {
+                        new Object() {
+                            @MyAnno
+                            void ignoredMethod(int a, @MyAnno int b, int c) {
+
+                            }
+
+                            void checkedMethod(int a, @MyAnno int b, int c) { // warn
+
+                            }
+                        };
+                    }
+                }
+            };
+        }
+    }
+
+    @interface MyAnno {}
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberIgnoreOverriddenMethods.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberIgnoreOverriddenMethods.java
new file mode 100644
index 00000000000..dc88724641c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberIgnoreOverriddenMethods.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.parameternumber;
+
+public class InputXpathParameterNumberIgnoreOverriddenMethods
+        extends InputXpathParameterNumberDefault {
+
+     public InputXpathParameterNumberIgnoreOverriddenMethods(int a, // warn
+                    int b, int c, int d, int e, int f, int g, int h)
+    {
+    }
+    @Override
+    void myMethod(int a, int b, int c, int d, int e, int f, int g, int h, // ok
+                    int k, int l, int m) {
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberMethods.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberMethods.java
new file mode 100644
index 00000000000..b24fe82a7a7
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parameternumber/InputXpathParameterNumberMethods.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.parameternumber;
+
+public class InputXpathParameterNumberMethods
+        extends InputXpathParameterNumberDefault {
+
+    @Override
+    void myMethod(int a, int b, int c, int d, int e, int f, int g, int h, // warn
+                    int k, int l, int m) {
+    }
+    public InputXpathParameterNumberMethods(int a, int b, int c,  // ok
+                    int d, int e, int f, int g, int h, int k, int l, int m)
+    {
+    }
+    void myMethod3(int a, int b, int c, int d, int e, int f, int g, int h) { // ok
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadLeftFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadLeftFollowed.java
new file mode 100644
index 00000000000..4c8d3478ea4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadLeftFollowed.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.parenpad;
+
+public class InputXpathParenPadLeftFollowed {
+    void method() {
+        if ( false) {//warn
+        }
+        if (true) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadLeftNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadLeftNotFollowed.java
new file mode 100644
index 00000000000..93a41818131
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadLeftNotFollowed.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.parenpad;
+
+public class InputXpathParenPadLeftNotFollowed {
+    void method() {
+        if (false ) {//warn
+        }
+        if ( true ) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadRightNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadRightNotPreceded.java
new file mode 100644
index 00000000000..05a881927e0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadRightNotPreceded.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.parenpad;
+
+public class InputXpathParenPadRightNotPreceded{
+    void method() {
+        if ( false) {//warn
+        }
+        if ( true ) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadRightPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadRightPreceded.java
new file mode 100644
index 00000000000..170fa6a93d0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/InputXpathParenPadRightPreceded.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.parenpad;
+
+public class InputXpathParenPadRightPreceded {
+    void method() {
+        if (false ) {//warn
+        }
+        if (true) {
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadLeftFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadLeftFollowed.java
deleted file mode 100644
index 29d6a7fd958..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadLeftFollowed.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parenpad;
-
-public class SuppressionXpathRegressionParenPadLeftFollowed {
-    void method() {
-        if ( false) {//warn
-        }
-        if (true) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadLeftNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadLeftNotFollowed.java
deleted file mode 100644
index 131d08e9803..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadLeftNotFollowed.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parenpad;
-
-public class SuppressionXpathRegressionParenPadLeftNotFollowed {
-    void method() {
-        if (false ) {//warn
-        }
-        if ( true ) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadRightNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadRightNotPreceded.java
deleted file mode 100644
index 30ac92875da..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadRightNotPreceded.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parenpad;
-
-public class SuppressionXpathRegressionParenPadRightNotPreceded{
-    void method() {
-        if ( false) {//warn
-        }
-        if ( true ) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadRightPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadRightPreceded.java
deleted file mode 100644
index 9d3a6ac5b93..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/parenpad/SuppressionXpathRegressionParenPadRightPreceded.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.parenpad;
-
-public class SuppressionXpathRegressionParenPadRightPreceded {
-    void method() {
-        if (false ) {//warn
-        }
-        if (true) {
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportDuplicate.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportDuplicate.java
new file mode 100644
index 00000000000..9ef530bb56d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportDuplicate.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.redundantimport;
+
+import java.util.Scanner;
+import java.util.Scanner; // warn
+
+public class InputXpathRedundantImportDuplicate {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportInternal.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportInternal.java
new file mode 100644
index 00000000000..c65d4989e6a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportInternal.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.redundantimport;
+
+import org.checkstyle.suppressionxpathfilter.redundantimport.InputXpathRedundantImportInternal; // warn
+
+public class InputXpathRedundantImportInternal {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportLibrary.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportLibrary.java
new file mode 100644
index 00000000000..0f614ca137c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/InputXpathRedundantImportLibrary.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.redundantimport;
+
+import java.lang.String; // warn
+
+public class InputXpathRedundantImportLibrary {
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport1.java
deleted file mode 100644
index 93be31e0b69..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.redundantimport;
-
-import org.checkstyle.suppressionxpathfilter.redundantimport.SuppressionXpathRegressionRedundantImport1; // warn
-
-public class SuppressionXpathRegressionRedundantImport1 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport2.java
deleted file mode 100644
index 9f5d2b69629..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport2.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.redundantimport;
-
-import java.lang.String; // warn
-
-public class SuppressionXpathRegressionRedundantImport2 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport3.java
deleted file mode 100644
index 6438f4286b2..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/redundantimport/SuppressionXpathRegressionRedundantImport3.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.redundantimport;
-
-import java.util.Scanner;
-import java.util.Scanner; // warn
-
-public class SuppressionXpathRegressionRedundantImport3 {
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/InputXpathRequireThisOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/InputXpathRequireThisOne.java
new file mode 100644
index 00000000000..75a22224d7d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/InputXpathRequireThisOne.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.requirethis;
+
+public class InputXpathRequireThisOne {
+    private int age = 23;
+
+    public void changeAge() {
+        age = 24; //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/InputXpathRequireThisTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/InputXpathRequireThisTwo.java
new file mode 100644
index 00000000000..f36c48cd094
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/InputXpathRequireThisTwo.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.requirethis;
+
+public class InputXpathRequireThisTwo {
+    void method1() {
+        int i = 3;
+    }
+
+    void method2(int i) {
+        method1(); //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/SuppressionXpathRegressionRequireThisOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/SuppressionXpathRegressionRequireThisOne.java
deleted file mode 100644
index ffa6fc9542c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/SuppressionXpathRegressionRequireThisOne.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.requirethis;
-
-public class SuppressionXpathRegressionRequireThisOne {
-    private int age = 23;
-
-    public void changeAge() {
-        age = 24; //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/SuppressionXpathRegressionRequireThisTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/SuppressionXpathRegressionRequireThisTwo.java
deleted file mode 100644
index 566a866653f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/requirethis/SuppressionXpathRegressionRequireThisTwo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.requirethis;
-
-public class SuppressionXpathRegressionRequireThisTwo {
-    void method1() {
-        int i = 3;
-    }
-
-    void method2(int i) {
-        method1(); //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountCtor.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountCtor.java
new file mode 100644
index 00000000000..835d5ea3ea2
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountCtor.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.returncount;
+
+public class InputXpathReturnCountCtor {
+    InputXpathReturnCountCtor() { // warn
+        int i = 1;
+        switch(i) {
+        case 1: return;
+        case 2: return;
+        case 3: return;
+        case 4: return;
+        }
+        return;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountLambda.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountLambda.java
new file mode 100644
index 00000000000..172ef597785
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountLambda.java
@@ -0,0 +1,16 @@
+package org.checkstyle.suppressionxpathfilter.returncount;
+
+import java.util.function.Function;
+
+public class InputXpathReturnCountLambda {
+    void testLambda() {
+        Function<Integer, Boolean> a = i -> { // warn
+            switch(i) {
+            case 1: return true;
+            case 2: return true;
+            case 3: return true;
+            }
+            return false;
+        };
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountNonVoid.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountNonVoid.java
new file mode 100644
index 00000000000..c8d1e11e8d4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountNonVoid.java
@@ -0,0 +1,26 @@
+package org.checkstyle.suppressionxpathfilter.returncount;
+
+public class InputXpathReturnCountNonVoid {
+    public boolean equals(Object obj) { // OK
+        int i = 1;
+        switch (i) {
+        case 1: return true;
+        case 2: return true;
+        case 3: return true;
+        case 4: return true;
+        case 5: return true;
+        case 6: return true;
+        }
+        return false;
+    }
+    boolean testNonVoid() { // warn
+        int i = 1;
+        switch(i) {
+        case 1: return true;
+        case 2: return true;
+        case 3: return true;
+        }
+        return false;
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountVoid.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountVoid.java
new file mode 100644
index 00000000000..f0943f70294
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/InputXpathReturnCountVoid.java
@@ -0,0 +1,26 @@
+package org.checkstyle.suppressionxpathfilter.returncount;
+
+class InputXpathReturnCountVoid {
+    public boolean equals(Object obj) { // OK
+        int i = 1;
+        switch (i) {
+        case 1: return true;
+        case 2: return true;
+        case 3: return true;
+        case 4: return true;
+        case 5: return true;
+        case 6: return true;
+        }
+        return false;
+    }
+    void testVoid() { // warn
+        int i = 1;
+        switch(i) {
+        case 1: return;
+        case 2: return;
+        case 3: return;
+        case 4: return;
+        }
+        return;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount1.java
deleted file mode 100644
index b63032dfd91..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.returncount;
-
-class SuppressionXpathRegressionReturnCount1 {
-    public boolean equals(Object obj) { // OK
-        int i = 1;
-        switch (i) {
-        case 1: return true;
-        case 2: return true;
-        case 3: return true;
-        case 4: return true;
-        case 5: return true;
-        case 6: return true;
-        }
-        return false;
-    }
-    void testVoid() { // warn
-        int i = 1;
-        switch(i) {
-        case 1: return;
-        case 2: return;
-        case 3: return;
-        case 4: return;
-        }
-        return;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount2.java
deleted file mode 100644
index 82def249827..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.returncount;
-
-public class SuppressionXpathRegressionReturnCount2 {
-    public boolean equals(Object obj) { // OK
-        int i = 1;
-        switch (i) {
-        case 1: return true;
-        case 2: return true;
-        case 3: return true;
-        case 4: return true;
-        case 5: return true;
-        case 6: return true;
-        }
-        return false;
-    }
-    boolean testNonVoid() { // warn
-        int i = 1;
-        switch(i) {
-        case 1: return true;
-        case 2: return true;
-        case 3: return true;
-        }
-        return false;
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount3.java
deleted file mode 100644
index 73b4266b57a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount3.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.returncount;
-
-public class SuppressionXpathRegressionReturnCount3 {
-    SuppressionXpathRegressionReturnCount3() { // warn
-        int i = 1;
-        switch(i) {
-        case 1: return;
-        case 2: return;
-        case 3: return;
-        case 4: return;
-        }
-        return;
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount4.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount4.java
deleted file mode 100644
index 30862025ac1..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/returncount/SuppressionXpathRegressionReturnCount4.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.returncount;
-
-import java.util.function.Function;
-
-public class SuppressionXpathRegressionReturnCount4 {
-    void testLambda() {
-        Function<Integer, Boolean> a = i -> { // warn
-            switch(i) {
-            case 1: return true;
-            case 2: return true;
-            case 3: return true;
-            }
-            return false;
-        };
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyFour.java
new file mode 100644
index 00000000000..6886432c9c5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyFour.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.rightcurly;
+
+public class InputXpathRightCurlyFour {
+    public void sample(boolean flag) {
+        if (flag) {
+            System.identityHashCode("heh");
+            flag = !flag; } String.CASE_INSENSITIVE_ORDER. //warn
+                equals("Xe-xe");
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyOne.java
new file mode 100644
index 00000000000..891b452842c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyOne.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.rightcurly;
+
+public class InputXpathRightCurlyOne {
+    public void test(int x) {
+        if (x > 0)
+        {
+            return;
+        } //warn
+        else if (x < 0) {
+            ;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyThree.java
new file mode 100644
index 00000000000..5a115e34702
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyThree.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.rightcurly;
+
+public class InputXpathRightCurlyThree {
+    public void sample(boolean flag) {
+        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyTwo.java
new file mode 100644
index 00000000000..c8169acfea1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/InputXpathRightCurlyTwo.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.rightcurly;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+
+public class InputXpathRightCurlyTwo {
+    public void fooMethod() throws IOException {
+        try (BufferedReader br1 = new BufferedReader(null)) {
+            ; } //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyFour.java
deleted file mode 100644
index 68fd53d5e2f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyFour.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.rightcurly;
-
-public class SuppressionXpathRegressionRightCurlyFour {
-    public void sample(boolean flag) {
-        if (flag) {
-            System.identityHashCode("heh");
-            flag = !flag; } String.CASE_INSENSITIVE_ORDER. //warn
-                equals("Xe-xe");
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyOne.java
deleted file mode 100644
index 05cda1281cd..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyOne.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.rightcurly;
-
-public class SuppressionXpathRegressionRightCurlyOne {
-    public void test(int x) {
-        if (x > 0)
-        {
-            return;
-        } //warn
-        else if (x < 0) {
-            ;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyThree.java
deleted file mode 100644
index d034b07e05c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyThree.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.rightcurly;
-
-public class SuppressionXpathRegressionRightCurlyThree {
-    public void sample(boolean flag) {
-        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyTwo.java
deleted file mode 100644
index 0ae0cfa5cc2..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/rightcurly/SuppressionXpathRegressionRightCurlyTwo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.rightcurly;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-
-public class SuppressionXpathRegressionRightCurlyTwo {
-    public void fooMethod() throws IOException {
-        try (BufferedReader br1 = new BufferedReader(null)) {
-            ; } //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionAnonymous.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionAnonymous.java
new file mode 100644
index 00000000000..09c0683c3c8
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionAnonymous.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.simplifybooleanexpression;
+
+public class InputXpathSimplifyBooleanExpressionAnonymous {
+
+    class Inner{
+        boolean a,b,c,d;
+        void test(){
+            if (a == true) {}; // warn
+            boolean e = e = (a && b) ? c : d; // ok
+             if (a == b) {}; // ok
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionInterface.java
new file mode 100644
index 00000000000..c84f4f96126
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionInterface.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.simplifybooleanexpression;
+
+public class InputXpathSimplifyBooleanExpressionInterface {
+    interface Inner {
+        default void test() {
+           boolean a = false, b = false, c = false, d = false;
+           if (!(b != true)) {}; // warn
+           boolean e = e = (a && b) ? c : d; // ok
+           if (a == b) {}; // ok
+
+       }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionSimple.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionSimple.java
new file mode 100644
index 00000000000..2423915e215
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanexpression/InputXpathSimplifyBooleanExpressionSimple.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.simplifybooleanexpression;
+
+public class InputXpathSimplifyBooleanExpressionSimple {
+    private Object c,d,e;
+    boolean a,b;
+    public void test(){
+        boolean f = c == null ? false : c.equals(d); // ok
+        if (!false) {} // warn
+        e = (a && b) ? c : d; // ok
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/InputXpathSimplifyBooleanReturnIfBooleanEqualsBoolean.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/InputXpathSimplifyBooleanReturnIfBooleanEqualsBoolean.java
new file mode 100644
index 00000000000..242bd654086
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/InputXpathSimplifyBooleanReturnIfBooleanEqualsBoolean.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.simplifybooleanreturn;
+
+public class InputXpathSimplifyBooleanReturnIfBooleanEqualsBoolean {
+    public static boolean toTest() {
+        boolean even = false;
+        if (even == true) { // warn
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/InputXpathSimplifyBooleanReturnIfBooleanReturnBoolean.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/InputXpathSimplifyBooleanReturnIfBooleanReturnBoolean.java
new file mode 100644
index 00000000000..d4bade16433
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/InputXpathSimplifyBooleanReturnIfBooleanReturnBoolean.java
@@ -0,0 +1,19 @@
+package org.checkstyle.suppressionxpathfilter.simplifybooleanreturn;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class InputXpathSimplifyBooleanReturnIfBooleanReturnBoolean {
+    public static void toTest() {
+        ArrayList<Boolean> boolList
+            = new ArrayList<Boolean>(Arrays.asList(false, true, false, false));
+        boolList.stream().filter(statement -> {
+            if (!statement) { // warn
+                return true;
+            }
+            else {
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanEqualsBoolean.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanEqualsBoolean.java
deleted file mode 100644
index a154459a2b9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanEqualsBoolean.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.simplifybooleanreturn;
-
-public class SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanEqualsBoolean {
-    public static boolean toTest() {
-        boolean even = false;
-        if (even == true) { // warn
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanReturnBoolean.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanReturnBoolean.java
deleted file mode 100644
index cd7e74f066e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/simplifybooleanreturn/SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanReturnBoolean.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.simplifybooleanreturn;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public class SuppressionXpathRegressionSimplifyBooleanReturnIfBooleanReturnBoolean {
-    public static void toTest() {
-        ArrayList<Boolean> boolList
-            = new ArrayList<Boolean>(Arrays.asList(false, true, false, false));
-        boolList.stream().filter(statement -> {
-            if (!statement) { // warn
-                return true;
-            }
-            else {
-                return false;
-            }
-        });
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/InputXpathSingleSpaceSeparator.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/InputXpathSingleSpaceSeparator.java
new file mode 100644
index 00000000000..4bab7813d5c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/InputXpathSingleSpaceSeparator.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.singlespaceseparator;
+
+public class InputXpathSingleSpaceSeparator {
+    long  bad;//warn
+    long good;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/InputXpathSingleSpaceSeparatorValidateComments.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/InputXpathSingleSpaceSeparatorValidateComments.java
new file mode 100644
index 00000000000..9f2404be9c8
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/InputXpathSingleSpaceSeparatorValidateComments.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.singlespaceseparator;
+
+public class InputXpathSingleSpaceSeparatorValidateComments {
+    long y;     // an invalid comment // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/SuppressionXpathRegressionSingleSpaceSeparator.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/SuppressionXpathRegressionSingleSpaceSeparator.java
deleted file mode 100644
index 8003b653c48..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/SuppressionXpathRegressionSingleSpaceSeparator.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.singlespaceseparator;
-
-public class SuppressionXpathRegressionSingleSpaceSeparator {
-    long  bad;//warn
-    long good;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/SuppressionXpathRegressionSingleSpaceSeparatorValidateComments.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/SuppressionXpathRegressionSingleSpaceSeparatorValidateComments.java
deleted file mode 100644
index 8877f640736..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/singlespaceseparator/SuppressionXpathRegressionSingleSpaceSeparatorValidateComments.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.singlespaceseparator;
-
-public class SuppressionXpathRegressionSingleSpaceSeparatorValidateComments {
-    long y;     // an invalid comment // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableName.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableName.java
new file mode 100644
index 00000000000..051aaf1239c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/staticvariablename/InputXpathStaticVariableName.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.staticvariablename;
+
+public class InputXpathStaticVariableName {
+
+     public int num1; // OK
+     public static int NUM2; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityExp.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityExp.java
new file mode 100644
index 00000000000..20c7ba6433a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityExp.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.stringliteralequality;
+
+public class InputXpathStringLiteralEqualityExp {
+    public void myFunction(){
+        String foo = "pending";
+        boolean flag = (foo == "done"); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityFalse.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityFalse.java
new file mode 100644
index 00000000000..c0991262cf0
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityFalse.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.stringliteralequality;
+
+public class InputXpathStringLiteralEqualityFalse {
+    public void myFunction(){
+        String foo = "pending";
+        while (foo != "done") {} // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityTrue.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityTrue.java
new file mode 100644
index 00000000000..4ae1574134d
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/InputXpathStringLiteralEqualityTrue.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.stringliteralequality;
+
+public class InputXpathStringLiteralEqualityTrue {
+    public void myFunction(){
+        String foo = "pending";
+        if (foo == "done") {} // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality.java
deleted file mode 100644
index 782999ba68f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.stringliteralequality;
-
-public class SuppressionXpathRegressionStringLiteralEquality {
-    public void myFunction(){
-        String foo = "pending";
-        if (foo == "done") {} // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality1.java
deleted file mode 100644
index a85e4bbc369..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.stringliteralequality;
-
-public class SuppressionXpathRegressionStringLiteralEquality1 {
-    public void myFunction(){
-        String foo = "pending";
-        while (foo != "done") {} // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality2.java
deleted file mode 100644
index 8b23c9208cf..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/stringliteralequality/SuppressionXpathRegressionStringLiteralEquality2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.stringliteralequality;
-
-public class SuppressionXpathRegressionStringLiteralEquality2 {
-    public void myFunction(){
-        String foo = "pending";
-        boolean flag = (foo == "done"); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperCloneInnerClone.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperCloneInnerClone.java
new file mode 100644
index 00000000000..1c316ded608
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperCloneInnerClone.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.superclone;
+
+public class InputXpathSuperCloneInnerClone {
+    class InnerClone
+    {
+        public Object clone() // warn
+        {
+            class Inner
+            {
+                public Object clone() throws CloneNotSupportedException
+                {
+                    return super.clone();
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperCloneNoSuperClone.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperCloneNoSuperClone.java
new file mode 100644
index 00000000000..005a070c4ce
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperCloneNoSuperClone.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.superclone;
+
+public class InputXpathSuperCloneNoSuperClone {
+    class NoSuperClone
+    {
+        public Object clone() // warn
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperClonePlainAndSubclasses.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperClonePlainAndSubclasses.java
new file mode 100644
index 00000000000..87a63338f4c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/superclone/InputXpathSuperClonePlainAndSubclasses.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.superclone;
+
+class InputXpathSuperClonePlainAndSubclasses {
+    public Object clone() { // warn
+        return null;
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountCustomMax.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountCustomMax.java
new file mode 100644
index 00000000000..d7d81bd8fac
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountCustomMax.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.throwscount;
+
+interface InputXpathThrowsCountCustomMax {
+    public void myFunction() throws IllegalStateException, // warn, max allowed is 2
+            ArrayIndexOutOfBoundsException,
+            NullPointerException;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountDefault.java
new file mode 100644
index 00000000000..7f8949a0518
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountDefault.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.throwscount;
+
+public class InputXpathThrowsCountDefault {
+    public void myFunction() throws CloneNotSupportedException,  // warn, max allowed is 4
+            ArrayIndexOutOfBoundsException,
+            StringIndexOutOfBoundsException,
+            IllegalStateException,
+            NullPointerException {
+        //body
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountPrivateMethods.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountPrivateMethods.java
new file mode 100644
index 00000000000..b266237d771
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/InputXpathThrowsCountPrivateMethods.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.throwscount;
+
+public class InputXpathThrowsCountPrivateMethods {
+    interface myClass{
+        //body
+    }
+    public void myFunc() {
+        myClass foo = new myClass() {
+            private void privateFunc() throws CloneNotSupportedException, // warn, max allowed is 4
+                    ClassNotFoundException,
+                    IllegalAccessException,
+                    ArithmeticException,
+                    ClassCastException {
+                // body
+            }
+        };
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount1.java
deleted file mode 100644
index 316544842fa..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.throwscount;
-
-public class SuppressionXpathRegressionThrowsCount1 {
-    public void myFunction() throws CloneNotSupportedException,  // warn, max allowed is 4
-            ArrayIndexOutOfBoundsException,
-            StringIndexOutOfBoundsException,
-            IllegalStateException,
-            NullPointerException {
-        //body
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount2.java
deleted file mode 100644
index e7432e43514..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount2.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.throwscount;
-
-interface SuppressionXpathRegressionThrowsCount2 {
-    public void myFunction() throws IllegalStateException, // warn, max allowed is 2
-            ArrayIndexOutOfBoundsException,
-            NullPointerException;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount3.java
deleted file mode 100644
index 37c9b74d263..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/throwscount/SuppressionXpathRegressionThrowsCount3.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.throwscount;
-
-public class SuppressionXpathRegressionThrowsCount3 {
-    interface myClass{
-        //body
-    }
-    public void myFunc() {
-        myClass foo = new myClass() {
-            private void privateFunc() throws CloneNotSupportedException, // warn, max allowed is 4
-                    ClassNotFoundException,
-                    IllegalAccessException,
-                    ArithmeticException,
-                    ClassCastException {
-                // body
-            }
-        };
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/InputXpathTodoCommentBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/InputXpathTodoCommentBlock.java
new file mode 100644
index 00000000000..b064916a38f
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/InputXpathTodoCommentBlock.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.todocomment;
+
+public class InputXpathTodoCommentBlock {
+    /* // warn
+     * FIXME:
+     * TODO
+     */
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/InputXpathTodoCommentSingleLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/InputXpathTodoCommentSingleLine.java
new file mode 100644
index 00000000000..f2e63c0ee49
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/InputXpathTodoCommentSingleLine.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.todocomment;
+
+public class InputXpathTodoCommentSingleLine {
+    // warn FIXME:
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/SuppressionXpathRegressionTodoCommentOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/SuppressionXpathRegressionTodoCommentOne.java
deleted file mode 100644
index 76595bc80df..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/SuppressionXpathRegressionTodoCommentOne.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.todocomment;
-
-public class SuppressionXpathRegressionTodoCommentOne {
-    // warn FIXME:
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/SuppressionXpathRegressionTodoCommentTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/SuppressionXpathRegressionTodoCommentTwo.java
deleted file mode 100644
index 23e883ebade..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/todocomment/SuppressionXpathRegressionTodoCommentTwo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.todocomment;
-
-public class SuppressionXpathRegressionTodoCommentTwo {
-    /* // warn
-     * FIXME:
-     * TODO
-     */
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/InputXpathTrailingCommentBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/InputXpathTrailingCommentBlock.java
new file mode 100644
index 00000000000..9576d9f2a05
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/InputXpathTrailingCommentBlock.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.trailingcomment;
+
+public class InputXpathTrailingCommentBlock {
+    int j; /* bad c-style comment. */  // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/InputXpathTrailingCommentSingleLine.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/InputXpathTrailingCommentSingleLine.java
new file mode 100644
index 00000000000..b28316a8e63
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/InputXpathTrailingCommentSingleLine.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.trailingcomment;
+
+public class InputXpathTrailingCommentSingleLine {
+    int i; // don't use trailing comments :) // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/SuppressionXpathRegressionTrailingComment1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/SuppressionXpathRegressionTrailingComment1.java
deleted file mode 100644
index 503f40d9a7d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/SuppressionXpathRegressionTrailingComment1.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.trailingcomment;
-
-public class SuppressionXpathRegressionTrailingComment1 {
-    int i; // don't use trailing comments :) // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/SuppressionXpathRegressionTrailingComment2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/SuppressionXpathRegressionTrailingComment2.java
deleted file mode 100644
index cb5e9548557..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/trailingcomment/SuppressionXpathRegressionTrailingComment2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.trailingcomment;
-
-public class SuppressionXpathRegressionTrailingComment2 {
-    int j; /* bad c-style comment. */  // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadLeftFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadLeftFollowed.java
new file mode 100644
index 00000000000..9b3ef63130b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadLeftFollowed.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.typecastparenpad;
+
+public class InputXpathTypecastParenPadLeftFollowed {
+    Object bad = ( Object)null;//warn
+    Object good = (Object)null;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadLeftNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadLeftNotFollowed.java
new file mode 100644
index 00000000000..1065c5fbded
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadLeftNotFollowed.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.typecastparenpad;
+
+public class InputXpathTypecastParenPadLeftNotFollowed {
+    Object bad = (Object )null;//warn
+    Object good = ( Object )null;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadRightNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadRightNotPreceded.java
new file mode 100644
index 00000000000..bf88cf3a446
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadRightNotPreceded.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.typecastparenpad;
+
+public class InputXpathTypecastParenPadRightNotPreceded{
+    Object bad = ( Object)null;//warn
+    Object good = ( Object )null;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadRightPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadRightPreceded.java
new file mode 100644
index 00000000000..70da3a8f155
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/InputXpathTypecastParenPadRightPreceded.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.typecastparenpad;
+
+public class InputXpathTypecastParenPadRightPreceded {
+    Object bad = (Object )null;//warn
+    Object good = (Object)null;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadLeftFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadLeftFollowed.java
deleted file mode 100644
index 8f5b559342f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadLeftFollowed.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.typecastparenpad;
-
-public class SuppressionXpathRegressionTypecastParenPadLeftFollowed {
-    Object bad = ( Object)null;//warn
-    Object good = (Object)null;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadLeftNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadLeftNotFollowed.java
deleted file mode 100644
index eabf3524dc2..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadLeftNotFollowed.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.typecastparenpad;
-
-public class SuppressionXpathRegressionTypecastParenPadLeftNotFollowed {
-    Object bad = (Object )null;//warn
-    Object good = ( Object )null;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadRightNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadRightNotPreceded.java
deleted file mode 100644
index ac755e4a69d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadRightNotPreceded.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.typecastparenpad;
-
-public class SuppressionXpathRegressionTypecastParenPadRightNotPreceded{
-    Object bad = ( Object)null;//warn
-    Object good = ( Object )null;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadRightPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadRightPreceded.java
deleted file mode 100644
index 9b79e9849d7..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/typecastparenpad/SuppressionXpathRegressionTypecastParenPadRightPreceded.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.typecastparenpad;
-
-public class SuppressionXpathRegressionTypecastParenPadRightPreceded {
-    Object bad = (Object )null;//warn
-    Object good = (Object)null;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/InputXpathTypeNameDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/InputXpathTypeNameDefault.java
new file mode 100644
index 00000000000..b91721ea890
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/InputXpathTypeNameDefault.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.typename;
+
+public class InputXpathTypeNameDefault {
+    public interface FirstName {} // OK
+    private class SecondName_ {} // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/InputXpathTypeNameInterfaceDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/InputXpathTypeNameInterfaceDef.java
new file mode 100644
index 00000000000..3228dc0e723
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/InputXpathTypeNameInterfaceDef.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.typename;
+
+public class InputXpathTypeNameInterfaceDef {
+
+    public interface I_firstName {} // OK
+    interface SecondName {} // warn
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/SuppressionXpathRegressionTypeName1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/SuppressionXpathRegressionTypeName1.java
deleted file mode 100644
index a896931d5bb..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/SuppressionXpathRegressionTypeName1.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.typename;
-
-public class SuppressionXpathRegressionTypeName1 {
-    public interface FirstName {} // OK
-    private class SecondName_ {} // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/SuppressionXpathRegressionTypeName2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/SuppressionXpathRegressionTypeName2.java
deleted file mode 100644
index 3bd0bebfdca..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/typename/SuppressionXpathRegressionTypeName2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.typename;
-
-public class SuppressionXpathRegressionTypeName2 {
-
-    public interface I_firstName {} // OK
-    interface SecondName {} // warn
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/InputXpathUncommentedMainDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/InputXpathUncommentedMainDefault.java
new file mode 100644
index 00000000000..8e9fcc53599
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/InputXpathUncommentedMainDefault.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.uncommentedmain;
+
+public class InputXpathUncommentedMainDefault {
+    public static void main(String... args) {} // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/InputXpathUncommentedMainInStaticClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/InputXpathUncommentedMainInStaticClass.java
new file mode 100644
index 00000000000..474cd87a17b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/InputXpathUncommentedMainInStaticClass.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.uncommentedmain;
+
+public class InputXpathUncommentedMainInStaticClass {
+    public static class Launcher {
+        public static void main(String[] args) {} // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/SuppressionXpathRegressionUncommentedMain.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/SuppressionXpathRegressionUncommentedMain.java
deleted file mode 100644
index 3af568f424d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/SuppressionXpathRegressionUncommentedMain.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.uncommentedmain;
-
-public class SuppressionXpathRegressionUncommentedMain {
-    public static void main(String... args) {} // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/SuppressionXpathRegressionUncommentedMainTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/SuppressionXpathRegressionUncommentedMainTwo.java
deleted file mode 100644
index 4e2753e69fd..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/uncommentedmain/SuppressionXpathRegressionUncommentedMainTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.uncommentedmain;
-
-public class SuppressionXpathRegressionUncommentedMainTwo {
-    public static class Launcher {
-        public static void main(String[] args) {} // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesClassFields.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesClassFields.java
new file mode 100644
index 00000000000..d56c7c3d087
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesClassFields.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesClassFields {
+    int a = (2*2); // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesConditionals.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesConditionals.java
new file mode 100644
index 00000000000..5f5aa4cb3d8
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesConditionals.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesConditionals {
+    void foo(String a) {
+        if (('A' == a.charAt(0))) { // warn
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesExprWithMethodParam.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesExprWithMethodParam.java
new file mode 100644
index 00000000000..3b3f1b57f3e
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesExprWithMethodParam.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesExprWithMethodParam {
+    void foo(int a, int b) {
+        int c = (a*b); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesLambdas.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesLambdas.java
new file mode 100644
index 00000000000..0b1d71812e5
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesLambdas.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesLambdas {
+    public interface Predicate {
+        boolean test(Integer t);
+    }
+    Predicate predicate = (value) -> value != null; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesLocalVariables.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesLocalVariables.java
new file mode 100644
index 00000000000..a697f7859ed
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesLocalVariables.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesLocalVariables {
+    void foo (int a) {
+        int b = (a) + 5; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesMethodDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesMethodDef.java
new file mode 100644
index 00000000000..b1ab0dda609
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesMethodDef.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesMethodDef {
+    void foo () {
+        int a = (10) + 5; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesReturnExpr.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesReturnExpr.java
new file mode 100644
index 00000000000..02d1065b427
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesReturnExpr.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesReturnExpr {
+    int foo (int a) {
+        return (a+6); // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesStringLiteral.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesStringLiteral.java
new file mode 100644
index 00000000000..6ae7d1bc394
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/InputXpathUnnecessaryParenthesesStringLiteral.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
+
+public class InputXpathUnnecessaryParenthesesStringLiteral {
+    void foo () {
+        String str = ("Checkstyle") + "is cool"; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses1.java
deleted file mode 100644
index 020ecf74faf..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses1.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses1 {
-    int a = (2*2); // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses2.java
deleted file mode 100644
index 880e0a8327a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses2 {
-    void foo(String a) {
-        if (('A' == a.charAt(0))) { // warn
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses3.java
deleted file mode 100644
index b43a3527003..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses3.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses3 {
-    public interface Predicate {
-        boolean test(Integer t);
-    }
-    Predicate predicate = (value) -> value != null; // warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses4.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses4.java
deleted file mode 100644
index 41a24f71355..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses4.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses4 {
-    void foo (int a) {
-        int b = (a) + 5; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses5.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses5.java
deleted file mode 100644
index a7e15795ac8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses5.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses5 {
-    void foo () {
-        String str = ("Checkstyle") + "is cool"; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses6.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses6.java
deleted file mode 100644
index 66b7ace1ad0..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses6.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses6 {
-    void foo () {
-        int a = (10) + 5; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses7.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses7.java
deleted file mode 100644
index 47c89097457..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses7.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses7 {
-    int foo (int a) {
-        return (a+6); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses8.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses8.java
deleted file mode 100644
index 5fe695b46c2..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessaryparentheses/SuppressionXpathRegressionUnnecessaryParentheses8.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessaryparentheses;
-
-public class SuppressionXpathRegressionUnnecessaryParentheses8 {
-    void foo(int a, int b) {
-        int c = (a*b); // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes.java
new file mode 100644
index 00000000000..1e0fd4ab329
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes.java
@@ -0,0 +1,25 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonafteroutertypedeclaration;
+
+interface InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes {
+
+    class Inner1 {
+
+    }; // OK
+
+    enum Inner2 {
+
+    }; // OK
+
+    interface Inner3 {
+
+    }; // OK
+
+    @interface Inner4 {
+
+    }; // OK
+
+}; //warn
+
+class NoSemicolonAfter {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationSimple.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationSimple.java
new file mode 100644
index 00000000000..dd9916aa027
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationSimple.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonafteroutertypedeclaration;
+
+public class InputXpathUnnecessarySemicolonAfterOuterTypeDeclarationSimple {
+
+}; //warn
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclaration.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclaration.java
deleted file mode 100644
index d555ec085db..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclaration.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonafteroutertypedeclaration;
-
-public class SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclaration {
-
-}; //warn
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes.java
deleted file mode 100644
index cb9d19fff91..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonafteroutertypedeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonafteroutertypedeclaration;
-
-interface SuppressionXpathRegressionUnnecessarySemicolonAfterOuterTypeDeclarationInnerTypes {
-
-    class Inner1 {
-
-    }; // OK
-
-    enum Inner2 {
-
-    }; // OK
-
-    interface Inner3 {
-
-    }; // OK
-
-    @interface Inner4 {
-
-    }; // OK
-
-}; //warn
-
-class NoSemicolonAfter {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationDefault.java
new file mode 100644
index 00000000000..edba6c7c011
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationDefault.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonaftertypememberdeclaration;
+
+public class InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationDefault {
+    void method(){}; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationTokens.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationTokens.java
new file mode 100644
index 00000000000..665750cc4b4
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationTokens.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonaftertypememberdeclaration;
+
+public class InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationTokens {
+    void method() {}; //warn
+    public InputXpathUnnecessarySemicolonAfterTypeMemberDeclarationTokens() {};
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclaration.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclaration.java
deleted file mode 100644
index 78e8f455f7a..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclaration.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonaftertypememberdeclaration;
-
-public class SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclaration {
-    void method(){}; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTokens.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTokens.java
deleted file mode 100644
index 07f29b0f273..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonaftertypememberdeclaration/SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTokens.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonaftertypememberdeclaration;
-
-public class SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTokens {
-    void method() {}; //warn
-    public SuppressionXpathRegressionUnnecessarySemicolonAfterTypeMemberDeclarationTokens() {};
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/InputXpathUnnecessarySemicolonInEnumerationAll.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/InputXpathUnnecessarySemicolonInEnumerationAll.java
new file mode 100644
index 00000000000..122e520fc48
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/InputXpathUnnecessarySemicolonInEnumerationAll.java
@@ -0,0 +1,5 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicoloninenumeration;
+
+enum InputXpathUnnecessarySemicolonInEnumerationAll {
+    A,B(){ public String toString() { return "";}},; /** warn */
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/InputXpathUnnecessarySemicolonInEnumerationSimple.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/InputXpathUnnecessarySemicolonInEnumerationSimple.java
new file mode 100644
index 00000000000..fe8e2d4e705
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/InputXpathUnnecessarySemicolonInEnumerationSimple.java
@@ -0,0 +1,12 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicoloninenumeration;
+
+public class InputXpathUnnecessarySemicolonInEnumerationSimple {
+}
+
+enum Good {
+    One, Two
+}
+
+enum Bad {
+    Third; //warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/SuppressionXpathRegressionUnnecessarySemicolonInEnumeration.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/SuppressionXpathRegressionUnnecessarySemicolonInEnumeration.java
deleted file mode 100644
index 1a2c3a146c5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/SuppressionXpathRegressionUnnecessarySemicolonInEnumeration.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicoloninenumeration;
-
-public class SuppressionXpathRegressionUnnecessarySemicolonInEnumeration {
-}
-
-enum Good {
-    One, Two
-}
-
-enum Bad {
-    Third; //warn
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/SuppressionXpathRegressionUnnecessarySemicolonInEnumerationAll.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/SuppressionXpathRegressionUnnecessarySemicolonInEnumerationAll.java
deleted file mode 100644
index 2d4e6ec23a9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicoloninenumeration/SuppressionXpathRegressionUnnecessarySemicolonInEnumerationAll.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicoloninenumeration;
-
-enum SuppressionXpathRegressionUnnecessarySemicolonInEnumerationAll {
-    A,B(){ public String toString() { return "";}},; /** warn */
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/InputXpathUnnecessarySemicolonInTryWithResourcesDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/InputXpathUnnecessarySemicolonInTryWithResourcesDefault.java
new file mode 100644
index 00000000000..fb6508eb764
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/InputXpathUnnecessarySemicolonInTryWithResourcesDefault.java
@@ -0,0 +1,14 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonintrywithresources;
+
+import java.io.PipedReader;
+import java.io.Reader;
+
+public class InputXpathUnnecessarySemicolonInTryWithResourcesDefault {
+    void m() throws Exception {
+        try(Reader good = new PipedReader()){}
+        try(Reader good = new PipedReader();Reader better = new PipedReader()){}
+
+        try(Reader bad = new PipedReader();Reader worse = new PipedReader();){} //warn
+
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/InputXpathUnnecessarySemicolonInTryWithResourcesNoBrace.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/InputXpathUnnecessarySemicolonInTryWithResourcesNoBrace.java
new file mode 100644
index 00000000000..fbd2177d9b1
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/InputXpathUnnecessarySemicolonInTryWithResourcesNoBrace.java
@@ -0,0 +1,10 @@
+package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonintrywithresources;
+
+import java.io.PipedReader;
+import java.io.Reader;
+
+public class InputXpathUnnecessarySemicolonInTryWithResourcesNoBrace {
+    void test() throws Exception {
+        try(Reader good = new PipedReader();){} // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/SuppressionXpathRegressionUnnecessarySemicolonInTryWithResources.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/SuppressionXpathRegressionUnnecessarySemicolonInTryWithResources.java
deleted file mode 100644
index 7b3f9a70eb4..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/SuppressionXpathRegressionUnnecessarySemicolonInTryWithResources.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonintrywithresources;
-
-import java.io.PipedReader;
-import java.io.Reader;
-
-public class SuppressionXpathRegressionUnnecessarySemicolonInTryWithResources {
-    void m() throws Exception {
-        try(Reader good = new PipedReader()){}
-        try(Reader good = new PipedReader();Reader better = new PipedReader()){}
-
-        try(Reader bad = new PipedReader();){} //warn
-        try(Reader bad = new PipedReader();Reader worse = new PipedReader();){} //warn
-
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/SuppressionXpathRegressionUnnecessarySemicolonInTryWithResourcesNoBrace.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/SuppressionXpathRegressionUnnecessarySemicolonInTryWithResourcesNoBrace.java
deleted file mode 100644
index aa1bbd0715c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unnecessarysemicolonintrywithresources/SuppressionXpathRegressionUnnecessarySemicolonInTryWithResourcesNoBrace.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unnecessarysemicolonintrywithresources;
-
-import java.io.PipedReader;
-import java.io.Reader;
-
-public class SuppressionXpathRegressionUnnecessarySemicolonInTryWithResourcesNoBrace {
-    void test() throws Exception {
-        try(Reader good = new PipedReader();){} // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/InputXpathUnusedImports.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/InputXpathUnusedImports.java
new file mode 100644
index 00000000000..f8a90849c08
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/InputXpathUnusedImports.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.unusedimports;
+
+import java.util.List; // warn
+
+public class InputXpathUnusedImports {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/InputXpathUnusedImportsStatic.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/InputXpathUnusedImportsStatic.java
new file mode 100644
index 00000000000..8924e008c49
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/InputXpathUnusedImportsStatic.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.unusedimports;
+
+import static java.util.Map.Entry; // warn
+
+public class InputXpathUnusedImportsStatic {
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/SuppressionXpathRegressionUnusedImportsOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/SuppressionXpathRegressionUnusedImportsOne.java
deleted file mode 100644
index 3c8000bc75d..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/SuppressionXpathRegressionUnusedImportsOne.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unusedimports;
-
-import java.util.List; // warn
-
-public class SuppressionXpathRegressionUnusedImportsOne {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/SuppressionXpathRegressionUnusedImportsTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/SuppressionXpathRegressionUnusedImportsTwo.java
deleted file mode 100644
index bb0db0178f9..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedimports/SuppressionXpathRegressionUnusedImportsTwo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unusedimports;
-
-import static java.util.Map.Entry; // warn
-
-public class SuppressionXpathRegressionUnusedImportsTwo {
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/InputXpathUnusedLocalVariableOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/InputXpathUnusedLocalVariableOne.java
new file mode 100644
index 00000000000..43fd14d3e67
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/InputXpathUnusedLocalVariableOne.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.unusedlocalvariable;
+
+public class InputXpathUnusedLocalVariableOne {
+
+    public void foo() {
+        int a = 20; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/InputXpathUnusedLocalVariableTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/InputXpathUnusedLocalVariableTwo.java
new file mode 100644
index 00000000000..fa0821eba3c
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/InputXpathUnusedLocalVariableTwo.java
@@ -0,0 +1,17 @@
+package org.checkstyle.suppressionxpathfilter.unusedlocalvariable;
+
+import java.util.function.Predicate;
+
+public class InputXpathUnusedLocalVariableTwo {
+
+    int b = 21;
+
+    void foo() {
+        int b = 12; // warn
+        a(this.b);
+    }
+
+    static void a(int a) {
+    }
+
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableOne.java
deleted file mode 100644
index d302a9b1234..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableOne.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unusedlocalvariable;
-
-public class SuppressionXpathRegressionUnusedLocalVariableOne {
-
-    public void foo() {
-        int a = 20; // warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableTwo.java
deleted file mode 100644
index 94fde4787c1..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/unusedlocalvariable/SuppressionXpathRegressionUnusedLocalVariableTwo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.unusedlocalvariable;
-
-import java.util.function.Predicate;
-
-public class SuppressionXpathRegressionUnusedLocalVariableTwo {
-
-    int b = 21;
-
-    void foo() {
-        int b = 12; // warn
-        a(this.b);
-    }
-
-    static void a(int a) {
-    }
-
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/InputXpathUpperEllOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/InputXpathUpperEllOne.java
new file mode 100644
index 00000000000..7782be8b63a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/InputXpathUpperEllOne.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.upperell;
+
+public class InputXpathUpperEllOne {
+    long bad = 0l;//warn
+    long good = 0L;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/InputXpathUpperEllTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/InputXpathUpperEllTwo.java
new file mode 100644
index 00000000000..4ed7cb0ff4a
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/InputXpathUpperEllTwo.java
@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.upperell;
+
+public interface InputXpathUpperEllTwo {
+    public static void test() {
+        long var1 = 508987;
+        long var2 = 508987l; //warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/SuppressionXpathRegressionUpperEllFirst.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/SuppressionXpathRegressionUpperEllFirst.java
deleted file mode 100644
index 1e458724f28..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/SuppressionXpathRegressionUpperEllFirst.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.upperell;
-
-public class SuppressionXpathRegressionUpperEllFirst {
-    long bad = 0l;//warn
-    long good = 0L;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/SuppressionXpathRegressionUpperEllSecond.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/SuppressionXpathRegressionUpperEllSecond.java
deleted file mode 100644
index aa2dd37ab4f..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/upperell/SuppressionXpathRegressionUpperEllSecond.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.upperell;
-
-public interface SuppressionXpathRegressionUpperEllSecond {
-    public static void test() {
-        long var1 = 508987;
-        long var2 = 508987l; //warn
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/InputXpathVariableDeclarationUsageDistanceOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/InputXpathVariableDeclarationUsageDistanceOne.java
new file mode 100644
index 00000000000..616fb41e341
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/InputXpathVariableDeclarationUsageDistanceOne.java
@@ -0,0 +1,11 @@
+package org.checkstyle.suppressionxpathfilter.variabledeclarationusagedistance;
+
+public class InputXpathVariableDeclarationUsageDistanceOne {
+    private int test1;
+
+    public void test(int test1) {
+        int temp = -1; // warn
+        this.test1 = test1;
+        temp = test1; // DECLARATION OF VARIABLE 'temp' SHOULD BE HERE (distance = 2)
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/InputXpathVariableDeclarationUsageDistanceTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/InputXpathVariableDeclarationUsageDistanceTwo.java
new file mode 100644
index 00000000000..ed696f3a29b
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/InputXpathVariableDeclarationUsageDistanceTwo.java
@@ -0,0 +1,18 @@
+package org.checkstyle.suppressionxpathfilter.variabledeclarationusagedistance;
+
+
+public class InputXpathVariableDeclarationUsageDistanceTwo {
+    public void testMethod2() {
+        int count; // warn
+        int a = 3;
+        int b = 2;
+        {
+            a = a
+                    + b
+                    - 5
+                    + 2
+                    * a;
+            count = b; // DECLARATION OF VARIABLE 'count' SHOULD BE HERE (distance = 2)
+        }
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/SuppressionXpathRegressionVariableDeclarationUsageDistance1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/SuppressionXpathRegressionVariableDeclarationUsageDistance1.java
deleted file mode 100644
index 24ace80d3a4..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/SuppressionXpathRegressionVariableDeclarationUsageDistance1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.variabledeclarationusagedistance;
-
-public class SuppressionXpathRegressionVariableDeclarationUsageDistance1 {
-    private int test1;
-
-    public void test(int test1) {
-        int temp = -1; // warn
-        this.test1 = test1;
-        temp = test1; // DECLARATION OF VARIABLE 'temp' SHOULD BE HERE (distance = 2)
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/SuppressionXpathRegressionVariableDeclarationUsageDistance2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/SuppressionXpathRegressionVariableDeclarationUsageDistance2.java
deleted file mode 100644
index f3d823977e5..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/variabledeclarationusagedistance/SuppressionXpathRegressionVariableDeclarationUsageDistance2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.variabledeclarationusagedistance;
-
-
-public class SuppressionXpathRegressionVariableDeclarationUsageDistance2 {
-    public void testMethod2() {
-        int count; // warn
-        int a = 3;
-        int b = 2;
-        {
-            a = a
-                    + b
-                    - 5
-                    + 2
-                    * a;
-            count = b; // DECLARATION OF VARIABLE 'count' SHOULD BE HERE (distance = 2)
-        }
-    }
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierAnnotation.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierAnnotation.java
new file mode 100644
index 00000000000..8e4e54ffe97
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierAnnotation.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.visibilitymodifier;
+
+public class InputXpathVisibilityModifierAnnotation {
+    @java.lang.Deprecated
+    String annotatedString; // warn
+
+    @Deprecated
+    String shortCustomAnnotated;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierAnonymous.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierAnonymous.java
new file mode 100644
index 00000000000..fc46d090baa
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierAnonymous.java
@@ -0,0 +1,13 @@
+package org.checkstyle.suppressionxpathfilter.visibilitymodifier;
+
+public class InputXpathVisibilityModifierAnonymous {
+    private Runnable runnable = new Runnable() {
+
+        public String field1; // warn
+
+        @Override
+        public void run() {
+
+        }
+    };
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierDefault.java
new file mode 100644
index 00000000000..f4d51703059
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierDefault.java
@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.visibilitymodifier;
+
+public class InputXpathVisibilityModifierDefault {
+    private int myPrivateField; // ok, private class member is allowed
+
+    int field; // warn
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierInner.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierInner.java
new file mode 100644
index 00000000000..ddfaa00e028
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/visibilitymodifier/InputXpathVisibilityModifierInner.java
@@ -0,0 +1,9 @@
+package org.checkstyle.suppressionxpathfilter.visibilitymodifier;
+
+public class InputXpathVisibilityModifierInner {
+    class InnerClass {
+        private int field1;
+
+        public int field2; // warn
+    }
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/InputXpathWhitespaceAfterNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/InputXpathWhitespaceAfterNotFollowed.java
new file mode 100644
index 00000000000..2b94bbfa793
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/InputXpathWhitespaceAfterNotFollowed.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.whitespaceafter;
+
+public class InputXpathWhitespaceAfterNotFollowed {
+    int[] bad = {1,2}; //warn
+    int[] good = {1, 2};
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/InputXpathWhitespaceAfterTypecast.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/InputXpathWhitespaceAfterTypecast.java
new file mode 100644
index 00000000000..e49beb1e7f3
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/InputXpathWhitespaceAfterTypecast.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.whitespaceafter;
+
+public class InputXpathWhitespaceAfterTypecast {
+    Object bad = (Object)null; //warn
+    Object good = (Object) null;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/SuppressionXpathRegressionWhitespaceAfterNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/SuppressionXpathRegressionWhitespaceAfterNotFollowed.java
deleted file mode 100644
index 318370eb37c..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/SuppressionXpathRegressionWhitespaceAfterNotFollowed.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.whitespaceafter;
-
-public class SuppressionXpathRegressionWhitespaceAfterNotFollowed {
-    int[] bad = {1,2}; //warn
-    int[] good = {1, 2};
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/SuppressionXpathRegressionWhitespaceAfterTypecast.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/SuppressionXpathRegressionWhitespaceAfterTypecast.java
deleted file mode 100644
index c0c9c1f6ba3..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespaceafter/SuppressionXpathRegressionWhitespaceAfterTypecast.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.whitespaceafter;
-
-public class SuppressionXpathRegressionWhitespaceAfterTypecast {
-    Object bad = (Object)null; //warn
-    Object good = (Object) null;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/InputXpathWhitespaceAroundNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/InputXpathWhitespaceAroundNotFollowed.java
new file mode 100644
index 00000000000..fce10267c88
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/InputXpathWhitespaceAroundNotFollowed.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.whitespacearound;
+
+public class InputXpathWhitespaceAroundNotFollowed {
+    int bad =0; //warn
+    int good = 0;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/InputXpathWhitespaceAroundNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/InputXpathWhitespaceAroundNotPreceded.java
new file mode 100644
index 00000000000..118542f9633
--- /dev/null
+++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/InputXpathWhitespaceAroundNotPreceded.java
@@ -0,0 +1,6 @@
+package org.checkstyle.suppressionxpathfilter.whitespacearound;
+
+public class InputXpathWhitespaceAroundNotPreceded {
+    int bad= 0; //warn
+    int good = 0;
+}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/SuppressionXpathRegressionWhitespaceAroundNotFollowed.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/SuppressionXpathRegressionWhitespaceAroundNotFollowed.java
deleted file mode 100644
index fa04b7a906e..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/SuppressionXpathRegressionWhitespaceAroundNotFollowed.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.whitespacearound;
-
-public class SuppressionXpathRegressionWhitespaceAroundNotFollowed {
-    int bad =0; //warn
-    int good = 0;
-}
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/SuppressionXpathRegressionWhitespaceAroundNotPreceded.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/SuppressionXpathRegressionWhitespaceAroundNotPreceded.java
deleted file mode 100644
index 358f5af48b8..00000000000
--- a/src/it/resources/org/checkstyle/suppressionxpathfilter/whitespacearound/SuppressionXpathRegressionWhitespaceAroundNotPreceded.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.checkstyle.suppressionxpathfilter.whitespacearound;
-
-public class SuppressionXpathRegressionWhitespaceAroundNotPreceded {
-    int bad= 0; //warn
-    int good = 0;
-}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.java b/src/main/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.java
index e7f95250bb0..3f5b4834ebc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBean.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,8 @@
 import java.util.StringTokenizer;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nullable;
+
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.beanutils.ConvertUtilsBean;
@@ -168,6 +170,7 @@ private static void registerIntegralTypes(ConvertUtilsBean cub) {
      */
     private static void registerCustomTypes(ConvertUtilsBean cub) {
         cub.register(new PatternConverter(), Pattern.class);
+        cub.register(new PatternArrayConverter(), Pattern[].class);
         cub.register(new SeverityLevelConverter(), SeverityLevel.class);
         cub.register(new ScopeConverter(), Scope.class);
         cub.register(new UriConverter(), URI.class);
@@ -311,6 +314,25 @@ public Object convert(Class type, Object value) {
 
     }
 
+    /** A converter that converts a comma-separated string into an array of patterns. */
+    private static final class PatternArrayConverter implements Converter {
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public Object convert(Class type, Object value) {
+            final StringTokenizer tokenizer = new StringTokenizer(
+                    value.toString(), COMMA_SEPARATOR);
+            final List<Pattern> result = new ArrayList<>();
+
+            while (tokenizer.hasMoreTokens()) {
+                final String token = tokenizer.nextToken();
+                result.add(CommonUtil.createPattern(token.trim()));
+            }
+
+            return result.toArray(new Pattern[0]);
+        }
+    }
+
     /** A converter that converts strings to severity level. */
     private static final class SeverityLevelConverter implements Converter {
 
@@ -338,6 +360,7 @@ private static final class UriConverter implements Converter {
 
         @SuppressWarnings("unchecked")
         @Override
+        @Nullable
         public Object convert(Class type, Object value) {
             final String url = value.toString();
             URI result = null;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java
index 87758b356e2..d0d2da45b0e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java
index c138512d5ee..606311a189e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -55,9 +55,7 @@ public String format(AuditEvent event) {
             severityLevelName = severityLevel.getName().toUpperCase(Locale.US);
         }
 
-        // Avoid StringBuffer.expandCapacity
-        final int bufLen = calculateBufferLength(event, severityLevelName.length());
-        final StringBuilder sb = new StringBuilder(bufLen);
+        final StringBuilder sb = initStringBuilderWithOptimalBuffer(event, severityLevelName);
 
         sb.append('[').append(severityLevelName).append("] ")
             .append(fileName).append(':').append(event.getLine());
@@ -78,18 +76,21 @@ public String format(AuditEvent event) {
     }
 
     /**
-     * Returns the length of the buffer for StringBuilder.
+     * Returns the StringBuilder that should avoid StringBuffer.expandCapacity.
      * bufferLength = fileNameLength + messageLength + lengthOfAllSeparators +
      * + severityNameLength + checkNameLength.
+     * Method is excluded from pitest validation.
      *
      * @param event audit event.
-     * @param severityLevelNameLength length of severity level name.
-     * @return the length of the buffer for StringBuilder.
+     * @param severityLevelName severity level name.
+     * @return optimal StringBuilder.
      */
-    private static int calculateBufferLength(AuditEvent event, int severityLevelNameLength) {
-        return LENGTH_OF_ALL_SEPARATORS + event.getFileName().length()
-            + event.getMessage().length() + severityLevelNameLength
+    private static StringBuilder initStringBuilderWithOptimalBuffer(AuditEvent event,
+            String severityLevelName) {
+        final int bufLen = LENGTH_OF_ALL_SEPARATORS + event.getFileName().length()
+            + event.getMessage().length() + severityLevelName.length()
             + getCheckShortName(event).length();
+        return new StringBuilder(bufLen);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventFormatter.java b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventFormatter.java
index 7526357536d..1dc2fbabfae 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventFormatter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventFormatter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java
index 6676f5c0952..6dd3473aee8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -108,7 +108,7 @@ public class Checker extends AbstractAutomaticBean implements MessageDispatcher,
     private Context childContext;
 
     /** The file extensions that are accepted. */
-    private String[] fileExtensions = CommonUtil.EMPTY_STRING_ARRAY;
+    private String[] fileExtensions;
 
     /**
      * The severity level of any violations found by submodules.
@@ -222,7 +222,7 @@ public int process(List<File> files) throws CheckstyleException {
 
         final List<File> targetFiles = files.stream()
                 .filter(file -> CommonUtil.matchesFileExtension(file, fileExtensions))
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
         processFiles(targetFiles);
 
         // Finish up
@@ -247,9 +247,11 @@ public int process(List<File> files) throws CheckstyleException {
     private Set<String> getExternalResourceLocations() {
         return Stream.concat(fileSetChecks.stream(), filters.getFilters().stream())
             .filter(ExternalResourceHolder.class::isInstance)
-            .map(ExternalResourceHolder.class::cast)
-            .flatMap(resource -> resource.getExternalResourceLocations().stream())
-            .collect(Collectors.toSet());
+            .flatMap(resource -> {
+                return ((ExternalResourceHolder) resource)
+                        .getExternalResourceLocations().stream();
+            })
+            .collect(Collectors.toUnmodifiableSet());
     }
 
     /** Notify all listeners about the audit start. */
@@ -282,6 +284,7 @@ private void fireAuditFinished() {
     private void processFiles(List<File> files) throws CheckstyleException {
         for (final File file : files) {
             String fileName = null;
+            final String filePath = file.getPath();
             try {
                 fileName = file.getAbsolutePath();
                 final long timestamp = file.lastModified();
@@ -305,8 +308,8 @@ private void processFiles(List<File> files) throws CheckstyleException {
                 }
 
                 // We need to catch all exceptions to put a reason failure (file name) in exception
-                throw new CheckstyleException("Exception was thrown while processing "
-                        + file.getPath(), ex);
+                throw new CheckstyleException(
+                        getLocalizedMessage("Checker.processFilesException", filePath), ex);
             }
             catch (Error error) {
                 if (fileName != null && cacheFile != null) {
@@ -314,7 +317,7 @@ private void processFiles(List<File> files) throws CheckstyleException {
                 }
 
                 // We need to catch all errors to put a reason failure (file name) in error
-                throw new Error("Error was thrown while processing " + file.getPath(), error);
+                throw new Error("Error was thrown while processing " + filePath, error);
             }
         }
     }
@@ -372,7 +375,7 @@ private SortedSet<Violation> processFile(File file) throws CheckstyleException {
      * @return {@code true} if the file is accepted.
      */
     private boolean acceptFileStarted(String fileName) {
-        final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);
+        final String stripped = CommonUtil.relativizePath(basedir, fileName);
         return beforeExecutionFileFilters.accept(stripped);
     }
 
@@ -384,7 +387,7 @@ private boolean acceptFileStarted(String fileName) {
      */
     @Override
     public void fireFileStarted(String fileName) {
-        final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);
+        final String stripped = CommonUtil.relativizePath(basedir, fileName);
         final AuditEvent event = new AuditEvent(this, stripped);
         for (final AuditListener listener : listeners) {
             listener.fileStarted(event);
@@ -399,7 +402,7 @@ public void fireFileStarted(String fileName) {
      */
     @Override
     public void fireErrors(String fileName, SortedSet<Violation> errors) {
-        final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);
+        final String stripped = CommonUtil.relativizePath(basedir, fileName);
         boolean hasNonFilteredViolations = false;
         for (final Violation element : errors) {
             final AuditEvent event = new AuditEvent(this, stripped, element);
@@ -423,7 +426,7 @@ public void fireErrors(String fileName, SortedSet<Violation> errors) {
      */
     @Override
     public void fireFileFinished(String fileName) {
-        final String stripped = CommonUtil.relativizeAndNormalizePath(basedir, fileName);
+        final String stripped = CommonUtil.relativizePath(basedir, fileName);
         final AuditEvent event = new AuditEvent(this, stripped);
         for (final AuditListener listener : listeners) {
             listener.fileFinished(event);
@@ -437,9 +440,7 @@ protected void finishLocalSetup() throws CheckstyleException {
 
         if (moduleFactory == null) {
             if (moduleClassLoader == null) {
-                throw new CheckstyleException(
-                        "if no custom moduleFactory is set, "
-                                + "moduleClassLoader must be specified");
+                throw new CheckstyleException(getLocalizedMessage("Checker.finishLocalSetup"));
             }
 
             final Set<String> packageNames = PackageNamesLoader
@@ -479,8 +480,8 @@ protected void setupChild(Configuration childConf)
             }
         }
         catch (final CheckstyleException ex) {
-            throw new CheckstyleException("cannot initialize module " + name
-                    + " - " + ex.getMessage(), ex);
+            throw new CheckstyleException(
+                    getLocalizedMessage("Checker.setupChildModule", name, ex.getMessage()), ex);
         }
         if (child instanceof FileSetCheck) {
             final FileSetCheck fsc = (FileSetCheck) child;
@@ -500,8 +501,8 @@ else if (child instanceof AuditListener) {
             addListener(listener);
         }
         else {
-            throw new CheckstyleException(name
-                    + " is not allowed as a child in Checker");
+            throw new CheckstyleException(
+                    getLocalizedMessage("Checker.setupChildNotAllowed", name));
         }
     }
 
@@ -547,10 +548,7 @@ public final void addListener(AuditListener listener) {
      *     initial '.' character of an extension is automatically added.
      */
     public final void setFileExtensions(String... extensions) {
-        if (extensions == null) {
-            fileExtensions = null;
-        }
-        else {
+        if (extensions != null) {
             fileExtensions = new String[extensions.length];
             for (int i = 0; i < extensions.length; i++) {
                 final String extension = extensions[i];
@@ -616,8 +614,8 @@ public final void setModuleClassLoader(ClassLoader moduleClassLoader) {
     public void setCharset(String charset)
             throws UnsupportedEncodingException {
         if (!Charset.isSupported(charset)) {
-            final String message = "unsupported charset: '" + charset + "'";
-            throw new UnsupportedEncodingException(message);
+            throw new UnsupportedEncodingException(
+                    getLocalizedMessage("Checker.setCharset", charset));
         }
         this.charset = charset;
     }
@@ -649,4 +647,19 @@ public void clearCache() {
         }
     }
 
+    /**
+     * Extracts localized messages from properties files.
+     *
+     * @param messageKey the key pointing to localized message in respective properties file.
+     * @param args the arguments of message in respective properties file.
+     * @return a string containing extracted localized message
+     */
+    private String getLocalizedMessage(String messageKey, Object... args) {
+        final LocalizedMessage localizedMessage = new LocalizedMessage(
+            Definitions.CHECKSTYLE_BUNDLE, getClass(),
+                    messageKey, args);
+
+        return localizedMessage.getMessage();
+    }
+
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.java b/src/main/java/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.java
index d596b43a77d..075ba386b16 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/CheckstyleParserErrorStrategy.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
index d2fee5107c7..d274edf5c86 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,6 @@
 package com.puppycrawl.tools.checkstyle;
 
 import java.io.IOException;
-import java.net.URI;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -260,10 +259,7 @@ public static Configuration loadConfiguration(String config,
                                                   IgnoredModulesOptions ignoredModulesOptions,
                                                   ThreadModeSettings threadModeSettings)
             throws CheckstyleException {
-        // figure out if this is a File or a URL
-        final URI uri = CommonUtil.getUriByFilename(config);
-        final InputSource source = new InputSource(uri.toString());
-        return loadConfiguration(source, overridePropsResolver,
+        return loadConfiguration(CommonUtil.sourceFromFilename(config), overridePropsResolver,
                 ignoredModulesOptions, threadModeSettings);
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java
index 514984b9b19..a68e2f46aa6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultConfiguration.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java
index c1e9242f36b..e5024929567 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultContext.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
index a18ced254a0..041055ae298 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Definitions.java b/src/main/java/com/puppycrawl/tools/checkstyle/Definitions.java
index 28766aa0152..58f3c19dfd6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/Definitions.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Definitions.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,8 @@ public final class Definitions {
 
     /** Name of modules which are not checks, but are internal modules. */
     public static final Set<String> INTERNAL_MODULES = Set.of(
-                    "com.puppycrawl.tools.checkstyle.meta.JavadocMetadataScraper");
+                    "com.puppycrawl.tools.checkstyle.meta.JavadocMetadataScraper",
+                    "com.puppycrawl.tools.checkstyle.site.ClassAndPropertiesSettersJavadocScraper");
 
     /**
      * Do no allow {@code Definitions} instances to be created.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java
index 3064b9cc613..474e7380ce8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,7 +47,7 @@ public final class DetailAstImpl implements DetailAST {
     private int columnNo = NOT_INITIALIZED;
 
     /** Number of children. */
-    private int childCount = NOT_INITIALIZED;
+    private int childCount;
     /** The parent token. */
     private DetailAstImpl parent;
     /** Previous sibling. */
@@ -144,13 +144,8 @@ public void addNextSibling(DetailAST ast) {
             // parent is set in setNextSibling
             final DetailAstImpl sibling = nextSibling;
             final DetailAstImpl astImpl = (DetailAstImpl) ast;
+            astImpl.setNextSibling(sibling);
 
-            if (sibling != null) {
-                astImpl.setNextSibling(sibling);
-                sibling.previousSibling = astImpl;
-            }
-
-            astImpl.previousSibling = this;
             setNextSibling(astImpl);
         }
     }
@@ -166,7 +161,6 @@ public void addChild(DetailAST child) {
         if (child != null) {
             final DetailAstImpl astImpl = (DetailAstImpl) child;
             astImpl.setParent(this);
-            astImpl.previousSibling = (DetailAstImpl) getLastChild();
         }
         DetailAST temp = firstChild;
         if (temp == null) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java
index 61c59b61361..ccd5e5428a9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/FileStatefulCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/FileStatefulCheck.java
index e7fee377422..f64e45dc659 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/FileStatefulCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/FileStatefulCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/GlobalStatefulCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/GlobalStatefulCheck.java
index 566cd385ca7..225549c7cc9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/GlobalStatefulCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/GlobalStatefulCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java
index 7e39fd4caee..cdbf62ab677 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -103,6 +104,9 @@ public final class JavaAstVisitor extends JavaLanguageParserBaseVisitor<DetailAs
     /** String representation of the right shift operator. */
     private static final String RIGHT_SHIFT = ">>";
 
+    /** String representation of the double quote character. */
+    private static final String QUOTE = "\"";
+
     /**
      * The tokens here are technically expressions, but should
      * not return an EXPR token as their root.
@@ -419,7 +423,7 @@ public DetailAstImpl visitMethodDeclaration(JavaLanguageParser.MethodDeclaration
         // Process all children except C style array declarators
         processChildren(methodDef, ctx.children.stream()
                 .filter(child -> !(child instanceof JavaLanguageParser.ArrayDeclaratorContext))
-                .collect(Collectors.toList()));
+                .collect(Collectors.toUnmodifiableList()));
 
         // We add C style array declarator brackets to TYPE ast
         final DetailAstImpl typeAst = (DetailAstImpl) methodDef.findFirstToken(TokenTypes.TYPE);
@@ -483,7 +487,7 @@ public DetailAstImpl visitInterfaceMethodDeclaration(
         final List<ParseTree> children = ctx.children
                 .stream()
                 .filter(child -> !(child instanceof JavaLanguageParser.ArrayDeclaratorContext))
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
         processChildren(methodDef, children);
 
         // We add C style array declarator brackets to TYPE ast
@@ -834,7 +838,7 @@ public DetailAstImpl visitAnnotationMethodRest(
         // Process all children except C style array declarators
         processChildren(annotationFieldDef, ctx.children.stream()
                 .filter(child -> !(child instanceof JavaLanguageParser.ArrayDeclaratorContext))
-                .collect(Collectors.toList()));
+                .collect(Collectors.toUnmodifiableList()));
 
         // We add C style array declarator brackets to TYPE ast
         final DetailAstImpl typeAst =
@@ -881,7 +885,7 @@ public DetailAstImpl visitPrimaryCtorCall(JavaLanguageParser.PrimaryCtorCallCont
         // filter 'LITERAL_SUPER'
         processChildren(primaryCtorCall, ctx.children.stream()
                    .filter(child -> !child.equals(ctx.LITERAL_SUPER()))
-                   .collect(Collectors.toList()));
+                   .collect(Collectors.toUnmodifiableList()));
         return primaryCtorCall;
     }
 
@@ -1119,7 +1123,7 @@ public DetailAstImpl visitCatchParameter(JavaLanguageParser.CatchParameterContex
         // filter mods
         processChildren(catchParameterDef, ctx.children.stream()
                 .filter(child -> !(child instanceof JavaLanguageParser.VariableModifierContext))
-                .collect(Collectors.toList()));
+                .collect(Collectors.toUnmodifiableList()));
         return catchParameterDef;
     }
 
@@ -1533,6 +1537,14 @@ public DetailAstImpl visitPrimaryExp(JavaLanguageParser.PrimaryExpContext ctx) {
         return flattenedTree(ctx);
     }
 
+    @Override
+    public DetailAstImpl visitTemplateExp(JavaLanguageParser.TemplateExpContext ctx) {
+        final DetailAstImpl dot = create(ctx.DOT());
+        dot.addChild(visit(ctx.expr()));
+        dot.addChild(visit(ctx.templateArgument()));
+        return dot;
+    }
+
     @Override
     public DetailAstImpl visitPostfix(JavaLanguageParser.PostfixContext ctx) {
         final DetailAstImpl postfix;
@@ -1552,7 +1564,7 @@ public DetailAstImpl visitMethodRef(JavaLanguageParser.MethodRefContext ctx) {
                 (Token) ctx.DOUBLE_COLON().getPayload());
         final List<ParseTree> children = ctx.children.stream()
                 .filter(child -> !child.equals(ctx.DOUBLE_COLON()))
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
         processChildren(doubleColon, children);
         return doubleColon;
     }
@@ -1562,7 +1574,7 @@ public DetailAstImpl visitTernaryOp(JavaLanguageParser.TernaryOpContext ctx) {
         final DetailAstImpl root = create(ctx.QUESTION());
         processChildren(root, ctx.children.stream()
                 .filter(child -> !child.equals(ctx.QUESTION()))
-                .collect(Collectors.toList()));
+                .collect(Collectors.toUnmodifiableList()));
         return root;
     }
 
@@ -1742,6 +1754,137 @@ public DetailAstImpl visitPrimitivePrimary(JavaLanguageParser.PrimitivePrimaryCo
         return dot;
     }
 
+    @Override
+    public DetailAstImpl visitTemplateArgument(JavaLanguageParser.TemplateArgumentContext ctx) {
+        return Objects.requireNonNullElseGet(visit(ctx.template()),
+                () -> buildSimpleStringTemplateArgument(ctx));
+    }
+
+    /**
+     * Builds a simple string template argument AST, which basically means that we
+     * transform a string literal into a string template AST because it is a
+     * string template argument.
+     *
+     * @param ctx the TemplateArgumentContext to build AST from
+     * @return DetailAstImpl of string template argument
+     */
+    private static DetailAstImpl buildSimpleStringTemplateArgument(
+            JavaLanguageParser.TemplateArgumentContext ctx) {
+        final int startColumn = ctx.start.getCharPositionInLine();
+        final int endColumn = startColumn + ctx.getText().length() - 1;
+        final int lineNumber = ctx.start.getLine();
+
+        final DetailAstImpl templateArgument = createImaginary(
+                TokenTypes.STRING_TEMPLATE_BEGIN, QUOTE,
+                lineNumber, startColumn
+        );
+
+        final int quoteLength = QUOTE.length();
+        final int tokenTextLength = ctx.getText().length();
+
+        final String actualContent = ctx.getText()
+                    .substring(quoteLength, tokenTextLength - quoteLength);
+
+        final DetailAstImpl content = createImaginary(
+                TokenTypes.STRING_TEMPLATE_CONTENT, actualContent,
+                lineNumber, startColumn + quoteLength
+        );
+        templateArgument.addChild(content);
+
+        final DetailAstImpl end = createImaginary(
+                TokenTypes.STRING_TEMPLATE_END, QUOTE,
+                lineNumber, endColumn
+        );
+        templateArgument.addChild(end);
+
+        return templateArgument;
+    }
+
+    @Override
+    public DetailAstImpl visitStringTemplate(JavaLanguageParser.StringTemplateContext ctx) {
+        final DetailAstImpl stringTemplateBegin = visit(ctx.stringTemplateBegin());
+
+        final Optional<DetailAstImpl> expression = Optional.ofNullable(ctx.expr())
+                .map(this::visit);
+
+        if (expression.isPresent()) {
+            final DetailAstImpl imaginaryExpression =
+                    createImaginary(TokenTypes.EMBEDDED_EXPRESSION);
+            imaginaryExpression.addChild(expression.orElseThrow());
+            stringTemplateBegin.addChild(imaginaryExpression);
+        }
+
+        ctx.stringTemplateMiddle().stream()
+                .map(this::buildStringTemplateMiddle)
+                .forEach(stringTemplateBegin::addChild);
+
+        final DetailAstImpl stringTemplateEnd = visit(ctx.stringTemplateEnd());
+        stringTemplateBegin.addChild(stringTemplateEnd);
+        return stringTemplateBegin;
+    }
+
+    /**
+     * Builds a string template middle AST.
+     *
+     * @param ctx the StringTemplateMiddleContext to build AST from
+     * @return DetailAstImpl of string template middle
+     */
+    private DetailAstImpl buildStringTemplateMiddle(
+            JavaLanguageParser.StringTemplateMiddleContext ctx) {
+        final DetailAstImpl stringTemplateMiddle =
+                visit(ctx.stringTemplateMid());
+
+        final Optional<DetailAstImpl> expression = Optional.ofNullable(ctx.expr())
+                .map(this::visit);
+
+        if (expression.isPresent()) {
+            final DetailAstImpl imaginaryExpression =
+                    createImaginary(TokenTypes.EMBEDDED_EXPRESSION);
+            imaginaryExpression.addChild(expression.orElseThrow());
+            addLastSibling(stringTemplateMiddle, imaginaryExpression);
+        }
+
+        return stringTemplateMiddle;
+    }
+
+    @Override
+    public DetailAstImpl visitStringTemplateBegin(
+            JavaLanguageParser.StringTemplateBeginContext ctx) {
+        final DetailAstImpl stringTemplateBegin =
+                create(ctx.STRING_TEMPLATE_BEGIN());
+        final Optional<DetailAstImpl> stringTemplateContent =
+                Optional.ofNullable(ctx.STRING_TEMPLATE_CONTENT())
+                        .map(this::create);
+        stringTemplateContent.ifPresent(stringTemplateBegin::addChild);
+        final DetailAstImpl embeddedExpressionBegin = create(ctx.EMBEDDED_EXPRESSION_BEGIN());
+        stringTemplateBegin.addChild(embeddedExpressionBegin);
+        return stringTemplateBegin;
+    }
+
+    @Override
+    public DetailAstImpl visitStringTemplateMid(JavaLanguageParser.StringTemplateMidContext ctx) {
+        final DetailAstImpl embeddedExpressionEnd = create(ctx.EMBEDDED_EXPRESSION_END());
+        final Optional<DetailAstImpl> stringTemplateContent =
+                Optional.ofNullable(ctx.STRING_TEMPLATE_CONTENT())
+                        .map(this::create);
+        stringTemplateContent.ifPresent(self -> addLastSibling(embeddedExpressionEnd, self));
+        final DetailAstImpl embeddedExpressionBegin = create(ctx.EMBEDDED_EXPRESSION_BEGIN());
+        addLastSibling(embeddedExpressionEnd, embeddedExpressionBegin);
+        return embeddedExpressionEnd;
+    }
+
+    @Override
+    public DetailAstImpl visitStringTemplateEnd(JavaLanguageParser.StringTemplateEndContext ctx) {
+        final DetailAstImpl embeddedExpressionEnd = create(ctx.EMBEDDED_EXPRESSION_END());
+        final Optional<DetailAstImpl> stringTemplateContent =
+                Optional.ofNullable(ctx.STRING_TEMPLATE_CONTENT())
+                        .map(this::create);
+        stringTemplateContent.ifPresent(self -> addLastSibling(embeddedExpressionEnd, self));
+        final DetailAstImpl stringTemplateEnd = create(ctx.STRING_TEMPLATE_END());
+        addLastSibling(embeddedExpressionEnd, stringTemplateEnd);
+        return embeddedExpressionEnd;
+    }
+
     @Override
     public DetailAstImpl visitCreator(JavaLanguageParser.CreatorContext ctx) {
         return flattenedTree(ctx);
@@ -2012,8 +2155,8 @@ public DetailAstImpl visitRecordPatternDef(JavaLanguageParser.RecordPatternDefCo
     }
 
     @Override
-    public DetailAstImpl visitTypePattern(
-            JavaLanguageParser.TypePatternContext ctx) {
+    public DetailAstImpl visitTypePatternDef(
+            JavaLanguageParser.TypePatternDefContext ctx) {
         final DetailAstImpl type = visit(ctx.type);
         final DetailAstImpl patternVariableDef = createImaginary(TokenTypes.PATTERN_VARIABLE_DEF);
         patternVariableDef.addChild(createModifiers(ctx.mods));
@@ -2022,6 +2165,11 @@ public DetailAstImpl visitTypePattern(
         return patternVariableDef;
     }
 
+    @Override
+    public DetailAstImpl visitUnnamedPatternDef(JavaLanguageParser.UnnamedPatternDefContext ctx) {
+        return create(TokenTypes.UNNAMED_PATTERN_DEF, ctx.start);
+    }
+
     @Override
     public DetailAstImpl visitRecordPattern(JavaLanguageParser.RecordPatternContext ctx) {
         final DetailAstImpl recordPattern = createImaginary(TokenTypes.RECORD_PATTERN_DEF);
@@ -2094,7 +2242,7 @@ private void processChildren(DetailAstImpl parent, List<? extends ParseTree> chi
      * should be used for imaginary nodes only, i.e. 'OBJBLOCK -&gt; OBJBLOCK',
      * where the text on the RHS matches the text on the LHS.
      *
-     * @param tokenType  the token type of this DetailAstImpl
+     * @param tokenType the token type of this DetailAstImpl
      * @return new DetailAstImpl of given type
      */
     private static DetailAstImpl createImaginary(int tokenType) {
@@ -2104,6 +2252,39 @@ private static DetailAstImpl createImaginary(int tokenType) {
         return detailAst;
     }
 
+    /**
+     * Create a DetailAstImpl from a given token type and text. This method
+     * should be used for imaginary nodes only, i.e. 'OBJBLOCK -&gt; OBJBLOCK',
+     * where the text on the RHS matches the text on the LHS.
+     *
+     * @param tokenType the token type of this DetailAstImpl
+     * @param text the text of this DetailAstImpl
+     * @return new DetailAstImpl of given type
+     */
+    private static DetailAstImpl createImaginary(int tokenType, String text) {
+        final DetailAstImpl imaginary = new DetailAstImpl();
+        imaginary.setType(tokenType);
+        imaginary.setText(text);
+        return imaginary;
+    }
+
+    /**
+     * Creates an imaginary DetailAstImpl with the given token details.
+     *
+     * @param tokenType the token type of this DetailAstImpl
+     * @param text the text of this DetailAstImpl
+     * @param lineNumber the line number of this DetailAstImpl
+     * @param columnNumber the column number of this DetailAstImpl
+     * @return imaginary DetailAstImpl from given details
+     */
+    private static DetailAstImpl createImaginary(
+            int tokenType, String text, int lineNumber, int columnNumber) {
+        final DetailAstImpl imaginary = createImaginary(tokenType, text);
+        imaginary.setLineNo(lineNumber);
+        imaginary.setColumnNo(columnNumber);
+        return imaginary;
+    }
+
     /**
      * Create a DetailAstImpl from a given token and token type. This method
      * should be used for literal nodes only, i.e. 'PACKAGE_DEF -&gt; package'.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java
index adfdc335101..e56c35d8c9e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,6 +40,7 @@
 import com.puppycrawl.tools.checkstyle.api.FileContents;
 import com.puppycrawl.tools.checkstyle.api.FileText;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.grammar.CompositeLexerContextCache;
 import com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageLexer;
 import com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser;
 import com.puppycrawl.tools.checkstyle.utils.ParserUtil;
@@ -84,8 +85,9 @@ public static DetailAST parse(FileContents contents)
         final String fullText = contents.getText().getFullText().toString();
         final CharStream codePointCharStream = CharStreams.fromString(fullText);
         final JavaLanguageLexer lexer = new JavaLanguageLexer(codePointCharStream, true);
+        final CompositeLexerContextCache contextCache = new CompositeLexerContextCache(lexer);
         lexer.setCommentListener(contents);
-        lexer.removeErrorListeners();
+        lexer.setContextCache(contextCache);
 
         final CommonTokenStream tokenStream = new CommonTokenStream(lexer);
         final JavaLanguageParser parser =
@@ -137,7 +139,7 @@ public static DetailAST parseFileText(FileText text, Options options)
      */
     public static DetailAST parseFile(File file, Options options)
             throws IOException, CheckstyleException {
-        final FileText text = new FileText(file.getAbsoluteFile(),
+        final FileText text = new FileText(file,
             StandardCharsets.UTF_8.name());
         return parseFileText(text, options);
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java
index 3e42140870f..012cef704cc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java
index 4600bce9a4a..bda00e6f50d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,9 +63,6 @@ public final class JavadocPropertiesGenerator {
     private static final Pattern END_OF_SENTENCE_PATTERN = Pattern.compile(
         "(([^.?!]|[.?!](?!\\s|$))*+[.?!])(\\s|$)");
 
-    /** Max width of the usage help message for this command. */
-    private static final int USAGE_HELP_WIDTH = 100;
-
     /**
      * Don't create instance of this class, use the {@link #main(String[])} method instead.
      */
@@ -80,7 +77,7 @@ private JavadocPropertiesGenerator() {
      **/
     public static void main(String... args) throws CheckstyleException {
         final CliOptions cliOptions = new CliOptions();
-        final CommandLine cmd = new CommandLine(cliOptions).setUsageHelpWidth(USAGE_HELP_WIDTH);
+        final CommandLine cmd = new CommandLine(cliOptions);
         try {
             final ParseResult parseResult = cmd.parseArgs(args);
             if (parseResult.isUsageHelpRequested()) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java b/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java
index 926b1ffbc70..3a21e14be6f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/LocalizedMessage.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,13 +26,14 @@
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
 
+import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
+
 /**
  * Represents a message that can be localised. The translations come from
  * message.properties files. The underlying implementation uses
@@ -80,7 +81,7 @@ public LocalizedMessage(String bundle, Class<?> sourceClass, String key,
             this.args = null;
         }
         else {
-            this.args = Arrays.copyOf(args, args.length);
+            this.args = UnmodifiableCollectionUtil.copyOfArray(args, args.length);
         }
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
index ad8df04c69e..a6839e675a1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -503,7 +503,7 @@ private static AuditListener createListener(OutputFormat format, Path outputLoca
     }
 
     /**
-     * Create output stream or return System.out
+     * Create output stream or return System.out.
      *
      * @param outputPath output location
      * @return output stream
@@ -680,7 +680,7 @@ private static final class CliOptions {
                         + "Argument is the line and column number (separated by a : ) in the file "
                         + "that the suppression should be generated for. The option cannot be used "
                         + "with other options and requires exactly one file to run on to be "
-                        + "specified. ATTENTION: generated result will have few queries, joined "
+                        + "specified. Note that the generated result will have few queries, joined "
                         + "by pipe(|). Together they will match all AST nodes on "
                         + "specified line and column. You need to choose only one and recheck "
                         + "that it works. Usage of all of them is also ok, but might result in "
@@ -723,35 +723,32 @@ private static final class CliOptions {
 
         /** Option that controls whether to print the AST of the file. */
         @Option(names = {"-t", "--tree"},
-                description = "Prints Abstract Syntax Tree(AST) of the checked file. The option "
-                        + "cannot be used other options and requires exactly one file to run on "
-                        + "to be specified.")
+                description = "This option is used to display the Abstract Syntax Tree (AST) "
+                        + "without any comments of the specified file. It can only be used on "
+                        + "a single file and cannot be combined with other options.")
         private boolean printAst;
 
         /** Option that controls whether to print the AST of the file including comments. */
         @Option(names = {"-T", "--treeWithComments"},
-                description = "Prints Abstract Syntax Tree(AST) with comment nodes "
-                        + "of the checked file. The option cannot be used with other options "
-                        + "and requires exactly one file to run on to be specified.")
+                description = "This option is used to display the Abstract Syntax Tree (AST) "
+                        + "with comment nodes excluding Javadoc of the specified file. It can only"
+                        + " be used on a single file and cannot be combined with other options.")
         private boolean printAstWithComments;
 
         /** Option that controls whether to print the parse tree of the javadoc comment. */
         @Option(names = {"-j", "--javadocTree"},
-                description = "Prints Parse Tree of the Javadoc comment. "
-                        + "The file have to contain only Javadoc comment content without "
-                        + "including '/**' and '*/' at the beginning and at the end respectively. "
-                        + "The option cannot be used other options and requires exactly one file "
-                        + "to run on to be specified.")
+                description = "This option is used to print the Parse Tree of the Javadoc comment."
+                        + " The file has to contain only Javadoc comment content "
+                        + "excluding '/**' and '*/' at the beginning and at the end respectively. "
+                        + "It can only be used on a single file and cannot be combined "
+                        + "with other options.")
         private boolean printJavadocTree;
 
         /** Option that controls whether to print the full AST of the file. */
         @Option(names = {"-J", "--treeWithJavadoc"},
-                description = "Prints Abstract Syntax Tree(AST) with Javadoc nodes "
-                        + "and comment nodes of the checked file. Attention that line number and "
-                        + "columns will not be the same as it is a file due to the fact that each "
-                        + "javadoc comment is parsed separately from java file. The option cannot "
-                        + "be used with other options and requires exactly one file to run on to "
-                        + "be specified.")
+                description = "This option is used to display the Abstract Syntax Tree (AST) "
+                        + "with Javadoc nodes of the specified file. It can only be used on a "
+                        + "single file and cannot be combined with other options.")
         private boolean printTreeWithJavadoc;
 
         /** Option that controls whether to print debug info. */
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.java
index c5855f7ae70..04b1defd256 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLogger.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java
index c8aae3e2ab5..4681ee36364 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ModuleFactory.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java
index 15d8f1ccf61..d0d13d6ad68 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
index c46649e3dcf..d0cab1e2c56 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PackageObjectFactory.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,6 +28,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -187,11 +188,7 @@ public Object createModule(String name) throws CheckstyleException {
             instance = createFromStandardCheckSet(name);
             // find the name in third party map
             if (instance == null) {
-                if (thirdPartyNameToFullModuleNames == null) {
-                    thirdPartyNameToFullModuleNames =
-                            generateThirdPartyNameToFullModuleName(moduleClassLoader);
-                }
-                instance = createObjectFromMap(name, thirdPartyNameToFullModuleNames);
+                instance = createObjectFromClassPath(name);
             }
         }
         if (instance == null) {
@@ -241,19 +238,23 @@ private Object createFromStandardCheckSet(String name) throws CheckstyleExceptio
     }
 
     /**
-     * Create object with the help of the supplied map.
+     * Create object with the help of the classpath.
      *
      * @param name name of module.
-     * @param map the supplied map.
      * @return instance of module if it is found in modules map and no ambiguous classes exist.
      * @throws CheckstyleException if the class fails to instantiate or there are ambiguous classes.
      */
-    private Object createObjectFromMap(String name, Map<String, Set<String>> map)
+    private Object createObjectFromClassPath(String name)
             throws CheckstyleException {
-        final Set<String> fullModuleNames = map.get(name);
+        thirdPartyNameToFullModuleNames = lazyLoad(
+                thirdPartyNameToFullModuleNames,
+                () -> generateThirdPartyNameToFullModuleName(moduleClassLoader)
+        );
+        final Set<String> fullModuleNames = thirdPartyNameToFullModuleNames.get(name);
         Object instance = null;
         if (fullModuleNames == null) {
-            final Set<String> fullCheckModuleNames = map.get(name + CHECK_SUFFIX);
+            final Set<String> fullCheckModuleNames =
+                    thirdPartyNameToFullModuleNames.get(name + CHECK_SUFFIX);
             if (fullCheckModuleNames != null) {
                 instance = createObjectFromFullModuleNames(name, fullCheckModuleNames);
             }
@@ -388,7 +389,7 @@ private Object createModuleByTryInEachPackage(String name) throws CheckstyleExce
         final List<String> possibleNames = packages.stream()
             .map(packageName -> packageName + PACKAGE_SEPARATOR + name)
             .flatMap(className -> Stream.of(className, className + CHECK_SUFFIX))
-            .collect(Collectors.toList());
+            .collect(Collectors.toUnmodifiableList());
         Object instance = null;
         for (String possibleName : possibleNames) {
             instance = createObject(possibleName);
@@ -399,6 +400,25 @@ private Object createModuleByTryInEachPackage(String name) throws CheckstyleExce
         return instance;
     }
 
+    /**
+     * Initialize object by supplier if object is null.
+     *
+     * @param <T> type of object
+     * @param object object to initialize
+     * @param supplier function to initialize if object is null
+     * @return object as it was provided in method or initialized
+     */
+    private static <T> T lazyLoad(T object, Supplier<T> supplier) {
+        final T result;
+        if (object == null) {
+            result = supplier.get();
+        }
+        else {
+            result = object;
+        }
+        return result;
+    }
+
     /**
      * Fill short-to-full module names map.
      */
@@ -475,6 +495,8 @@ private static void fillChecksFromCodingPackage() {
                 BASE_PACKAGE + ".checks.coding.AvoidInlineConditionalsCheck");
         NAME_TO_FULL_MODULE_NAME.put("AvoidNoArgumentSuperConstructorCallCheck",
                 BASE_PACKAGE + ".checks.coding.AvoidNoArgumentSuperConstructorCallCheck");
+        NAME_TO_FULL_MODULE_NAME.put("ConstructorsDeclarationGroupingCheck",
+                BASE_PACKAGE + ".checks.coding.ConstructorsDeclarationGroupingCheck");
         NAME_TO_FULL_MODULE_NAME.put("CovariantEqualsCheck",
                 BASE_PACKAGE + ".checks.coding.CovariantEqualsCheck");
         NAME_TO_FULL_MODULE_NAME.put("DeclarationOrderCheck",
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java
index 68828a538c1..331869e6b45 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertiesExpander.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -48,7 +48,8 @@ public PropertiesExpander(Properties properties) {
         }
         values = properties.stringPropertyNames()
                 .stream()
-                .collect(Collectors.toMap(Function.identity(), properties::getProperty));
+                .collect(
+                    Collectors.toUnmodifiableMap(Function.identity(), properties::getProperty));
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
index caf685eaaea..a8d8d570ae8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,6 +41,7 @@
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import com.puppycrawl.tools.checkstyle.api.Configuration;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+import com.puppycrawl.tools.checkstyle.utils.OsSpecificUtil;
 
 /**
  * This class maintains a persistent(on file-system) store of the files
@@ -144,8 +145,9 @@ public void load() throws IOException {
     public void persist() throws IOException {
         final Path path = Paths.get(fileName);
         final Path directory = path.getParent();
+
         if (directory != null) {
-            Files.createDirectories(directory);
+            OsSpecificUtil.updateDirectory(directory);
         }
         try (OutputStream out = Files.newOutputStream(path)) {
             details.store(out, null);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java
index 0413e1a8175..eccec434e08 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyResolver.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyType.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyType.java
index 6d54aa86f8f..d8ed6ffa1fa 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyType.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyType.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java
index bfa2a879f70..82e848bd21d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/StatelessCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/StatelessCheck.java
index 77a9e5a45d7..6eefd501de6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/StatelessCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/StatelessCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java
index 7114eb8aeae..dbec81d96cf 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ThreadModeSettings.java b/src/main/java/com/puppycrawl/tools/checkstyle/ThreadModeSettings.java
index ec63ddb38ca..7d55c091feb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ThreadModeSettings.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ThreadModeSettings.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
index ae9a0e64648..df4fcfd078a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -388,9 +388,11 @@ public Set<String> getExternalResourceLocations() {
         return Stream.concat(filters.stream(),
                 Stream.concat(ordinaryChecks.stream(), commentChecks.stream()))
             .filter(ExternalResourceHolder.class::isInstance)
-            .map(ExternalResourceHolder.class::cast)
-            .flatMap(resource -> resource.getExternalResourceLocations().stream())
-            .collect(Collectors.toSet());
+            .flatMap(resource -> {
+                return ((ExternalResourceHolder) resource)
+                        .getExternalResourceLocations().stream();
+            })
+            .collect(Collectors.toUnmodifiableSet());
     }
 
     /**
@@ -425,7 +427,7 @@ private static SortedSet<AbstractCheck> createNewCheckSortedSet() {
                 Comparator.<AbstractCheck, String>comparing(check -> check.getClass().getName())
                         .thenComparing(AbstractCheck::getId,
                                 Comparator.nullsLast(Comparator.naturalOrder()))
-                        .thenComparing(AbstractCheck::hashCode));
+                        .thenComparingInt(AbstractCheck::hashCode));
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.java
index c8e1fd6736f..840a10c96e0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerAuditEvent.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerFilter.java
index aa905ed034a..9d408aac788 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalkerFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java
index 926e23e2072..c6b38751195 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XdocsPropertyType.java b/src/main/java/com/puppycrawl/tools/checkstyle/XdocsPropertyType.java
index 73897710cfa..6871826b8e5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/XdocsPropertyType.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/XdocsPropertyType.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java
index 440bc165f51..e20ded04447 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -32,6 +32,8 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
+import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
+
 /**
  * Contains the common implementation of a loader, for loading a configuration
  * from an XML file.
@@ -65,7 +67,8 @@ public class XmlLoader
      */
     protected XmlLoader(Map<String, String> publicIdToResourceNameMap)
             throws SAXException, ParserConfigurationException {
-        this.publicIdToResourceNameMap = Map.copyOf(publicIdToResourceNameMap);
+        this.publicIdToResourceNameMap =
+                UnmodifiableCollectionUtil.copyOfMap(publicIdToResourceNameMap);
         parser = createXmlReader(this);
     }
 
@@ -82,26 +85,16 @@ public void parseInputSource(InputSource inputSource)
     }
 
     @Override
-    public InputSource resolveEntity(String publicId, String systemId)
-            throws SAXException, IOException {
-        final String dtdResourceName;
-        if (publicId == null) {
-            dtdResourceName = null;
-        }
-        else {
-            dtdResourceName = publicIdToResourceNameMap.get(publicId);
-        }
-        final InputSource inputSource;
-        if (dtdResourceName == null) {
-            inputSource = super.resolveEntity(publicId, systemId);
-        }
-        else {
-            final ClassLoader loader =
-                    getClass().getClassLoader();
-            final InputStream dtdIs =
-                    loader.getResourceAsStream(dtdResourceName);
-
-            inputSource = new InputSource(dtdIs);
+    public InputSource resolveEntity(String publicId, String systemId) {
+        InputSource inputSource = null;
+        if (publicId != null) {
+            final String dtdResourceName = publicIdToResourceNameMap.get(publicId);
+
+            if (dtdResourceName != null) {
+                final ClassLoader loader = getClass().getClassLoader();
+                final InputStream dtdIs = loader.getResourceAsStream(dtdResourceName);
+                inputSource = new InputSource(dtdIs);
+            }
         }
         return inputSource;
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.java
index 6a9198d53e3..4b0fbae038a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.java b/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.java
index aa14346dbac..43c11a51448 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListener.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java b/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java
index 33d75e3d368..b7a95d0ea9e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -445,9 +445,9 @@ private Properties createOverridingProperties() {
     }
 
     /**
-     * Return the list of listeners set in this task.
+     * Return the array of listeners set in this task.
      *
-     * @return the list of listeners.
+     * @return the array of listeners.
      * @throws BuildException if the listeners could not be created.
      */
     private AuditListener[] getListeners() {
@@ -587,7 +587,7 @@ private List<File> retrieveAllScannedFiles(DirectoryScanner scanner, int logInde
         return Arrays.stream(fileNames)
             .map(name -> scanner.getBasedir() + File.separator + name)
             .map(File::new)
-            .collect(Collectors.toList());
+            .collect(Collectors.toUnmodifiableList());
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ant/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/ant/package-info.java
index de5e2d6d771..49dc9bfc11a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ant/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ant/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java
index fc988630918..8d8aa657f3a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
index 4a36b036b4d..cd8a44f6014 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -54,7 +54,7 @@ public abstract class AbstractFileSetCheck
     private MessageDispatcher messageDispatcher;
 
     /**
-     * Specify the file type extension of files to process.
+     * Specify the file extensions of the files to process.
      * Default is uninitialized as the value is inherited from the parent module.
      */
     private String[] fileExtensions;
@@ -163,7 +163,7 @@ public String[] getFileExtensions() {
     }
 
     /**
-     * Setter to specify the file type extension of files to process.
+     * Setter to specify the file extensions of the files to process.
      *
      * @param extensions the set of file extensions. A missing
      *         initial '.' character of an extension is automatically added.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java
index 6d8efe749fb..816bf5b6236 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditEvent.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditEvent.java
index ab02ab1ecfb..c5e0f2461b2 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditEvent.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditEvent.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditListener.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditListener.java
index 1a94c26d6f6..b9207d0aa98 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditListener.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AuditListener.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
index 82a340a84b7..20f34336c31 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilter.java
index 50f43b9241b..bdc08ce4777 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java
index cbdb2e8c3b0..eef36ab215e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/CheckstyleException.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/CheckstyleException.java
index efc1ee50578..bc878b01cef 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/CheckstyleException.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/CheckstyleException.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java
index fd9eae868f1..a4cfe7a9c96 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Configurable.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Configurable.java
index 61f256ca3fd..a1ce8818d3e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Configurable.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Configurable.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Configuration.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Configuration.java
index 5cb02308b52..83986662a62 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Configuration.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Configuration.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java
index 411139a00c1..44464210e02 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Context.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Contextualizable.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Contextualizable.java
index ae3b8c586f6..a347889ff35 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Contextualizable.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Contextualizable.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java
index f23bc546b35..e803762975f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java
index f821383b23e..3e143c14c5b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.java
index 0c8281269fb..c742a28af86 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/ExternalResourceHolder.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
index c43277fb827..fdf5a57fa8e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileSetCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileSetCheck.java
index 4158f5ad58d..86ff8f345bd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileSetCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileSetCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java
index 259da68789d..d1b76c64a05 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Filter.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Filter.java
index 749eba59915..3e00cda953a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Filter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Filter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java
index 98214784433..947bee0f292 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java
index 0a4a57c0c26..0745f5c21e8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -74,6 +74,8 @@ public static FullIdent createFullIdent(DetailAST ast) {
      *
      * @param full the FullIdent to add to
      * @param ast the node to recurse from
+     * @noinspection TailRecursion
+     * @noinspectionreason TailRecursion - until issue #14814
      */
     private static void extractFullIdent(FullIdent full, DetailAST ast) {
         if (ast != null) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.java
index 60c992bdbb4..503dad78dfc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,11 +43,11 @@ public final class JavadocTokenTypes {
      * <pre>{@code @return true if file exists}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[4x3] : [@return true if file exists]
-     *       |--RETURN_LITERAL[4x3] : [@return]
-     *       |--WS[4x10] : [ ]
-     *       |--DESCRIPTION[4x11] : [true if file exists]
-     *           |--TEXT[4x11] : [true if file exists]
+     * JAVADOC_TAG -> JAVADOC_TAG
+     *  |--RETURN_LITERAL -> @return
+     *  |--WS ->
+     *  `--DESCRIPTION -> DESCRIPTION
+     *      |--TEXT -> true if file exists
      * }</pre>
      *
      * @see
@@ -63,14 +63,14 @@ public final class JavadocTokenTypes {
      * <p>Such Javadoc tag can have one argument - {@link #DESCRIPTION}</p>
      *
      * <p><b>Example:</b></p>
-     * <pre>{@code @deprecated it is deprecated method}</pre>
+     * <pre>{@code @deprecated It is deprecated method}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@deprecated it is deprecated method]
-     *   |--DEPRECATED_LITERAL[3x0] : [@deprecated]
-     *   |--WS[3x11] : [ ]
-     *   |--DESCRIPTION[3x12] : [it is deprecated method]
-     *       |--TEXT[3x12] : [it is deprecated method]
+     * JAVADOC_TAG -> JAVADOC_TAG
+     *  |--DEPRECATED_LITERAL -> @deprecated
+     *  |--WS ->
+     *  `--DESCRIPTION -> DESCRIPTION
+     *      |--TEXT -> It is deprecated method
      * }</pre>
      *
      * @see
@@ -89,11 +89,11 @@ public final class JavadocTokenTypes {
      * <pre>{@code @since 3.4 RELEASE}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@since 3.4 RELEASE]
-     *       |--SINCE_LITERAL[3x0] : [@since]
-     *       |--WS[3x6] : [ ]
-     *       |--DESCRIPTION[3x7] : [3.4 RELEASE]
-     *           |--TEXT[3x7] : [3.4 RELEASE]
+     * JAVADOC_TAG -> JAVADOC_TAG
+     *  |--SINCE_LITERAL -> @since
+     *  |--WS ->
+     *  `--DESCRIPTION -> DESCRIPTION
+     *      |--TEXT -> 3.4 RELEASE
      * }</pre>
      *
      * @see
@@ -109,14 +109,14 @@ public final class JavadocTokenTypes {
      * <p>Such Javadoc tag can have one argument - {@link #DESCRIPTION}</p>
      *
      * <p><b>Example:</b></p>
-     * <pre>{@code @serialData two values of Integer type}</pre>
+     * <pre>{@code @serialData Two values of Integer type}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@serialData two values of Integer type ]
-     *       |--SERIAL_DATA_LITERAL[3x0] : [@serialData]
-     *       |--WS[3x11] : [ ]
-     *       |--DESCRIPTION[3x12] : [two values of Integer type ]
-     *           |--TEXT[3x12] : [two values of Integer type ]
+     * JAVADOC_TAG -> JAVADOC_TAG
+     *  |--SERIAL_DATA_LITERAL -> @serialData
+     *  |--WS ->
+     *  `--DESCRIPTION -> DESCRIPTION
+     *      |--TEXT -> Two values of Integer type
      * }
      * </pre>
      *
@@ -141,15 +141,15 @@ public final class JavadocTokenTypes {
      * <pre>{@code @serialField counter Integer objects counter}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@serialField counter Integer objects counter]
-     *       |--SERIAL_FIELD_LITERAL[3x0] : [@serialField]
-     *       |--WS[3x12] : [ ]
-     *       |--FIELD_NAME[3x13] : [counter]
-     *       |--WS[3x20] : [ ]
-     *       |--FIELD_TYPE[3x21] : [Integer]
-     *       |--WS[3x28] : [ ]
-     *       |--DESCRIPTION[3x29] : [objects counter]
-     *           |--TEXT[3x29] : [objects counter]
+     * JAVADOC_TAG -> JAVADOC_TAG
+     *  |--SERIAL_FIELD_LITERAL -> @serialField
+     *  |--WS ->
+     *  |--FIELD_NAME -> counter
+     *  |--WS ->
+     *  |--FIELD_TYPE -> Integer
+     *  |--WS ->
+     *  `--DESCRIPTION -> DESCRIPTION
+     *      |--TEXT -> objects counter
      * }</pre>
      *
      * @see
@@ -169,16 +169,16 @@ public final class JavadocTokenTypes {
      * </ol>
      *
      * <p><b>Example:</b></p>
-     * <pre>{@code @param T The bar.}</pre>
+     * <pre>{@code @param value The parameter of method.}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[4x3] : [@param T The bar.]
-     *       |--PARAM_LITERAL[4x3] : [@param]
-     *       |--WS[4x9] : [ ]
-     *       |--PARAMETER_NAME[4x10] : [T]
-     *       |--WS[4x11] : [ ]
-     *       |--DESCRIPTION[4x12] : [The bar.]
-     *           |--TEXT[4x12] : [The bar.]
+     * JAVADOC_TAG -> JAVADOC_TAG
+     *  |--PARAM_LITERAL -> @param
+     *  |--WS ->
+     *  |--PARAMETER_NAME -> value
+     *  |--WS ->
+     *  `--DESCRIPTION -> DESCRIPTION
+     *      |--TEXT -> The parameter of method.
      * }</pre>
      *
      * @see
@@ -197,21 +197,17 @@ public final class JavadocTokenTypes {
      * <pre>{@code @see org.apache.utils.Lists.Comparator#compare(Object)}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@see org.apache.utils.Lists.Comparator#compare(Object)]
-     *       |--SEE_LITERAL[3x0] : [@see]
-     *       |--WS[3x4] : [ ]
-     *       |--REFERENCE[3x5] : [org.apache.utils.Lists.Comparator#compare(Object)]
-     *           |--PACKAGE_CLASS[3x5] : [org.apache.utils]
-     *           |--DOT[3x21] : [.]
-     *           |--CLASS[3x22] : [Lists]
-     *           |--DOT[3x27] : [.]
-     *           |--CLASS[3x28] : [Comparator]
-     *           |--HASH[3x38] : [#]
-     *           |--MEMBER[3x39] : [compare]
-     *           |--PARAMETERS[3x46] : [(Object)]
-     *               |--LEFT_BRACE[3x46] : [(]
-     *               |--ARGUMENT[3x47] : [Object]
-     *               |--RIGHT_BRACE[3x53] : [)]
+     *   JAVADOC_TAG -> JAVADOC_TAG
+     *    |--SEE_LITERAL -> @see
+     *    |--WS ->
+     *    |--REFERENCE -> REFERENCE
+     *        |--PACKAGE_CLASS -> org.apache.utils.Lists.Comparator
+     *        |--HASH -> #
+     *        |--MEMBER -> compare
+     *        `--PARAMETERS -> PARAMETERS
+     *            |--LEFT_BRACE -> (
+     *            |--ARGUMENT -> Object
+     *            `--RIGHT_BRACE -> )
      * }</pre>
      *
      * @see
@@ -264,11 +260,11 @@ public final class JavadocTokenTypes {
      * <pre>{@code @version 1.3}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@version 1.3]
-     *       |--VERSION_LITERAL[3x0] : [@version]
-     *       |--WS[3x8] : [ ]
-     *       |--DESCRIPTION[3x9] : [1.3]
-     *           |--TEXT[3x9] : [1.3]
+     *   JAVADOC_TAG -> JAVADOC_TAG
+     *    |--VERSION_LITERAL -> @version
+     *    |--WS ->
+     *    `--DESCRIPTION -> DESCRIPTION
+     *        |--TEXT -> 1.3
      * }</pre>
      *
      * @see
@@ -287,13 +283,13 @@ public final class JavadocTokenTypes {
      * <pre>{@code @exception SQLException if query is not correct}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@exception SQLException if query is not correct]
-     *       |--EXCEPTION_LITERAL[3x0] : [@exception]
-     *       |--WS[3x10] : [ ]
-     *       |--CLASS_NAME[3x11] : [SQLException]
-     *       |--WS[3x23] : [ ]
-     *       |--DESCRIPTION[3x24] : [if query is not correct]
-     *           |--TEXT[3x24] : [if query is not correct]
+     *   JAVADOC_TAG -> JAVADOC_TAG
+     *    |--EXCEPTION_LITERAL -> @exception
+     *    |--WS ->
+     *    |--CLASS_NAME -> SQLException
+     *    |--WS ->
+     *    `--DESCRIPTION -> DESCRIPTION
+     *        `--TEXT -> if query is not correct
      * }</pre>
      *
      * @see
@@ -337,11 +333,12 @@ public final class JavadocTokenTypes {
      * <pre>{@code @author Baratali Izmailov}</pre>
      * <b>Tree:</b>
      * <pre>{@code
-     *   |--JAVADOC_TAG[3x0] : [@author Baratali Izmailov]
-     *       |--AUTHOR_LITERAL[3x0] : [@author]
-     *       |--WS[3x7] : [ ]
-     *       |--DESCRIPTION[3x8] : [Baratali Izmailov]
-     *           |--TEXT[3x8] : [Baratali Izmailov]
+     *   --JAVADOC_TAG -> JAVADOC_TAG
+     *      |--AUTHOR_LITERAL -> @author
+     *      |--WS ->
+     *      `--DESCRIPTION -> DESCRIPTION
+     *          |--TEXT -> Baratali Izmailov
+     *          |--NEWLINE -> \r\n
      * }</pre>
      *
      * @see
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java
index e46eeca9d47..7ef76b50c80 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/LineColumn.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/MessageDispatcher.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/MessageDispatcher.java
index f9ae36ef395..07ef0a7c32c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/MessageDispatcher.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/MessageDispatcher.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/RootModule.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/RootModule.java
index fa992a4d716..a9453d1b716 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/RootModule.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/RootModule.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Scope.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Scope.java
index 9d2125ccdb1..9f6a432f05c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Scope.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Scope.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevel.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevel.java
index 80e10cd12e6..e91f521e8c5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevel.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
index bc3e9e5c358..790cb013573 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/TextBlock.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/TextBlock.java
index 2a28a409af9..95fbf2c071e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/TextBlock.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/TextBlock.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java
index e91c987eb74..2c499776b90 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,7 +37,7 @@ public final class TokenTypes {
      * This is the root node for the source file.  It's children
      * are an optional package definition, zero or more import statements,
      * and zero or more type declarations.
-      * <p>For example:</p>
+     * <p>For example:</p>
      * <pre>
      * import java.util.List;
      *
@@ -681,23 +681,18 @@ public final class TokenTypes {
      * </pre>
      * <p>parses as:</p>
      * <pre>
-     * +--PARAMETERS
-     *     |
-     *     +--PARAMETER_DEF
-     *         |
-     *         +--MODIFIERS
-     *         +--TYPE
-     *             |
-     *             +--LITERAL_INT (int)
-     *         +--IDENT (start)
-     *     +--COMMA (,)
-     *     +--PARAMETER_DEF
-     *         |
-     *         +--MODIFIERS
-     *         +--TYPE
-     *             |
-     *             +--LITERAL_INT (int)
-     *         +--IDENT (end)
+     * PARAMETERS -&gt; PARAMETERS
+     *  |--PARAMETER_DEF -&gt; PARAMETER_DEF
+     *  |   |--MODIFIERS -&gt; MODIFIERS
+     *  |   |--TYPE -&gt; TYPE
+     *  |   |   `--LITERAL_INT -&gt; int
+     *  |   `--IDENT -&gt; start
+     *  |--COMMA -&gt; ,
+     *  `--PARAMETER_DEF -&gt; PARAMETER_DEF
+     *      |--MODIFIERS -&gt; MODIFIERS
+     *      |--TYPE -&gt; TYPE
+     *      |   `--LITERAL_INT -&gt; int
+     *      `--IDENT -&gt; end
      * </pre>
      *
      * @see #PARAMETER_DEF
@@ -4288,119 +4283,115 @@ public final class TokenTypes {
      * <p>For example:</p>
      *
      * <pre>
-     * new ArrayList(50)
+     * List&lt;String&gt; l = new ArrayList&lt;String&gt;();
      * </pre>
      *
      * <p>parses as:</p>
      * <pre>
-     * LITERAL_NEW -&gt; new
-     *  |--IDENT -&gt; ArrayList
-     *  |--TYPE_ARGUMENTS -&gt; TYPE_ARGUMENTS
-     *  |   |--GENERIC_START -&gt; &lt;
-     *  |   `--GENERIC_END -&gt; &gt;
-     *  |--LPAREN -&gt; (
-     *  |--ELIST -&gt; ELIST
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   |--IDENT -&gt; List
+     *  |   `--TYPE_ARGUMENTS -&gt; TYPE_ARGUMENTS
+     *  |       |--GENERIC_START -&gt; &lt;
+     *  |       |--TYPE_ARGUMENT -&gt; TYPE_ARGUMENT
+     *  |       |   `--IDENT -&gt; String
+     *  |       `--GENERIC_END -&gt; &gt;
+     *  |--IDENT -&gt; l
+     *  |--ASSIGN -&gt; =
      *  |   `--EXPR -&gt; EXPR
-     *  |       `--NUM_INT -&gt; 50
-     *  `--RPAREN -&gt; )
+     *  |       `--LITERAL_NEW -&gt; new
+     *  |           |--IDENT -&gt; ArrayList
+     *  |           |--TYPE_ARGUMENTS -&gt; TYPE_ARGUMENTS
+     *  |           |   |--GENERIC_START -&gt; &lt;
+     *  |           |   |--TYPE_ARGUMENT -&gt; TYPE_ARGUMENT
+     *  |           |   |   `--IDENT -&gt; String
+     *  |           |   `--GENERIC_END -&gt; &gt;
+     *  |           |--LPAREN -&gt; (
+     *  |           |--ELIST -&gt; ELIST
+     *  |           `--RPAREN -&gt; )
+     *  `--SEMI -&gt; ;
      * </pre>
      *
      * <p>For example:</p>
      * <pre>
-     * new float[]
-     *   {
-     *     3.0f,
-     *     4.0f
-     *   };
+     * String[] strings = new String[3];
      * </pre>
      *
      * <p>parses as:</p>
      * <pre>
-     * +--LITERAL_NEW (new)
-     *     |
-     *     +--LITERAL_FLOAT (float)
-     *     +--ARRAY_DECLARATOR ([)
-     *     +--ARRAY_INIT ({)
-     *         |
-     *         +--EXPR
-     *             |
-     *             +--NUM_FLOAT (3.0f)
-     *         +--COMMA (,)
-     *         +--EXPR
-     *             |
-     *             +--NUM_FLOAT (4.0f)
-     *         +--RCURLY (})
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   |--IDENT -&gt; String
+     *  |   `--ARRAY_DECLARATOR -&gt; [
+     *  |       `--RBRACK -&gt; ]
+     *  |--IDENT -&gt; strings
+     *  |--ASSIGN -&gt; =
+     *  |   `--EXPR -&gt; EXPR
+     *  |       `--LITERAL_NEW -&gt; new
+     *  |           |--IDENT -&gt; String
+     *  |           `--ARRAY_DECLARATOR -&gt; [
+     *  |               |--EXPR -&gt; EXPR
+     *  |               |   `--NUM_INT -&gt; 3
+     *  |               `--RBRACK -&gt; ]
+     *  `--SEMI -&gt; ;
      * </pre>
      *
      * <p>For example:</p>
      * <pre>
-     * new FilenameFilter()
-     * {
-     *   public boolean accept(File dir, String name)
-     *   {
-     *     return name.endsWith(".java");
-     *   }
-     * }
+     * Supplier&lt;Integer&gt; s = new Supplier&lt;&gt;() {
+     *     &#064;Override
+     *     public Integer get() {
+     *         return 42;
+     *     }
+     * };
      * </pre>
      *
      * <p>parses as:</p>
      * <pre>
-     * +--LITERAL_NEW (new)
-     *     |
-     *     +--IDENT (FilenameFilter)
-     *     +--LPAREN (()
-     *     +--ELIST
-     *     +--RPAREN ())
-     *     +--OBJBLOCK
-     *         |
-     *         +--LCURLY ({)
-     *         +--METHOD_DEF
-     *             |
-     *             +--MODIFIERS
-     *                 |
-     *                 +--LITERAL_PUBLIC (public)
-     *             +--TYPE
-     *                 |
-     *                 +--LITERAL_BOOLEAN (boolean)
-     *             +--IDENT (accept)
-     *             +--PARAMETERS
-     *                 |
-     *                 +--PARAMETER_DEF
-     *                     |
-     *                     +--MODIFIERS
-     *                     +--TYPE
-     *                         |
-     *                         +--IDENT (File)
-     *                     +--IDENT (dir)
-     *                 +--COMMA (,)
-     *                 +--PARAMETER_DEF
-     *                     |
-     *                     +--MODIFIERS
-     *                     +--TYPE
-     *                         |
-     *                         +--IDENT (String)
-     *                     +--IDENT (name)
-     *             +--SLIST ({)
-     *                 |
-     *                 +--LITERAL_RETURN (return)
-     *                     |
-     *                     +--EXPR
-     *                         |
-     *                         +--METHOD_CALL (()
-     *                             |
-     *                             +--DOT (.)
-     *                                 |
-     *                                 +--IDENT (name)
-     *                                 +--IDENT (endsWith)
-     *                             +--ELIST
-     *                                 |
-     *                                 +--EXPR
-     *                                     |
-     *                                     +--STRING_LITERAL (".java")
-     *                             +--RPAREN ())
-     *                     +--SEMI (;)
-     *                 +--RCURLY (})
-     *         +--RCURLY (})
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   |--IDENT -&gt; Supplier
+     *  |   `--TYPE_ARGUMENTS -&gt; TYPE_ARGUMENTS
+     *  |       |--GENERIC_START -&gt; &lt;
+     *  |       |--TYPE_ARGUMENT -&gt; TYPE_ARGUMENT
+     *  |       |   `--IDENT -&gt; Integer
+     *  |       `--GENERIC_END -&gt; &gt;
+     *  |--IDENT -&gt; s
+     *  |--ASSIGN -&gt; =
+     *  |   `--EXPR -&gt; EXPR
+     *  |       `--LITERAL_NEW -&gt; new
+     *  |           |--IDENT -&gt; Supplier
+     *  |           |--TYPE_ARGUMENTS -&gt; TYPE_ARGUMENTS
+     *  |           |   |--GENERIC_START -&gt; &lt;
+     *  |           |   `--GENERIC_END -&gt; &gt;
+     *  |           |--LPAREN -&gt; (
+     *  |           |--ELIST -&gt; ELIST
+     *  |           |--RPAREN -&gt; )
+     *  |           `--OBJBLOCK -&gt; OBJBLOCK
+     *  |               |--LCURLY -&gt; {
+     *  |               |--METHOD_DEF -&gt; METHOD_DEF
+     *  |               |   |--MODIFIERS -&gt; MODIFIERS
+     *  |               |   |   |--ANNOTATION -&gt; ANNOTATION
+     *  |               |   |   |   |--AT -&gt; @
+     *  |               |   |   |   `--IDENT -&gt; Override
+     *  |               |   |   `--LITERAL_PUBLIC -&gt; public
+     *  |               |   |--TYPE -&gt; TYPE
+     *  |               |   |   `--IDENT -&gt; Integer
+     *  |               |   |--IDENT -&gt; get
+     *  |               |   |--LPAREN -&gt; (
+     *  |               |   |--PARAMETERS -&gt; PARAMETERS
+     *  |               |   |--RPAREN -&gt; )
+     *  |               |   `--SLIST -&gt; {
+     *  |               |       |--LITERAL_RETURN -&gt; return
+     *  |               |       |   |--EXPR -&gt; EXPR
+     *  |               |       |   |   `--NUM_INT -&gt; 42
+     *  |               |       |   `--SEMI -&gt; ;
+     *  |               |       `--RCURLY -&gt; }
+     *  |               `--RCURLY -&gt; }
+     *  `--SEMI -&gt; ;
      * </pre>
      *
      * @see #IDENT
@@ -5508,9 +5499,8 @@ public final class TokenTypes {
      * Beginning of single-line comment: '//'.
      *
      * <pre>
-     * +--SINGLE_LINE_COMMENT
-     *         |
-     *         +--COMMENT_CONTENT
+     * SINGLE_LINE_COMMENT -&gt; //
+     *  `--COMMENT_CONTENT -&gt; \r\n
      * </pre>
      *
      * <p>For example:</p>
@@ -5795,7 +5785,9 @@ public final class TokenTypes {
             JavaLanguageLexer.COMPACT_CTOR_DEF;
 
     /**
-     * Beginning of a Java 14 Text Block literal,
+     * Text blocks are a new feature added to to Java SE 15 and later
+     * that will make writing multi-line strings much easier and cleaner.
+     * Beginning of a Java 15 Text Block literal,
      * delimited by three double quotes.
      *
      * <p>For example:</p>
@@ -5814,9 +5806,9 @@ public final class TokenTypes {
      * |   `--ASSIGN -&gt; =
      * |       `--EXPR -&gt; EXPR
      * |           `--TEXT_BLOCK_LITERAL_BEGIN -&gt; """
-     * |               |--TEXT_BLOCK_CONTENT -&gt; \r\n                 Hello, world!\r\n
+     * |               |--TEXT_BLOCK_CONTENT -&gt; \n                Hello, world!\n
      * |               `--TEXT_BLOCK_LITERAL_END -&gt; """
-     * |--SEMI -&gt; ;
+     * `--SEMI -&gt; ;
      * </pre>
      *
      * @since 8.36
@@ -5825,7 +5817,7 @@ public final class TokenTypes {
             JavaLanguageLexer.TEXT_BLOCK_LITERAL_BEGIN;
 
     /**
-     * Content of a Java 14 text block. This is a
+     * Content of a Java 15 text block. This is a
      * sequence of characters, possibly escaped with '\'. Actual line terminators
      * are represented by '\n'.
      *
@@ -5847,7 +5839,7 @@ public final class TokenTypes {
      * |           `--TEXT_BLOCK_LITERAL_BEGIN -&gt; """
      * |               |--TEXT_BLOCK_CONTENT -&gt; \n                Hello, world!\n
      * |               `--TEXT_BLOCK_LITERAL_END -&gt; """
-     * |--SEMI -&gt; ;
+     * `--SEMI -&gt; ;
      * </pre>
      *
      * @since 8.36
@@ -5856,7 +5848,7 @@ public final class TokenTypes {
             JavaLanguageLexer.TEXT_BLOCK_CONTENT;
 
     /**
-     * End of a Java 14 text block literal, delimited by three
+     * End of a Java 15 text block literal, delimited by three
      * double quotes.
      *
      * <p>For example:</p>
@@ -5867,17 +5859,17 @@ public final class TokenTypes {
      * </pre>
      * <p>parses as:</p>
      * <pre>
-     * |--VARIABLE_DEF
-     * |   |--MODIFIERS
-     * |   |--TYPE
-     * |   |   `--IDENT (String)
-     * |   |--IDENT (hello)
-     * |   |--ASSIGN (=)
-     * |   |   `--EXPR
-     * |   |       `--TEXT_BLOCK_LITERAL_BEGIN (""")
-     * |   |           |--TEXT_BLOCK_CONTENT (\n                Hello, world!\n                    )
-     * |   |           `--TEXT_BLOCK_LITERAL_END (""")
-     * |   `--SEMI (;)
+     * |--VARIABLE_DEF -&gt; VARIABLE_DEF
+     * |   |--MODIFIERS -&gt; MODIFIERS
+     * |   |--TYPE -&gt; TYPE
+     * |   |   `--IDENT -&gt; String
+     * |   |--IDENT -&gt; hello
+     * |   `--ASSIGN -&gt; =
+     * |       `--EXPR -&gt; EXPR
+     * |           `--TEXT_BLOCK_LITERAL_BEGIN -&gt; """
+     * |               |--TEXT_BLOCK_CONTENT -&gt; \n                Hello, world!\n
+     * |               `--TEXT_BLOCK_LITERAL_END -&gt; """
+     * `--SEMI -&gt; ;
      * </pre>
      *
      * @since 8.36
@@ -6469,6 +6461,328 @@ public final class TokenTypes {
     public static final int RECORD_PATTERN_COMPONENTS =
             JavaLanguageLexer.RECORD_PATTERN_COMPONENTS;
 
+    /**
+     * A string template opening delimiter. This element ({@code "}) appears
+     * at the beginning of a string template.
+     * <p>For example:</p>
+     * <pre>
+     *     String s = STR."Hello, \{firstName + " " + lastName}!";
+     * </pre>
+     * <p>parses as:</p>
+     * <pre>
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   `--IDENT -&gt; String
+     *  |--IDENT -&gt; s
+     *  `--ASSIGN -&gt; =
+     *      `--EXPR -&gt; EXPR
+     *          `--DOT -&gt; .
+     *              |--IDENT -&gt; STR
+     *              `--STRING_TEMPLATE_BEGIN -&gt; "
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; Hello,
+     *                  |--EMBEDDED_EXPRESSION_BEGIN -&gt; \{
+     *                  |--EMBEDDED_EXPRESSION -&gt; EMBEDDED_EXPRESSION
+     *                  |   `--PLUS -&gt; +
+     *                  |       |--PLUS -&gt; +
+     *                  |       |   |--IDENT -&gt; firstName
+     *                  |       |   `--STRING_LITERAL -&gt; " "
+     *                  |       `--IDENT -&gt; lastName
+     *                  |--EMBEDDED_EXPRESSION_END -&gt; }
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; !
+     *                  `--STRING_TEMPLATE_END -&gt; "
+     * </pre>
+     *
+     * @see #STRING_TEMPLATE_END
+     * @see #STRING_TEMPLATE_CONTENT
+     * @see #EMBEDDED_EXPRESSION_BEGIN
+     * @see #EMBEDDED_EXPRESSION
+     * @see #EMBEDDED_EXPRESSION_END
+     * @see #STRING_LITERAL
+     *
+     * @since 10.13.0
+     */
+    public static final int STRING_TEMPLATE_BEGIN =
+            JavaLanguageLexer.STRING_TEMPLATE_BEGIN;
+
+    /**
+     * A string template closing delimiter. This element ({@code "}) appears
+     * at the end of a string template.
+     * <p>For example:</p>
+     * <pre>
+     *     String s = STR."Hello, \{firstName + " " + lastName}!";
+     * </pre>
+     * <p>parses as:</p>
+     * <pre>
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   `--IDENT -&gt; String
+     *  |--IDENT -&gt; s
+     *  `--ASSIGN -&gt; =
+     *      `--EXPR -&gt; EXPR
+     *          `--DOT -&gt; .
+     *              |--IDENT -&gt; STR
+     *              `--STRING_TEMPLATE_BEGIN -&gt; "
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; Hello,
+     *                  |--EMBEDDED_EXPRESSION_BEGIN -&gt; \{
+     *                  |--EMBEDDED_EXPRESSION -&gt; EMBEDDED_EXPRESSION
+     *                  |   `--PLUS -&gt; +
+     *                  |       |--PLUS -&gt; +
+     *                  |       |   |--IDENT -&gt; firstName
+     *                  |       |   `--STRING_LITERAL -&gt; " "
+     *                  |       `--IDENT -&gt; lastName
+     *                  |--EMBEDDED_EXPRESSION_END -&gt; }
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; !
+     *                  `--STRING_TEMPLATE_END -&gt; "
+     * </pre>
+     *
+     * @see #STRING_TEMPLATE_END
+     * @see #STRING_TEMPLATE_CONTENT
+     * @see #EMBEDDED_EXPRESSION_BEGIN
+     * @see #EMBEDDED_EXPRESSION
+     * @see #EMBEDDED_EXPRESSION_END
+     * @see #STRING_LITERAL
+     *
+     * @since 10.13.0
+     */
+    public static final int STRING_TEMPLATE_END =
+            JavaLanguageLexer.STRING_TEMPLATE_END;
+
+    /**
+     * The (possibly empty) content of a string template. A given string
+     * template may have more than one node of this type.
+     * <p>For example:</p>
+     * <pre>
+     *     String s = STR."Hello, \{firstName + " " + lastName}";
+     * </pre>
+     * <p>parses as:</p>
+     * <pre>
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   `--IDENT -&gt; String
+     *  |--IDENT -&gt; s
+     *  `--ASSIGN -&gt; =
+     *      `--EXPR -&gt; EXPR
+     *          `--DOT -&gt; .
+     *              |--IDENT -&gt; STR
+     *              `--STRING_TEMPLATE_BEGIN -&gt; "
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; Hello,
+     *                  |--EMBEDDED_EXPRESSION_BEGIN -&gt; \{
+     *                  |--EMBEDDED_EXPRESSION -&gt; EMBEDDED_EXPRESSION
+     *                  |   `--PLUS -&gt; +
+     *                  |       |--PLUS -&gt; +
+     *                  |       |   |--IDENT -&gt; firstName
+     *                  |       |   `--STRING_LITERAL -&gt; " "
+     *                  |       `--IDENT -&gt; lastName
+     *                  |--EMBEDDED_EXPRESSION_END -&gt; }
+     *                  `--STRING_TEMPLATE_END -&gt; "
+     * </pre>
+     *
+     * @see #STRING_TEMPLATE_END
+     * @see #STRING_TEMPLATE_CONTENT
+     * @see #EMBEDDED_EXPRESSION_BEGIN
+     * @see #EMBEDDED_EXPRESSION
+     * @see #EMBEDDED_EXPRESSION_END
+     * @see #STRING_LITERAL
+     *
+     * @since 10.13.0
+     */
+    public static final int STRING_TEMPLATE_CONTENT =
+            JavaLanguageLexer.STRING_TEMPLATE_CONTENT;
+
+    /**
+     * The opening delimiter of an embedded expression within a string template.
+     * <p>For example:</p>
+     * <pre>
+     *     String s = STR."Hello, \{getName("Mr. ", firstName, lastName)}!";
+     * </pre>
+     * <p>parses as:</p>
+     * <pre>
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   `--IDENT -&gt; String
+     *  |--IDENT -&gt; s
+     *  `--ASSIGN -&gt; =
+     *      `--EXPR -&gt; EXPR
+     *          `--DOT -&gt; .
+     *              |--IDENT -&gt; STR
+     *              `--STRING_TEMPLATE_BEGIN -&gt; "
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; Hello,
+     *                  |--EMBEDDED_EXPRESSION_BEGIN -&gt; \{
+     *                  |--EMBEDDED_EXPRESSION -&gt; EMBEDDED_EXPRESSION
+     *                  |   `--METHOD_CALL -&gt; (
+     *                  |       |--IDENT -&gt; getName
+     *                  |       |--ELIST -&gt; ELIST
+     *                  |       |   |--EXPR -&gt; EXPR
+     *                  |       |   |   `--STRING_LITERAL -&gt; "Mr. "
+     *                  |       |   |--COMMA -&gt; ,
+     *                  |       |   |--EXPR -&gt; EXPR
+     *                  |       |   |   `--IDENT -&gt; firstName
+     *                  |       |   |--COMMA -&gt; ,
+     *                  |       |   `--EXPR -&gt; EXPR
+     *                  |       |       `--IDENT -&gt; lastName
+     *                  |       `--RPAREN -&gt; )
+     *                  |--EMBEDDED_EXPRESSION_END -&gt; }
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; !
+     *                  `--STRING_TEMPLATE_END -&gt; "
+     * </pre>
+     *
+     * @see #STRING_TEMPLATE_END
+     * @see #STRING_TEMPLATE_CONTENT
+     * @see #EMBEDDED_EXPRESSION_BEGIN
+     * @see #EMBEDDED_EXPRESSION
+     * @see #EMBEDDED_EXPRESSION_END
+     * @see #STRING_LITERAL
+     *
+     * @since 10.13.0
+     */
+    public static final int EMBEDDED_EXPRESSION_BEGIN =
+            JavaLanguageLexer.EMBEDDED_EXPRESSION_BEGIN;
+
+    /**
+     * An expression embedded within a string template.
+     * <p>For example:</p>
+     * <pre>
+     *     String s = STR."Hello, \{getName("Mr. ", firstName, lastName)}!";
+     * </pre>
+     * <p>parses as:</p>
+     * <pre>
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   `--IDENT -&gt; String
+     *  |--IDENT -&gt; s
+     *  `--ASSIGN -&gt; =
+     *      `--EXPR -&gt; EXPR
+     *          `--DOT -&gt; .
+     *              |--IDENT -&gt; STR
+     *              `--STRING_TEMPLATE_BEGIN -&gt; "
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; Hello,
+     *                  |--EMBEDDED_EXPRESSION_BEGIN -&gt; \{
+     *                  |--EMBEDDED_EXPRESSION -&gt; EMBEDDED_EXPRESSION
+     *                  |   `--METHOD_CALL -&gt; (
+     *                  |       |--IDENT -&gt; getName
+     *                  |       |--ELIST -&gt; ELIST
+     *                  |       |   |--EXPR -&gt; EXPR
+     *                  |       |   |   `--STRING_LITERAL -&gt; "Mr. "
+     *                  |       |   |--COMMA -&gt; ,
+     *                  |       |   |--EXPR -&gt; EXPR
+     *                  |       |   |   `--IDENT -&gt; firstName
+     *                  |       |   |--COMMA -&gt; ,
+     *                  |       |   `--EXPR -&gt; EXPR
+     *                  |       |       `--IDENT -&gt; lastName
+     *                  |       `--RPAREN -&gt; )
+     *                  |--EMBEDDED_EXPRESSION_END -&gt; }
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; !
+     *                  `--STRING_TEMPLATE_END -&gt; "
+     * </pre>
+     *
+     * @see #STRING_TEMPLATE_END
+     * @see #STRING_TEMPLATE_CONTENT
+     * @see #EMBEDDED_EXPRESSION_BEGIN
+     * @see #EMBEDDED_EXPRESSION
+     * @see #EMBEDDED_EXPRESSION_END
+     * @see #STRING_LITERAL
+     *
+     * @since 10.13.0
+     */
+    public static final int EMBEDDED_EXPRESSION =
+            JavaLanguageLexer.EMBEDDED_EXPRESSION;
+
+    /**
+     * The closing delimiter of an embedded expression within a string
+     * template.
+     * <p>For example:</p>
+     * <pre>
+     *     String s = STR."Hello, \{getName("Mr. ", firstName, lastName)}!";
+     * </pre>
+     * <p>parses as:</p>
+     * <pre>
+     * VARIABLE_DEF -&gt; VARIABLE_DEF
+     *  |--MODIFIERS -&gt; MODIFIERS
+     *  |--TYPE -&gt; TYPE
+     *  |   `--IDENT -&gt; String
+     *  |--IDENT -&gt; s
+     *  `--ASSIGN -&gt; =
+     *      `--EXPR -&gt; EXPR
+     *          `--DOT -&gt; .
+     *              |--IDENT -&gt; STR
+     *              `--STRING_TEMPLATE_BEGIN -&gt; "
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; Hello,
+     *                  |--EMBEDDED_EXPRESSION_BEGIN -&gt; \{
+     *                  |--EMBEDDED_EXPRESSION -&gt; EMBEDDED_EXPRESSION
+     *                  |   `--METHOD_CALL -&gt; (
+     *                  |       |--IDENT -&gt; getName
+     *                  |       |--ELIST -&gt; ELIST
+     *                  |       |   |--EXPR -&gt; EXPR
+     *                  |       |   |   `--STRING_LITERAL -&gt; "Mr. "
+     *                  |       |   |--COMMA -&gt; ,
+     *                  |       |   |--EXPR -&gt; EXPR
+     *                  |       |   |   `--IDENT -&gt; firstName
+     *                  |       |   |--COMMA -&gt; ,
+     *                  |       |   `--EXPR -&gt; EXPR
+     *                  |       |       `--IDENT -&gt; lastName
+     *                  |       `--RPAREN -&gt; )
+     *                  |--EMBEDDED_EXPRESSION_END -&gt; }
+     *                  |--STRING_TEMPLATE_CONTENT -&gt; !
+     *                  `--STRING_TEMPLATE_END -&gt; "
+     * </pre>
+     *
+     * @see #STRING_TEMPLATE_END
+     * @see #STRING_TEMPLATE_CONTENT
+     * @see #EMBEDDED_EXPRESSION_BEGIN
+     * @see #EMBEDDED_EXPRESSION
+     * @see #EMBEDDED_EXPRESSION_END
+     * @see #STRING_LITERAL
+     *
+     * @since 10.13.0
+     */
+    public static final int EMBEDDED_EXPRESSION_END =
+            JavaLanguageLexer.EMBEDDED_EXPRESSION_END;
+
+    /**
+     * An unnamed pattern variable definition. Appears as part of a pattern definition.
+     * <p>For example:</p>
+     * <pre>
+     *    if (r instanceof R(_)) {}
+     * </pre>
+     * <p>parses as:</p>
+     * <pre>
+     * LITERAL_IF -&gt; if
+     *  |--LPAREN -&gt; (
+     *  |--EXPR -&gt; EXPR
+     *  |   `--LITERAL_INSTANCEOF -&gt; instanceof
+     *  |       |--IDENT -&gt; r
+     *  |       `--RECORD_PATTERN_DEF -&gt; RECORD_PATTERN_DEF
+     *  |           |--MODIFIERS -&gt; MODIFIERS
+     *  |           |--TYPE -&gt; TYPE
+     *  |           |   `--IDENT -&gt; R
+     *  |           |--LPAREN -&gt; (
+     *  |           |--RECORD_PATTERN_COMPONENTS -&gt; RECORD_PATTERN_COMPONENTS
+     *  |           |   `--UNNAMED_PATTERN_DEF -&gt; _
+     *  |           `--RPAREN -&gt; )
+     *  |--RPAREN -&gt; )
+     *  `--SLIST -&gt; {
+     *      `--RCURLY -&gt; }
+     * </pre>
+     *
+     * @see #RECORD_PATTERN_COMPONENTS
+     * @see #RECORD_PATTERN_DEF
+     * @see #LITERAL_SWITCH
+     * @see #LITERAL_INSTANCEOF
+     * @see #SWITCH_RULE
+     * @see #LITERAL_WHEN
+     * @see #PATTERN_VARIABLE_DEF
+     * @see #PATTERN_DEF
+     *
+     * @since 10.14.0
+     */
+    public static final int UNNAMED_PATTERN_DEF =
+            JavaLanguageLexer.UNNAMED_PATTERN_DEF;
+
     /** Prevent instantiation. */
     private TokenTypes() {
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java
index afa7f8e6b91..4c2cef418e4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Violation.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,7 @@
 import java.util.Objects;
 
 import com.puppycrawl.tools.checkstyle.LocalizedMessage;
+import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
 
 /**
  * Represents a violation that can be localised. The translations come from
@@ -111,7 +112,7 @@ public Violation(int lineNo,
             this.args = null;
         }
         else {
-            this.args = Arrays.copyOf(args, args.length);
+            this.args = UnmodifiableCollectionUtil.copyOfArray(args, args.length);
         }
         this.bundle = bundle;
         this.severityLevel = severityLevel;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/package-info.java
index 17c1684107b..5d0135e3269 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java
index a92c0bab878..9e0581429f0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java
index 9cd5aee1bc4..7373c437a7c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,13 +47,13 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code allowEscapesForControlCharacters} - Allow use escapes for
- * non-printable, control characters.
+ * Property {@code allowByTailComment} - Allow use escapes if trail comment is present.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowByTailComment} - Allow use escapes if trail comment is present.
+ * Property {@code allowEscapesForControlCharacters} - Allow use escapes for
+ * non-printable, control characters.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java
index 686a6f74f7d..7bc74547943 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -49,19 +49,15 @@
  * Default value is {@code ""}.
  * </li>
  * <li>
- * Property {@code minimumDepth} - Specify the minimum depth for descendant counts.
- * Type is {@code int}.
- * Default value is {@code 0}.
- * </li>
- * <li>
  * Property {@code maximumDepth} - Specify the maximum depth for descendant counts.
  * Type is {@code int}.
  * Default value is {@code 2147483647}.
  * </li>
  * <li>
- * Property {@code minimumNumber} - Specify a minimum count for descendants.
- * Type is {@code int}.
- * Default value is {@code 0}.
+ * Property {@code maximumMessage} - Define the violation message
+ * when the maximum count is exceeded.
+ * Type is {@code java.lang.String}.
+ * Default value is {@code null}.
  * </li>
  * <li>
  * Property {@code maximumNumber} - Specify a maximum count for descendants.
@@ -69,10 +65,9 @@
  * Default value is {@code 2147483647}.
  * </li>
  * <li>
- * Property {@code sumTokenCounts} - Control whether the number of tokens found
- * should be calculated from the sum of the individual token counts.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code minimumDepth} - Specify the minimum depth for descendant counts.
+ * Type is {@code int}.
+ * Default value is {@code 0}.
  * </li>
  * <li>
  * Property {@code minimumMessage} - Define the violation message
@@ -81,10 +76,15 @@
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code maximumMessage} - Define the violation message
- * when the maximum count is exceeded.
- * Type is {@code java.lang.String}.
- * Default value is {@code null}.
+ * Property {@code minimumNumber} - Specify a minimum count for descendants.
+ * Type is {@code int}.
+ * Default value is {@code 0}.
+ * </li>
+ * <li>
+ * Property {@code sumTokenCounts} - Control whether the number of tokens found
+ * should be calculated from the sum of the individual token counts.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code tokens} - tokens to check
@@ -345,11 +345,11 @@ public void setMinimumNumber(int minimumNumber) {
     }
 
     /**
-      * Setter to specify a maximum count for descendants.
-      *
-      * @param maximumNumber the maximum count for descendants.
-      * @since 3.2
-      */
+     * Setter to specify a maximum count for descendants.
+     *
+     * @param maximumNumber the maximum count for descendants.
+     * @since 3.2
+     */
     public void setMaximumNumber(int maximumNumber) {
         this.maximumNumber = maximumNumber;
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java
index 922183d1ecf..b62b31bdca4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.java
index 4150481829f..ae5d012475d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java
index 9e9a34371c5..effcfa39f76 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -74,15 +74,15 @@
  * </p>
  * <ul>
  * <li>
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
+ * </li>
+ * <li>
  * Property {@code lineSeparator} - Specify the type of line separator.
  * Type is {@code com.puppycrawl.tools.checkstyle.checks.LineSeparatorOption}.
  * Default value is {@code lf_cr_crlf}.
  * </li>
- * <li>
- * Property {@code fileExtensions} - Specify the file type extension of the files to check.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code ""}.
- * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.java
index 89ce91304e6..6c53948a134 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,9 @@
 
 /**
  * <p>
- * Checks whether file contains code. Files which are considered to have no code:
+ * Checks whether file contains code.
+ * Java compiler is not raising errors on files with no code or all commented out.
+ * Files which are considered to have no code:
  * </p>
  * <ul>
  * <li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java
index 6d89071e5d8..642216ceca5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -54,7 +54,7 @@
  * <p>Known limitation: The key should not contain a newline.
  * The string compare will work, but not the line number reporting.</p>
  * <ul><li>
- * Property {@code fileExtensions} - Specify file type extension of the files to check.
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code .properties}.
  * </li></ul>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java
index e88ecd3b51f..ba2f942f9a5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
index 451e87f3fea..3cf258ce9fe 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,9 +47,10 @@
  * <ul>
  * <li>
  * Property {@code aliasList} - Specify aliases for check names that can be used in code
- * within {@code SuppressWarnings}.
+ * within {@code SuppressWarnings} in a format of comma separated attribute=value entries.
+ * The attribute is the fully qualified name of the Check and value is its alias.
  * Type is {@code java.lang.String[]}.
- * Default value is {@code null}.
+ * Default value is {@code ""}.
  * </li>
  * </ul>
  * <p>
@@ -71,7 +72,7 @@ public class SuppressWarningsHolder
      */
     private static final String CHECKSTYLE_PREFIX = "checkstyle:";
 
-    /** Java.lang namespace prefix, which is stripped from SuppressWarnings */
+    /** Java.lang namespace prefix, which is stripped from SuppressWarnings. */
     private static final String JAVA_LANG_PREFIX = "java.lang.";
 
     /** Suffix to be removed from subclasses of Check. */
@@ -149,10 +150,12 @@ private static void registerAlias(String sourceName, String checkAlias) {
 
     /**
      * Setter to specify aliases for check names that can be used in code
-     * within {@code SuppressWarnings}.
+     * within {@code SuppressWarnings} in a format of comma separated attribute=value entries.
+     * The attribute is the fully qualified name of the Check and value is its alias.
      *
      * @param aliasList comma-separated alias assignments
      * @throws IllegalArgumentException when alias item does not have '='
+     * @since 5.7
      */
     public void setAliasList(String... aliasList) {
         for (String sourceAlias : aliasList) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java
index 0a7fd519c10..dc5f9ad5545 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java
index 490eacdba9d..d007b873e4d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
index 27f62cb102e..b933c3bb2f5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,7 @@
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
@@ -50,7 +51,6 @@
 import com.puppycrawl.tools.checkstyle.api.MessageDispatcher;
 import com.puppycrawl.tools.checkstyle.api.Violation;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
-import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
 
 /**
  * <p>
@@ -93,6 +93,11 @@
  * of default translation files in project.
  * </p>
  * <p>
+ * Note: If your project uses preprocessed translation files and the original files do not have the
+ * {@code properties} extension, you can specify additional file extensions
+ * via the {@code fileExtensions} property.
+ * </p>
+ * <p>
  * Attention: the check will perform the validation of ISO codes if the option
  * is used. So, if you specify, for example, "mm" for language code,
  * TranslationCheck will rise violation that the language code is incorrect.
@@ -105,14 +110,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code fileExtensions} - Specify file type extension to identify
- * translation files. Setting this property is typically only required if your
- * translation files are preprocessed and the original files do not have
- * the extension {@code .properties}
- * Type is {@code java.lang.String[]}.
- * Default value is {@code .properties}.
- * </li>
- * <li>
  * Property {@code baseName} - Specify
  * <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/ResourceBundle.html">
  * Base name</a> of resource bundles which contain message resources.
@@ -121,6 +118,11 @@
  * Default value is {@code "^messages.*$"}.
  * </li>
  * <li>
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code .properties}.
+ * </li>
+ * <li>
  * Property {@code requiredTranslations} - Specify language codes of required
  * translations which must exist in project.
  * Type is {@code java.lang.String[]}.
@@ -254,7 +256,8 @@ public void setBaseName(Pattern baseName) {
      * @since 6.11
      */
     public void setRequiredTranslations(String... translationCodes) {
-        requiredTranslations = Arrays.stream(translationCodes).collect(Collectors.toSet());
+        requiredTranslations = Arrays.stream(translationCodes)
+            .collect(Collectors.toUnmodifiableSet());
         validateUserSpecifiedLanguageCodes(requiredTranslations);
     }
 
@@ -411,7 +414,7 @@ private static Set<ResourceBundle> groupFilesIntoBundles(Set<File> files,
                 final ResourceBundle newBundle = new ResourceBundle(baseName, path, extension);
                 final Optional<ResourceBundle> bundle = findBundle(resourceBundles, newBundle);
                 if (bundle.isPresent()) {
-                    bundle.get().addFile(currentFile);
+                    bundle.orElseThrow().addFile(currentFile);
                 }
                 else {
                     newBundle.addFile(currentFile);
@@ -520,7 +523,8 @@ private void checkFilesForConsistencyRegardingTheirKeys(Map<File, Set<String>> f
         for (Entry<File, Set<String>> fileKey : fileKeys.entrySet()) {
             final Set<String> currentFileKeys = fileKey.getValue();
             final Set<String> missingKeys = keysThatMustExist.stream()
-                .filter(key -> !currentFileKeys.contains(key)).collect(Collectors.toSet());
+                .filter(key -> !currentFileKeys.contains(key))
+                .collect(Collectors.toUnmodifiableSet());
             if (!missingKeys.isEmpty()) {
                 final MessageDispatcher dispatcher = getMessageDispatcher();
                 final String path = fileKey.getKey().getAbsolutePath();
@@ -645,7 +649,7 @@ public String getExtension() {
          * @return the set of files
          */
         public Set<File> getFiles() {
-            return UnmodifiableCollectionUtil.unmodifiableSet(files);
+            return Collections.unmodifiableSet(files);
         }
 
         /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java
index dc475bead25..c3629186803 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java
index c84c51a52d0..ef4e792c308 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -46,7 +46,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code fileExtensions} - Specify file type extension of the files to check.
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code .properties}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java
index c0909064b6c..cb5a95fac1b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java
index 2af106f5acf..a5337598ef8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -65,16 +65,16 @@
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowSamelineSingleParameterlessAnnotation} - Allow single parameterless
+ * Property {@code allowSamelineParameterizedAnnotation} - Allow one and only parameterized
  * annotation to be located on the same line as target element.
  * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowSamelineParameterizedAnnotation} - Allow one and only parameterized
+ * Property {@code allowSamelineSingleParameterlessAnnotation} - Allow single parameterless
  * annotation to be located on the same line as target element.
  * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Default value is {@code true}.
  * </li>
  * <li>
  * Property {@code tokens} - tokens to check
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.java
index 77b424ffc16..8a9e3e458d1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java
index 6271032ecfe..b3816b11c1e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -98,18 +98,18 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code elementStyle} - Define the annotation element styles.
- * Type is {@code
- * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ElementStyleOption}.
- * Default value is {@code compact_no_array}.
- * </li>
- * <li>
  * Property {@code closingParens} - Define the policy for ending parenthesis.
  * Type is {@code
  * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ClosingParensOption}.
  * Default value is {@code never}.
  * </li>
  * <li>
+ * Property {@code elementStyle} - Define the annotation element styles.
+ * Type is {@code
+ * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ElementStyleOption}.
+ * Default value is {@code compact_no_array}.
+ * </li>
+ * <li>
  * Property {@code trailingArrayComma} - Define the policy for trailing comma in arrays.
  * Type is {@code
  * com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$TrailingArrayCommaOption}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
index de54f398154..2ff7244187f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -97,6 +97,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * </ul>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java
index 1d33543a837..05d11ed5c3d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -196,7 +196,7 @@ private static boolean containsInheritDocTag(DetailAST ast) {
             .filter(JavadocUtil::isJavadocComment)
             .findFirst();
         return javadoc.isPresent()
-                && MATCH_INHERIT_DOC.matcher(javadoc.get()).find();
+                && MATCH_INHERIT_DOC.matcher(javadoc.orElseThrow()).find();
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java
index 17bf1cf209f..2df34bb34f8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java
index f3d43eb8f95..762fa14b575 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -309,6 +309,8 @@ private static String removeQuotes(final String warning) {
      *
      * @param cond a Conditional type
      *     {@link TokenTypes#QUESTION QUESTION}
+     * @noinspection TailRecursion
+     * @noinspectionreason TailRecursion - until issue #14814
      */
     private void walkConditional(final DetailAST cond) {
         if (cond.getType() == TokenTypes.QUESTION) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java
index e7a79a95711..bee3311dd56 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java
index c0553458cf5..2179168f62e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -70,67 +70,6 @@
  * </li>
  * </ul>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name="AvoidNestedBlocks"/&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * public void foo() {
- *   int myInteger = 0;
- *   {                      // violation
- *     myInteger = 2;
- *   }
- *   System.out.println("myInteger = " + myInteger);
- *
- *   switch (a) {
- *     case 1:
- *       {                    // violation
- *         System.out.println("Case 1");
- *         break;
- *       }
- *     case 2:
- *       System.out.println("Case 2");     // OK
- *       break;
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check to allow nested blocks in switch case:
- * </p>
- * <pre>
- * &lt;module name=&quot;AvoidNestedBlocks&quot;&gt;
- *   &lt;property name=&quot;allowInSwitchCase&quot; value=&quot;true&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * public void foo() {
- *   int myInteger = 0;
- *   {                      // violation
- *     myInteger = 2;
- *   }
- *   System.out.println("myInteger = " + myInteger);
- *
- *   switch (a)
- *   {
- *     case 1:
- *       {                    // OK
- *         System.out.println("Case 1");
- *         break;
- *       }
- *     case 2:
- *       System.out.println("Case 2");     // OK
- *       break;
- *   }
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java
index 4e44907b2be..288dd677b5c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java
index 86783615b65..537c7f200f3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -50,7 +50,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code option} - specify the policy on block contents.
+ * Property {@code option} - Specify the policy on block contents.
  * Type is {@code com.puppycrawl.tools.checkstyle.checks.blocks.BlockOption}.
  * Default value is {@code statement}.
  * </li>
@@ -84,78 +84,6 @@
  * </li>
  * </ul>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name="EmptyBlock"/&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * public class Test {
- *   private void emptyLoop() {
- *     for (int i = 0; i &lt; 10; i++) { // violation
- *     }
- *
- *     try { // violation
- *
- *     } catch (Exception e) {
- *       // ignored
- *     }
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check for the {@code text} policy and only {@code try} blocks:
- * </p>
- * <pre>
- * &lt;module name=&quot;EmptyBlock&quot;&gt;
- *   &lt;property name=&quot;option&quot; value=&quot;text&quot;/&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_TRY&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p> Example: </p>
- * <pre>
- * public class Test {
- *   private void emptyLoop() {
- *     for (int i = 0; i &lt; 10; i++) {
- *       // ignored
- *     }
- *
- *     // violation on next line
- *     try {
- *
- *     } catch (Exception e) {
- *       // ignored
- *     }
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check for default in switch block:
- * </p>
- * <pre>
- * &lt;module name=&quot;EmptyBlock&quot;&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_DEFAULT&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p> Example: </p>
- * <pre>
- * public class Test {
- *   private void test(int a) {
- *     switch (a) {
- *       case 1: someMethod();
- *       default: // OK, as there is no block
- *     }
- *     switch (a) {
- *       case 1: someMethod();
- *       default: {} // violation
- *     }
- *   }
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
index 55c08d4db0e..54e29b6c50b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,179 +38,21 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code exceptionVariableName} - Specify the RegExp for the name of the variable
- * associated with exception. If check meets variable name matching specified value - empty
- * block is suppressed.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^$"}.
- * </li>
- * <li>
  * Property {@code commentFormat} - Specify the RegExp for the first comment inside empty
  * catch block. If check meets comment inside empty catch block matching specified format
  * - empty block is suppressed. If it is multi-line comment - only its first line is analyzed.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code ".*"}.
  * </li>
+ * <li>
+ * Property {@code exceptionVariableName} - Specify the RegExp for the name of the variable
+ * associated with exception. If check meets variable name matching specified value - empty
+ * block is suppressed.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^$"}.
+ * </li>
  * </ul>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name=&quot;EmptyCatchBlock&quot;/&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException expected) {
- * } // violation
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException ignore) {
- *   // no handling
- * } // ok, catch block has comment
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException o) {
- * } // violation
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException ex) {
- *   // This is expected
- * } // ok
- * </pre>
- * <p>
- * To configure the check to suppress empty catch block if exception's variable name is
- * {@code expected} or {@code ignore} or there's any comment inside:
- * </p>
- * <pre>
- * &lt;module name=&quot;EmptyCatchBlock&quot;&gt;
- *   &lt;property name=&quot;exceptionVariableName&quot; value=&quot;expected|ignore&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Such empty blocks would be both suppressed:
- * </p>
- * <pre>
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException expected) {
- * } // ok
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException ignore) {
- *   // no handling
- * } // ok
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException o) {
- * } // violation
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException ex) {
- *   // This is expected
- * } // ok
- * </pre>
- * <p>
- * To configure the check to suppress empty catch block if single-line comment inside
- * is &quot;//This is expected&quot;:
- * </p>
- * <pre>
- * &lt;module name=&quot;EmptyCatchBlock&quot;&gt;
- *   &lt;property name=&quot;commentFormat&quot; value=&quot;This is expected&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Such empty block would be suppressed:
- * </p>
- * <pre>
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException expected) {
- * } // violation
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException ignore) {
- *   // no handling
- * } // violation
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException o) {
- * } // violation
- *
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException ex) {
- *   // This is expected
- * } // ok
- * </pre>
- * <p>
- * To configure the check to suppress empty catch block if single-line comment inside
- * is &quot;//This is expected&quot; or exception's
- * variable name is &quot;myException&quot; (any option is matching):
- * </p>
- * <pre>
- * &lt;module name=&quot;EmptyCatchBlock&quot;&gt;
- *   &lt;property name=&quot;commentFormat&quot; value=&quot;This is expected&quot;/&gt;
- *   &lt;property name=&quot;exceptionVariableName&quot; value=&quot;myException&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Such empty blocks would be suppressed:
- * </p>
- * <pre>
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException e) {
- *   //This is expected
- * }
- * ...
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException e) {
- *   //   This is expected
- * }
- * ...
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException e) {
- *   // This is expected
- *   // some another comment
- * }
- * ...
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException e) {
- *   &#47;* This is expected *&#47;
- * }
- * ...
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException e) {
- *   &#47;*
- *   *
- *   * This is expected
- *   * some another comment
- *   *&#47;
- * }
- * ...
- * try {
- *   throw new RuntimeException();
- * } catch (RuntimeException myException) {
- *
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java
index b8b3baa231c..f9a0c04f291 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,8 @@
 
 import java.util.Locale;
 
+import javax.annotation.Nullable;
+
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
@@ -34,17 +36,17 @@
  * </p>
  * <ul>
  * <li>
+ * Property {@code ignoreEnums} - Allow to ignore enums when left curly brace policy is EOL.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
+ * </li>
+ * <li>
  * Property {@code option} - Specify the policy on placement of a left curly brace
  * (<code>'{'</code>).
  * Type is {@code com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyOption}.
  * Default value is {@code eol}.
  * </li>
  * <li>
- * Property {@code ignoreEnums} - Allow to ignore enums when left curly brace policy is EOL.
- * Type is {@code boolean}.
- * Default value is {@code true}.
- * </li>
- * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -100,109 +102,6 @@
  * </li>
  * </ul>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name="LeftCurly"/&gt;
- * </pre>
- * <pre>
- * class Test
- * { // Violation - '{' should be on the previous line
- *   private interface TestInterface
- *   { // Violation - '{' should be on the previous line
- *   }
- *
- *   private
- *   class
- *   MyClass { // OK
- *   }
- *
- *   enum Colors {RED, // OK
- *     BLUE,
- *     GREEN;
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check to apply the {@code nl} policy to type blocks:
- * </p>
- * <pre>
- * &lt;module name=&quot;LeftCurly&quot;&gt;
- *   &lt;property name=&quot;option&quot; value=&quot;nl&quot;/&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;CLASS_DEF,INTERFACE_DEF&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * class Test
- * { // OK
- *   private interface TestInterface
- *   { // OK
- *   }
- *
- *   private
- *   class
- *   MyClass { // Violation - '{' should be on a new line
- *   }
- *
- *   enum Colors {RED, // OK
- *     BLUE,
- *     GREEN;
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check to apply the {@code nlow} policy to type blocks:
- * </p>
- * <pre>
- * &lt;module name=&quot;LeftCurly&quot;&gt;
- *   &lt;property name=&quot;option&quot; value=&quot;nlow&quot;/&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;CLASS_DEF,INTERFACE_DEF&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * class Test
- * { // Violation - '{' should be on the previous line
- *   private interface TestInterface { // OK
- *   }
- *
- *   private
- *   class
- *   MyClass { // Violation - '{' should be on a new line
- *   }
- *
- *   enum Colors {RED, // OK
- *     BLUE,
- *     GREEN;
- *   }
- * }
- * </pre>
- * <p>
- * An example of how to configure the check to validate enum definitions:
- * </p>
- * <pre>
- * &lt;module name=&quot;LeftCurly&quot;&gt;
- *   &lt;property name=&quot;ignoreEnums&quot; value=&quot;false&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * class Test
- * { // Violation - '{' should be on the previous line
- *   private interface TestInterface
- *   { // Violation - '{' should be on the previous line
- *   }
- *
- *   private
- *   class
- *   MyClass { // OK
- *   }
- *
- *   enum Colors {RED, // Violation - '{' should have line break after
- *   BLUE,
- *   GREEN;
- *   }
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
@@ -252,7 +151,7 @@ public class LeftCurlyCheck
 
     /**
      * Specify the policy on placement of a left curly brace (<code>'{'</code>).
-     * */
+     */
     private LeftCurlyOption option = LeftCurlyOption.EOL;
 
     /**
@@ -391,6 +290,7 @@ public void visitToken(DetailAST ast) {
      * @return {@code DetailAST} if the first child is {@code TokenTypes.SLIST},
      *     {@code null} otherwise.
      */
+    @Nullable
     private static DetailAST getBraceFromSwitchMember(DetailAST ast) {
         final DetailAST brace;
         final DetailAST parent = ast.getParent();
@@ -410,6 +310,7 @@ private static DetailAST getBraceFromSwitchMember(DetailAST ast) {
      * @return {@code DetailAST} if the first child is {@code TokenTypes.SLIST},
      *     {@code null} otherwise.
      */
+    @Nullable
     private static DetailAST getBraceAsFirstChild(DetailAST ast) {
         DetailAST brace = null;
         if (ast != null) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java
index cd362519fa7..01eccfbe6b5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java
index 42a6d2c507d..14f39cba329 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,12 +34,12 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code allowSingleLineStatement} - allow single-line statements without braces.
+ * Property {@code allowEmptyLoopBody} - Allow loops with empty bodies.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowEmptyLoopBody} - allow loops with empty bodies.
+ * Property {@code allowSingleLineStatement} - Allow single-line statements without braces.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
@@ -61,193 +61,6 @@
  * </li>
  * </ul>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name="NeedBraces"/&gt;
- * </pre>
- * <p>Example:</p>
- * <pre>
- * if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
- * if (true) {                     // OK
- *     return true;
- * } else                          // violation, single-line statements not allowed without braces
- *     return false;
- * for (int i = 0; i &lt; 5; i++) {   // OK
- *      ++count;
- * }
- * do                              // violation, single-line statements not allowed without braces
- *     ++count;
- * while (false);
- * for (int j = 0; j &lt; 10; j++); // violation, empty loop body not allowed
- * for(int i = 0; i &lt; 10; value.incrementValue()); // violation, empty loop body not allowed
- * while (counter &lt; 10)          // violation, single-line statements not allowed without braces
- *     ++count;
- * while (value.incrementValue() &lt; 5); // violation, empty loop body not allowed
- * switch (num) {
- *   case 1: counter++; break;         // OK
- * }
- * </pre>
- * <p>
- * To configure the check for {@code if} and {@code else} blocks:
- * </p>
- * <pre>
- * &lt;module name=&quot;NeedBraces&quot;&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_IF, LITERAL_ELSE&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>Example:</p>
- * <pre>
- * if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
- * if (true) {                     // OK
- *     return true;
- * } else                          // violation, single-line statements not allowed without braces
- *     return false;
- * for (int i = 0; i &lt; 5; i++) {   // OK
- *      ++count;
- * }
- * do                              // OK
- *     ++count;
- * while (false);
- * for (int j = 0; j &lt; 10; j++);   // OK
- * for(int i = 0; i &lt; 10; value.incrementValue()); // OK
- * while (counter &lt; 10)                            // OK
- *     ++count;
- * while (value.incrementValue() &lt; 5); // OK
- * switch (num) {
- *   case 1: counter++; break;         // OK
- * }
- * </pre>
- * <p>
- * To configure the check to allow single-line statements
- * ({@code if, while, do-while, for}) without braces:
- * </p>
- * <pre>
- * &lt;module name=&quot;NeedBraces&quot;&gt;
- *   &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
- *   &lt;property name=&quot;tokens&quot;
- *          value=&quot;LITERAL_IF, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * if (obj.isValid()) return true;  // OK
- * if (true) {                      // OK
- *     return true;
- * } else                           // OK
- *     return false;
- * for (int i = 0; i &lt; 5; i++) {    // OK
- *     ++count;
- * }
- * do                               // OK
- *    ++count;
- * while (false);
- * for (int j = 0; j &lt; 10; j++);                   // violation, empty loop body not allowed
- * for(int i = 0; i &lt; 10; value.incrementValue()); // violation, empty loop body not allowed
- * while (counter &lt; 10)                 // OK
- *    ++count;
- * while (value.incrementValue() &lt; 5);  // violation, empty loop body not allowed
- * switch (num) {
- *   case 1: counter++; break;          // OK
- * }
- * while (obj.isValid()) return true;   // OK
- * do this.notify(); while (o != null); // OK
- * for (int i = 0; ; ) this.notify();   // OK
- * </pre>
- * <p>
- * To configure the check to allow {@code case, default} single-line statements without braces:
- * </p>
- * <pre>
- * &lt;module name=&quot;NeedBraces&quot;&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_CASE, LITERAL_DEFAULT&quot;/&gt;
- *   &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Next statements won't be violated by check:
- * </p>
- * <pre>
- * if (obj.isValid()) return true; // OK
- * if (true) {                     // OK
- *     return true;
- * } else                          // OK
- *     return false;
- * for (int i = 0; i &lt; 5; i++) {   // OK
- *      ++count;
- * }
- * do                              // OK
- *     ++count;
- * while (false);
- * for (int j = 0; j &lt; 10; j++);   // OK
- * for(int i = 0; i &lt; 10; value.incrementValue()); // OK
- * while (counter &lt; 10)                            // OK
- *    ++count;
- * while (value.incrementValue() &lt; 5); // OK
- * switch (num) {
- *   case 1: counter++; break;         // OK
- *   case 6: counter += 10; break;     // OK
- *   default: counter = 100; break;    // OK
- * }
- * </pre>
- * <p>
- * To configure the check to allow loops ({@code while, for}) with empty bodies:
- * </p>
- * <pre>
- * &lt;module name=&quot;NeedBraces&quot;&gt;
- *   &lt;property name=&quot;allowEmptyLoopBody&quot; value=&quot;true&quot;/&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_WHILE, LITERAL_FOR&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * if (obj.isValid()) return true; // OK
- * if (true) {                     // OK
- *     return true;
- * } else                          // OK
- *     return false;
- * for (int i = 0; i &lt; 5; i++) {   // OK
- *      ++count;
- * }
- * do                              // OK
- *     ++count;
- * while (false);
- * for (int j = 0; j &lt; 10; j++);   // OK
- * for(int i = 0; i &lt; 10; value.incrementValue()); // OK
- * while (counter &lt; 10)           // violation, single-line statements not allowed without braces
- *    ++count;
- * while (value.incrementValue() &lt; 5); // OK
- * switch (num) {
- * case 1: counter++; break;           // OK
- * }
- * </pre>
- * <p>
- * To configure the check to lambdas:
- * </p>
- * <pre>
- * &lt;module name=&quot;NeedBraces&quot;&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;LAMBDA&quot;/&gt;
- *   &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Results in following:
- * </p>
- * <pre>
- * allowedFuture.addCallback(result -&gt; assertEquals("Invalid response",
- *   EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result), // violation, lambda spans 2 lines
- *   ex -&gt; fail(ex.getMessage())); // OK
- *
- * allowedFuture.addCallback(result -&gt; {
- *   return assertEquals("Invalid response",
- *     EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result);
- *   }, // OK
- *   ex -&gt; fail(ex.getMessage()));
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java
index 6d1eab620d7..b26f545014c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,7 @@
 
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Optional;
 
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
@@ -32,8 +33,8 @@
 /**
  * <p>
  * Checks the placement of right curly braces (<code>'}'</code>) for code blocks. This check
- * supports if-else, try-catch-finally blocks, switch statements, while-loops, for-loops,
- * method definitions, class definitions, constructor definitions,
+ * supports if-else, try-catch-finally blocks, switch statements, switch cases, while-loops,
+ *  for-loops, method definitions, class definitions, constructor definitions,
  * instance, static initialization blocks, annotation definitions and enum definitions.
  * For right curly brace of expression blocks of arrays, lambdas and class instances
  * please follow issue
@@ -66,223 +67,6 @@
  * </li>
  * </ul>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name="RightCurly"/&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * public class Test {
- *
- *   public void test() {
- *
- *     if (foo) {
- *       bar();
- *     }           // violation, right curly must be in the same line as the 'else' keyword
- *     else {
- *       bar();
- *     }
- *
- *     if (foo) {
- *       bar();
- *     } else {     // OK
- *       bar();
- *     }
- *
- *     if (foo) { bar(); } int i = 0; // violation
- *                   // ^^^ statement is not allowed on same line after curly right brace
- *
- *     if (foo) { bar(); }            // OK
- *     int i = 0;
- *
- *     try {
- *       bar();
- *     }           // violation, rightCurly must be in the same line as 'catch' keyword
- *     catch (Exception e) {
- *       bar();
- *     }
- *
- *     try {
- *       bar();
- *     } catch (Exception e) { // OK
- *       bar();
- *     }
- *
- *   }                         // OK
- *
- *   public void testSingleLine() { bar(); } // OK, because singleline is allowed
- * }
- * </pre>
- * <p>
- * To configure the check with policy {@code alone} for {@code else} and
- * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
- * METHOD_DEF</a> tokens:
- * </p>
- * <pre>
- * &lt;module name=&quot;RightCurly&quot;&gt;
- *   &lt;property name=&quot;option&quot; value=&quot;alone&quot;/&gt;
- *   &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_ELSE, METHOD_DEF&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * public class Test {
- *
- *   public void test() {
- *
- *     if (foo) {
- *       bar();
- *     } else { bar(); }   // violation, right curly must be alone on line
- *
- *     if (foo) {
- *       bar();
- *     } else {
- *       bar();
- *     }                   // OK
- *
- *     try {
- *       bar();
- *     } catch (Exception e) { // OK because config is set to token METHOD_DEF and LITERAL_ELSE
- *       bar();
- *     }
- *
- *   }                         // OK
- *
- *   public void violate() { bar; } // violation, singleline is not allowed here
- *
- *   public void ok() {
- *     bar();
- *   }                              // OK
- * }
- * </pre>
- * <p>
- * To configure the check with policy {@code alone} for
- * <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html">
- * Switch</a> Statements:
- * </p>
- * <pre>
- * &lt;module name=&quot;RightCurly&quot;&gt;
- *  &lt;property name=&quot;option&quot; value=&quot;alone&quot;/&gt;
- *  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_SWITCH&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * class Test {
- *
- *     public void method0() {
- *         int mode = 0;
- *         switch (mode) {
- *             case 1:
- *                 int x = 1;
- *                 break;
- *             default:
- *                 x = 0;
- *         } // ok, RightCurly is alone
- *     }
- *
- *     public void method0() {
- *         int mode = 0;
- *         switch (mode) {
- *             case 1:
- *                 int x = 1;
- *                 break;
- *             default:
- *                 x = 0; } // violation, RightCurly should be alone on a line
- *     }
- *
- * }
- * </pre>
- * <p>
- * To configure the check with policy {@code alone_or_singleline} for {@code if} and
- * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
- * METHOD_DEF</a>
- * tokens:
- * </p>
- * <pre>
- * &lt;module name=&quot;RightCurly&quot;&gt;
- *  &lt;property name=&quot;option&quot; value=&quot;alone_or_singleline&quot;/&gt;
- *  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_IF, METHOD_DEF&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * public class Test {
- *
- *   public void test() {
- *
- *     if (foo) {
- *       bar();
- *     } else {        // violation, right curly must be alone on line
- *       bar();
- *     }
- *
- *     if (foo) {
- *       bar();
- *     }               // OK
- *     else {
- *       bar();
- *     }
- *
- *     try {
- *       bar();
- *     } catch (Exception e) {        // OK because config did not set token LITERAL_TRY
- *       bar();
- *     }
- *
- *   }                                // OK
- *
- *   public void violate() { bar(); } // OK , because singleline
- * }
- * </pre>
- * <p>
- * To configure the check with policy {@code alone_or_singleline} for
- * <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html">
- * Switch</a>
- * Statements:
- * </p>
- * <pre>
- * &lt;module name=&quot;RightCurly&quot;&gt;
- *  &lt;property name=&quot;option&quot; value=&quot;alone_or_singleline&quot;/&gt;
- *  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_SWITCH&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * class Test {
- *
- *     public void method0() {
- *         int mode = 0;
- *         switch (mode) {
- *             case 1:
- *                 int x = 1;
- *                 break;
- *             default:
- *                 x = 0;
- *         } // ok
- *     }
- *
- *     public static void method7() {
- *         int mode = 0;
- *         int x;
- *         switch (mode) { case 1: x = 5; } // ok, RightCurly is on the same line as LeftCurly
- *     }
- *
- *     public void method() {
- *         int mode = 0;
- *         int x;
- *         switch (mode) {
- *             case 1:
- *                 x = 1; } // violation, right curly should be alone on line
- *         }
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
@@ -372,6 +156,7 @@ public int[] getAcceptableTokens() {
             TokenTypes.RECORD_DEF,
             TokenTypes.COMPACT_CTOR_DEF,
             TokenTypes.LITERAL_SWITCH,
+            TokenTypes.LITERAL_CASE,
         };
     }
 
@@ -545,9 +330,16 @@ private static boolean isBlockAloneOnSingleLine(Details details) {
             nextToken = Details.getNextToken(nextToken);
         }
 
-        if (nextToken != null && nextToken.getType() == TokenTypes.DO_WHILE) {
-            final DetailAST doWhileSemi = nextToken.getParent();
-            nextToken = Details.getNextToken(doWhileSemi);
+        // sibling tokens should be allowed on a single line
+        final int[] tokensWithBlockSibling = {
+            TokenTypes.DO_WHILE,
+            TokenTypes.LITERAL_FINALLY,
+            TokenTypes.LITERAL_CATCH,
+        };
+
+        if (TokenUtil.isOfType(nextToken, tokensWithBlockSibling)) {
+            final DetailAST parent = nextToken.getParent();
+            nextToken = Details.getNextToken(parent);
         }
 
         return TokenUtil.areOnSameLine(details.lcurly, details.rcurly)
@@ -642,6 +434,9 @@ private static Details getDetails(DetailAST ast) {
                 case TokenTypes.LITERAL_SWITCH:
                     details = getDetailsForSwitch(ast);
                     break;
+                case TokenTypes.LITERAL_CASE:
+                    details = getDetailsForCase(ast);
+                    break;
                 default:
                     details = getDetailsForOthers(ast);
                     break;
@@ -670,6 +465,38 @@ private static Details getDetailsForSwitch(DetailAST switchNode) {
             return new Details(lcurly, rcurly, nextToken, true);
         }
 
+        /**
+         * Collects details about case statements.
+         *
+         * @param caseNode case statement to gather details about
+         * @return new Details about given case statement
+         */
+        private static Details getDetailsForCase(DetailAST caseNode) {
+            final DetailAST caseParent = caseNode.getParent();
+            final int parentType = caseParent.getType();
+            final Optional<DetailAST> lcurly;
+            final DetailAST statementList;
+
+            if (parentType == TokenTypes.SWITCH_RULE) {
+                statementList = caseParent.findFirstToken(TokenTypes.SLIST);
+                lcurly = Optional.ofNullable(statementList);
+            }
+            else {
+                statementList = caseNode.getNextSibling();
+                lcurly = Optional.ofNullable(statementList)
+                         .map(DetailAST::getFirstChild)
+                         .filter(node -> node.getType() == TokenTypes.SLIST);
+            }
+            final DetailAST rcurly = lcurly.map(DetailAST::getLastChild)
+                    .filter(child -> !isSwitchExpression(caseParent))
+                    .orElse(null);
+            final Optional<DetailAST> nextToken =
+                    Optional.ofNullable(lcurly.map(DetailAST::getNextSibling)
+                    .orElseGet(() -> getNextToken(caseParent)));
+
+            return new Details(lcurly.orElse(null), rcurly, nextToken.orElse(null), true);
+        }
+
         /**
          * Check whether switch is expression or not.
          *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java
index b2261c6fadb..6f85680831d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/package-info.java
index 662bed9ccc1..cd91d42b442 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java
index 3534b375de5..4300176245a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java
index 3a312991841..227daacdf07 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.java
index 87c8baede27..a3cb0164480 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java
index 2f7eff5b50b..6ff9660bea9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.java
index 10088b6b796..1bb9db39faa 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheck.java
new file mode 100644
index 00000000000..f226d2de4f8
--- /dev/null
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheck.java
@@ -0,0 +1,161 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.checks.coding;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.puppycrawl.tools.checkstyle.StatelessCheck;
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+
+/**
+ * <p>
+ * Checks that all constructors are grouped together.
+ * If there is any non-constructor code separating constructors,
+ * this check identifies and logs a violation for those ungrouped constructors.
+ * The violation message will specify the line number of the last grouped constructor.
+ * Comments between constructors are allowed.
+ * </p>
+ * <p>
+ * Rationale: Grouping constructors together in a class improves code readability
+ * and maintainability. It allows developers to easily understand
+ * the different ways an object can be instantiated
+ * and the tasks performed by each constructor.
+ * </p>
+ * <p>
+ * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
+ * </p>
+ * <p>
+ * Violation Message Keys:
+ * </p>
+ * <ul>
+ * <li>
+ * {@code constructors.declaration.grouping}
+ * </li>
+ * </ul>
+ *
+ * @since 10.17.0
+ */
+
+@StatelessCheck
+public class ConstructorsDeclarationGroupingCheck extends AbstractCheck {
+
+    /**
+     * A key is pointing to the warning message text in "messages.properties"
+     * file.
+     */
+    public static final String MSG_KEY = "constructors.declaration.grouping";
+
+    @Override
+    public int[] getDefaultTokens() {
+        return getRequiredTokens();
+    }
+
+    @Override
+    public int[] getAcceptableTokens() {
+        return getRequiredTokens();
+    }
+
+    @Override
+    public int[] getRequiredTokens() {
+        return new int[] {
+            TokenTypes.CLASS_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.RECORD_DEF,
+        };
+    }
+
+    @Override
+    public void visitToken(DetailAST ast) {
+        // list of all child ASTs
+        final List<DetailAST> children = getChildList(ast);
+
+        // find first constructor
+        final DetailAST firstConstructor = children.stream()
+                .filter(ConstructorsDeclarationGroupingCheck::isConstructor)
+                .findFirst()
+                .orElse(null);
+
+        if (firstConstructor != null) {
+
+            // get all children AST after the first constructor
+            final List<DetailAST> childrenAfterFirstConstructor =
+                    children.subList(children.indexOf(firstConstructor), children.size());
+
+            // find the first index of non-constructor AST after the first constructor, if present
+            final Optional<Integer> indexOfFirstNonConstructor = childrenAfterFirstConstructor
+                    .stream()
+                    .filter(currAst -> !isConstructor(currAst))
+                    .findFirst()
+                    .map(children::indexOf);
+
+            // list of all children after first non-constructor AST
+            final List<DetailAST> childrenAfterFirstNonConstructor = indexOfFirstNonConstructor
+                    .map(index -> children.subList(index, children.size()))
+                    .orElseGet(ArrayList::new);
+
+            // create a list of all constructors that are not grouped to log
+            final List<DetailAST> constructorsToLog = childrenAfterFirstNonConstructor.stream()
+                    .filter(ConstructorsDeclarationGroupingCheck::isConstructor)
+                    .collect(Collectors.toUnmodifiableList());
+
+            // find the last grouped constructor
+            final DetailAST lastGroupedConstructor = childrenAfterFirstConstructor.stream()
+                    .takeWhile(ConstructorsDeclarationGroupingCheck::isConstructor)
+                    .reduce((first, second) -> second)
+                    .orElse(firstConstructor);
+
+            // log all constructors that are not grouped
+            constructorsToLog
+                    .forEach(ctor -> log(ctor, MSG_KEY, lastGroupedConstructor.getLineNo()));
+        }
+    }
+
+    /**
+     * Get a list of all children of the given AST.
+     *
+     * @param ast the AST to get children of
+     * @return a list of all children of the given AST
+     */
+    private static List<DetailAST> getChildList(DetailAST ast) {
+        final List<DetailAST> children = new ArrayList<>();
+        DetailAST child = ast.findFirstToken(TokenTypes.OBJBLOCK).getFirstChild();
+        while (child != null) {
+            children.add(child);
+            child = child.getNextSibling();
+        }
+        return children;
+    }
+
+    /**
+     * Check if the given AST is a constructor.
+     *
+     * @param ast the AST to check
+     * @return true if the given AST is a constructor, false otherwise
+     */
+    private static boolean isConstructor(DetailAST ast) {
+        return ast.getType() == TokenTypes.CTOR_DEF
+                || ast.getType() == TokenTypes.COMPACT_CTOR_DEF;
+    }
+}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java
index 622a255e145..a953f4fa907 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java
index 872f988eecb..a2bbca1fe2d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -73,12 +73,12 @@
  * </pre>
  * <ul>
  * <li>
- * Property {@code ignoreConstructors} - control whether to ignore constructors.
+ * Property {@code ignoreConstructors} - Control whether to ignore constructors.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code ignoreModifiers} - control whether to ignore modifiers (fields, ...).
+ * Property {@code ignoreModifiers} - Control whether to ignore modifiers (fields, ...).
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.java
index 4d8f1724048..55fce6f6153 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java
index 9ce05c09516..98c75a9861b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java
index 9527358800f..2c49c401278 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -29,7 +30,6 @@
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.utils.CheckUtil;
-import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
 
 /**
  * <p>
@@ -580,7 +580,7 @@ public FieldFrame getParent() {
          * @return children of this frame.
          */
         public Set<FieldFrame> getChildren() {
-            return UnmodifiableCollectionUtil.unmodifiableSet(children);
+            return Collections.unmodifiableSet(children);
         }
 
         /**
@@ -634,7 +634,7 @@ public void addMethodCall(DetailAST methodCall) {
          * Determines whether this FieldFrame contains the field.
          *
          * @param name name of the field to check.
-         * @return true if this FieldFrame contains instance field.
+         * @return DetailAST if this FieldFrame contains instance field.
          */
         public DetailAST findField(String name) {
             return fieldNameToAst.get(name);
@@ -646,7 +646,7 @@ public DetailAST findField(String name) {
          * @return method calls of this frame.
          */
         public Set<DetailAST> getMethodCalls() {
-            return UnmodifiableCollectionUtil.unmodifiableSet(methodCalls);
+            return Collections.unmodifiableSet(methodCalls);
         }
 
         /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java
index 03795f2a506..3447f01a2d7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java
index aa98ceb7595..3cfb827ce97 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,7 +43,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code onlyObjectReferences} - control whether only explicit
+ * Property {@code onlyObjectReferences} - Control whether only explicit
  * initializations made to null for objects should be checked.
  * Type is {@code boolean}.
  * Default value is {@code false}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
index 33d8567594e..5570a996c7a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,14 +19,16 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import java.util.regex.Matcher;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.utils.CodePointUtil;
+import com.puppycrawl.tools.checkstyle.utils.TokenUtil;
 
 /**
  * <p>
@@ -116,6 +118,11 @@ public int[] getAcceptableTokens() {
         return getRequiredTokens();
     }
 
+    @Override
+    public boolean isCommentNodesRequired() {
+        return true;
+    }
+
     /**
      * Setter to define the RegExp to match the relief comment that suppresses
      * the warning about a fall through.
@@ -145,8 +152,8 @@ public void visitToken(DetailAST ast) {
         if (!isLastGroup || checkLastCaseGroup) {
             final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST);
 
-            if (slist != null && !isTerminated(slist, true, true)
-                && !hasFallThroughComment(ast, nextGroup)) {
+            if (slist != null && !isTerminated(slist, true, true, new HashSet<>())
+                    && !hasFallThroughComment(ast)) {
                 if (isLastGroup) {
                     log(ast, MSG_FALL_THROUGH_LAST);
                 }
@@ -160,14 +167,17 @@ public void visitToken(DetailAST ast) {
     /**
      * Checks if a given subtree terminated by return, throw or,
      * if allowed break, continue.
+     * When analyzing fall-through cases in switch statements, a Set of String labels
+     * is used to keep track of the labels encountered in the enclosing switch statements.
      *
      * @param ast root of given subtree
      * @param useBreak should we consider break as terminator
      * @param useContinue should we consider continue as terminator
+     * @param labelsForCurrentSwitchScope the Set labels for the current scope of the switch
      * @return true if the subtree is terminated.
      */
     private boolean isTerminated(final DetailAST ast, boolean useBreak,
-                                 boolean useContinue) {
+                                 boolean useContinue, Set<String> labelsForCurrentSwitchScope) {
         final boolean terminated;
 
         switch (ast.getType()) {
@@ -177,30 +187,43 @@ private boolean isTerminated(final DetailAST ast, boolean useBreak,
                 terminated = true;
                 break;
             case TokenTypes.LITERAL_BREAK:
-                terminated = useBreak;
+                terminated =
+                        useBreak || hasLabel(ast, labelsForCurrentSwitchScope);
                 break;
             case TokenTypes.LITERAL_CONTINUE:
-                terminated = useContinue;
+                terminated =
+                        useContinue || hasLabel(ast, labelsForCurrentSwitchScope);
                 break;
             case TokenTypes.SLIST:
-                terminated = checkSlist(ast, useBreak, useContinue);
+                terminated =
+                        checkSlist(ast, useBreak, useContinue, labelsForCurrentSwitchScope);
                 break;
             case TokenTypes.LITERAL_IF:
-                terminated = checkIf(ast, useBreak, useContinue);
+                terminated =
+                        checkIf(ast, useBreak, useContinue, labelsForCurrentSwitchScope);
                 break;
             case TokenTypes.LITERAL_FOR:
             case TokenTypes.LITERAL_WHILE:
             case TokenTypes.LITERAL_DO:
-                terminated = checkLoop(ast);
+                terminated = checkLoop(ast, labelsForCurrentSwitchScope);
                 break;
             case TokenTypes.LITERAL_TRY:
-                terminated = checkTry(ast, useBreak, useContinue);
+                terminated =
+                        checkTry(ast, useBreak, useContinue, labelsForCurrentSwitchScope);
                 break;
             case TokenTypes.LITERAL_SWITCH:
-                terminated = checkSwitch(ast, useContinue);
+                terminated =
+                        checkSwitch(ast, useContinue, labelsForCurrentSwitchScope);
                 break;
             case TokenTypes.LITERAL_SYNCHRONIZED:
-                terminated = checkSynchronized(ast, useBreak, useContinue);
+                terminated =
+                        checkSynchronized(ast, useBreak, useContinue, labelsForCurrentSwitchScope);
+                break;
+            case TokenTypes.LABELED_STAT:
+                labelsForCurrentSwitchScope.add(ast.getFirstChild().getText());
+                terminated =
+                        isTerminated(ast.getLastChild(), useBreak, useContinue,
+                                labelsForCurrentSwitchScope);
                 break;
             default:
                 terminated = false;
@@ -208,6 +231,22 @@ private boolean isTerminated(final DetailAST ast, boolean useBreak,
         return terminated;
     }
 
+    /**
+     * Checks if given break or continue ast has outer label.
+     *
+     * @param statement break or continue node
+     * @param labelsForCurrentSwitchScope the Set labels for the current scope of the switch
+     * @return true if local label used
+     */
+    private static boolean hasLabel(DetailAST statement, Set<String> labelsForCurrentSwitchScope) {
+        return Optional.ofNullable(statement)
+                .map(DetailAST::getFirstChild)
+                .filter(child -> child.getType() == TokenTypes.IDENT)
+                .map(DetailAST::getText)
+                .filter(label -> !labelsForCurrentSwitchScope.contains(label))
+                .isPresent();
+    }
+
     /**
      * Checks if a given SLIST terminated by return, throw or,
      * if allowed break, continue.
@@ -215,18 +254,24 @@ private boolean isTerminated(final DetailAST ast, boolean useBreak,
      * @param slistAst SLIST to check
      * @param useBreak should we consider break as terminator
      * @param useContinue should we consider continue as terminator
+     * @param labels label names
      * @return true if SLIST is terminated.
      */
     private boolean checkSlist(final DetailAST slistAst, boolean useBreak,
-                               boolean useContinue) {
+                               boolean useContinue, Set<String> labels) {
         DetailAST lastStmt = slistAst.getLastChild();
 
         if (lastStmt.getType() == TokenTypes.RCURLY) {
             lastStmt = lastStmt.getPreviousSibling();
         }
 
+        while (TokenUtil.isOfType(lastStmt, TokenTypes.SINGLE_LINE_COMMENT,
+                TokenTypes.BLOCK_COMMENT_BEGIN)) {
+            lastStmt = lastStmt.getPreviousSibling();
+        }
+
         return lastStmt != null
-            && isTerminated(lastStmt, useBreak, useContinue);
+            && isTerminated(lastStmt, useBreak, useContinue, labels);
     }
 
     /**
@@ -236,17 +281,33 @@ private boolean checkSlist(final DetailAST slistAst, boolean useBreak,
      * @param ast IF to check
      * @param useBreak should we consider break as terminator
      * @param useContinue should we consider continue as terminator
+     * @param labels label names
      * @return true if IF is terminated.
      */
     private boolean checkIf(final DetailAST ast, boolean useBreak,
-                            boolean useContinue) {
-        final DetailAST thenStmt = ast.findFirstToken(TokenTypes.RPAREN)
-                .getNextSibling();
-        final DetailAST elseStmt = thenStmt.getNextSibling();
+                            boolean useContinue, Set<String> labels) {
+        final DetailAST thenStmt = getNextNonCommentAst(ast.findFirstToken(TokenTypes.RPAREN));
+
+        final DetailAST elseStmt = getNextNonCommentAst(thenStmt);
 
         return elseStmt != null
-                && isTerminated(thenStmt, useBreak, useContinue)
-                && isTerminated(elseStmt.getFirstChild(), useBreak, useContinue);
+                && isTerminated(thenStmt, useBreak, useContinue, labels)
+                && isTerminated(elseStmt.getLastChild(), useBreak, useContinue, labels);
+    }
+
+    /**
+     * This method will skip the comment content while finding the next ast of current ast.
+     *
+     * @param ast current ast
+     * @return next ast after skipping comment
+     */
+    private static DetailAST getNextNonCommentAst(DetailAST ast) {
+        DetailAST nextSibling = ast.getNextSibling();
+        while (TokenUtil.isOfType(nextSibling, TokenTypes.SINGLE_LINE_COMMENT,
+                TokenTypes.BLOCK_COMMENT_BEGIN)) {
+            nextSibling = nextSibling.getNextSibling();
+        }
+        return nextSibling;
     }
 
     /**
@@ -254,9 +315,10 @@ && isTerminated(thenStmt, useBreak, useContinue)
      * if allowed break, continue.
      *
      * @param ast loop to check
+     * @param labels label names
      * @return true if loop is terminated.
      */
-    private boolean checkLoop(final DetailAST ast) {
+    private boolean checkLoop(final DetailAST ast, Set<String> labels) {
         final DetailAST loopBody;
         if (ast.getType() == TokenTypes.LITERAL_DO) {
             final DetailAST lparen = ast.findFirstToken(TokenTypes.DO_WHILE);
@@ -266,7 +328,7 @@ private boolean checkLoop(final DetailAST ast) {
             final DetailAST rparen = ast.findFirstToken(TokenTypes.RPAREN);
             loopBody = rparen.getNextSibling();
         }
-        return isTerminated(loopBody, false, false);
+        return isTerminated(loopBody, false, false, labels);
     }
 
     /**
@@ -276,13 +338,15 @@ private boolean checkLoop(final DetailAST ast) {
      * @param ast loop to check
      * @param useBreak should we consider break as terminator
      * @param useContinue should we consider continue as terminator
+     * @param labels label names
      * @return true if try/catch/finally block is terminated
      */
     private boolean checkTry(final DetailAST ast, boolean useBreak,
-                             boolean useContinue) {
+                             boolean useContinue, Set<String> labels) {
         final DetailAST finalStmt = ast.getLastChild();
         boolean isTerminated = finalStmt.getType() == TokenTypes.LITERAL_FINALLY
-                && isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST), useBreak, useContinue);
+                && isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST),
+                useBreak, useContinue, labels);
 
         if (!isTerminated) {
             DetailAST firstChild = ast.getFirstChild();
@@ -292,7 +356,7 @@ private boolean checkTry(final DetailAST ast, boolean useBreak,
             }
 
             isTerminated = isTerminated(firstChild,
-                    useBreak, useContinue);
+                    useBreak, useContinue, labels);
 
             DetailAST catchStmt = ast.findFirstToken(TokenTypes.LITERAL_CATCH);
             while (catchStmt != null
@@ -300,7 +364,7 @@ private boolean checkTry(final DetailAST ast, boolean useBreak,
                     && catchStmt.getType() == TokenTypes.LITERAL_CATCH) {
                 final DetailAST catchBody =
                         catchStmt.findFirstToken(TokenTypes.SLIST);
-                isTerminated = isTerminated(catchBody, useBreak, useContinue);
+                isTerminated = isTerminated(catchBody, useBreak, useContinue, labels);
                 catchStmt = catchStmt.getNextSibling();
             }
         }
@@ -313,15 +377,18 @@ private boolean checkTry(final DetailAST ast, boolean useBreak,
      *
      * @param literalSwitchAst loop to check
      * @param useContinue should we consider continue as terminator
+     * @param labels label names
      * @return true if switch is terminated
      */
-    private boolean checkSwitch(final DetailAST literalSwitchAst, boolean useContinue) {
+    private boolean checkSwitch(DetailAST literalSwitchAst,
+                                boolean useContinue, Set<String> labels) {
         DetailAST caseGroup = literalSwitchAst.findFirstToken(TokenTypes.CASE_GROUP);
         boolean isTerminated = caseGroup != null;
         while (isTerminated && caseGroup.getType() != TokenTypes.RCURLY) {
             final DetailAST caseBody =
                 caseGroup.findFirstToken(TokenTypes.SLIST);
-            isTerminated = caseBody != null && isTerminated(caseBody, false, useContinue);
+            isTerminated = caseBody != null
+                    && isTerminated(caseBody, false, useContinue, labels);
             caseGroup = caseGroup.getNextSibling();
         }
         return isTerminated;
@@ -334,12 +401,13 @@ private boolean checkSwitch(final DetailAST literalSwitchAst, boolean useContinu
      * @param synchronizedAst synchronized block to check.
      * @param useBreak should we consider break as terminator
      * @param useContinue should we consider continue as terminator
+     * @param labels label names
      * @return true if synchronized block is terminated
      */
     private boolean checkSynchronized(final DetailAST synchronizedAst, boolean useBreak,
-                                      boolean useContinue) {
+                                      boolean useContinue, Set<String> labels) {
         return isTerminated(
-            synchronizedAst.findFirstToken(TokenTypes.SLIST), useBreak, useContinue);
+            synchronizedAst.findFirstToken(TokenTypes.SLIST), useBreak, useContinue, labels);
     }
 
     /**
@@ -365,46 +433,32 @@ private boolean checkSynchronized(final DetailAST synchronizedAst, boolean useBr
      * </pre>
      *
      * @param currentCase AST of the case that falls through to the next case.
-     * @param nextCase AST of the next case.
      * @return True if a relief comment was found
      */
-    private boolean hasFallThroughComment(DetailAST currentCase, DetailAST nextCase) {
-        boolean allThroughComment = false;
-        final int endLineNo = nextCase.getLineNo();
-
-        if (matchesComment(reliefPattern, endLineNo)) {
-            allThroughComment = true;
+    private boolean hasFallThroughComment(DetailAST currentCase) {
+        final DetailAST nextSibling = currentCase.getNextSibling();
+        final DetailAST ast;
+        if (nextSibling.getType() == TokenTypes.CASE_GROUP) {
+            ast = nextSibling.getFirstChild();
         }
         else {
-            final int startLineNo = currentCase.getLineNo();
-            for (int i = endLineNo - 2; i > startLineNo - 1; i--) {
-                final int[] line = getLineCodePoints(i);
-                if (!CodePointUtil.isBlank(line)) {
-                    allThroughComment = matchesComment(reliefPattern, i + 1);
-                    break;
-                }
-            }
+            ast = currentCase;
         }
-        return allThroughComment;
+        return hasReliefComment(ast);
     }
 
     /**
-     * Does a regular expression match on the given line and checks that a
-     * possible match is within a comment.
+     * Check if there is any fall through comment.
      *
-     * @param pattern The regular expression pattern to use.
-     * @param lineNo The line number in the file.
-     * @return True if a match was found inside a comment.
+     * @param ast ast to check
+     * @return true if relief comment found
      */
-    // suppress deprecation until https://github.com/checkstyle/checkstyle/issues/11166
-    @SuppressWarnings("deprecation")
-    private boolean matchesComment(Pattern pattern, int lineNo) {
-        final String line = getLine(lineNo - 1);
-
-        final Matcher matcher = pattern.matcher(line);
-        return matcher.find()
-                && getFileContents().hasIntersectionWithComment(
-                        lineNo, matcher.start(), lineNo, matcher.end());
+    private boolean hasReliefComment(DetailAST ast) {
+        return Optional.ofNullable(getNextNonCommentAst(ast))
+                .map(DetailAST::getPreviousSibling)
+                .map(previous -> previous.getFirstChild().getText())
+                .map(text -> reliefPattern.matcher(text).find())
+                .orElse(Boolean.FALSE);
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java
index 3b33a6aca3f..198a7ac54de 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -118,10 +118,6 @@ public class FinalLocalVariableCheck extends AbstractCheck {
     /** Scope Deque. */
     private final Deque<ScopeData> scopeStack = new ArrayDeque<>();
 
-    /** Uninitialized variables of previous scope. */
-    private final Deque<Deque<DetailAST>> prevScopeUninitializedVariables =
-            new ArrayDeque<>();
-
     /** Assigned variables of current scope. */
     private final Deque<Deque<DetailAST>> currentScopeAssignedVariables =
             new ArrayDeque<>();
@@ -235,7 +231,7 @@ && shouldCheckEnhancedForLoopVariable(ast)) {
                 if (isAssignOperator(parentType) && isFirstChild(ast)) {
                     final Optional<FinalVariableCandidate> candidate = getFinalCandidate(ast);
                     if (candidate.isPresent()) {
-                        determineAssignmentConditions(ast, candidate.get());
+                        determineAssignmentConditions(ast, candidate.orElseThrow());
                         currentScopeAssignedVariables.peek().add(ast);
                     }
                     removeFinalVariableCandidateFromStack(ast);
@@ -258,7 +254,6 @@ && shouldCheckEnhancedForLoopVariable(ast)) {
     @Override
     public void leaveToken(DetailAST ast) {
         Map<String, FinalVariableCandidate> scope = null;
-        final Deque<DetailAST> prevScopeUninitializedVariableData;
         final DetailAST parentAst = ast.getParent();
         switch (ast.getType()) {
             case TokenTypes.OBJBLOCK:
@@ -269,24 +264,20 @@ public void leaveToken(DetailAST ast) {
                 break;
             case TokenTypes.EXPR:
                 // Switch labeled expression has no slist
-                if (parentAst.getType() == TokenTypes.SWITCH_RULE) {
-                    prevScopeUninitializedVariableData = prevScopeUninitializedVariables.peek();
-                    if (shouldUpdateUninitializedVariables(parentAst)) {
-                        updateAllUninitializedVariables(prevScopeUninitializedVariableData);
-                    }
+                if (parentAst.getType() == TokenTypes.SWITCH_RULE
+                    && shouldUpdateUninitializedVariables(parentAst)) {
+                    updateAllUninitializedVariables();
                 }
                 break;
             case TokenTypes.SLIST:
-                prevScopeUninitializedVariableData = prevScopeUninitializedVariables.peek();
                 boolean containsBreak = false;
                 if (parentAst.getType() != TokenTypes.CASE_GROUP
                     || findLastCaseGroupWhichContainsSlist(parentAst.getParent()) == parentAst) {
                     containsBreak = scopeStack.peek().containsBreak;
                     scope = scopeStack.pop().scope;
-                    prevScopeUninitializedVariables.pop();
                 }
                 if (containsBreak || shouldUpdateUninitializedVariables(parentAst)) {
-                    updateAllUninitializedVariables(prevScopeUninitializedVariableData);
+                    updateAllUninitializedVariables();
                 }
                 updateCurrentScopeAssignedVariables();
                 break;
@@ -383,26 +374,18 @@ private void storePrevScopeUninitializedVariableData() {
         final Deque<DetailAST> prevScopeUninitializedVariableData =
                 new ArrayDeque<>();
         scopeData.uninitializedVariables.forEach(prevScopeUninitializedVariableData::push);
-        prevScopeUninitializedVariables.push(prevScopeUninitializedVariableData);
+        scopeData.prevScopeUninitializedVariables = prevScopeUninitializedVariableData;
     }
 
     /**
      * Update current scope data uninitialized variable according to the whole scope data.
-     *
-     * @param prevScopeUninitializedVariableData variable for previous stack of uninitialized
-     *     variables
-     * @noinspection MethodParameterNamingConvention
-     * @noinspectionreason MethodParameterNamingConvention - complicated check
-     *      requires descriptive naming
-     */
-    private void updateAllUninitializedVariables(
-            Deque<DetailAST> prevScopeUninitializedVariableData) {
+     */
+    private void updateAllUninitializedVariables() {
         final boolean hasSomeScopes = !currentScopeAssignedVariables.isEmpty();
         if (hasSomeScopes) {
-            // Check for only previous scope
-            updateUninitializedVariables(prevScopeUninitializedVariableData);
-            // Check for rest of the scope
-            prevScopeUninitializedVariables.forEach(this::updateUninitializedVariables);
+            scopeStack.forEach(scopeData -> {
+                updateUninitializedVariables(scopeData.prevScopeUninitializedVariables);
+            });
         }
     }
 
@@ -735,6 +718,9 @@ private static final class ScopeData {
         /** Contains definitions of uninitialized variables. */
         private final Deque<DetailAST> uninitializedVariables = new ArrayDeque<>();
 
+        /** Contains definitions of previous scope uninitialized variables. */
+        private Deque<DetailAST> prevScopeUninitializedVariables = new ArrayDeque<>();
+
         /** Whether there is a {@code break} in the scope. */
         private boolean containsBreak;
 
@@ -750,7 +736,7 @@ public Optional<FinalVariableCandidate> findFinalVariableCandidateForAst(DetailA
             final Optional<FinalVariableCandidate> candidate =
                 Optional.ofNullable(scope.get(ast.getText()));
             if (candidate.isPresent()) {
-                storedVariable = candidate.get().variableIdent;
+                storedVariable = candidate.orElseThrow().variableIdent;
             }
             if (storedVariable != null && isSameVariables(storedVariable, ast)) {
                 result = candidate;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java
index 997f5d01273..1510cf0dec8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -75,10 +75,10 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code ignoreFormat} - Define the RegExp for names of variables
- * and parameters to ignore.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
+ * Property {@code ignoreAbstractMethods} - Control whether to ignore parameters
+ * of abstract methods.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code ignoreConstructorParameter} - Control whether to ignore constructor parameters.
@@ -86,6 +86,12 @@
  * Default value is {@code false}.
  * </li>
  * <li>
+ * Property {@code ignoreFormat} - Define the RegExp for names of variables
+ * and parameters to ignore.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code null}.
+ * </li>
+ * <li>
  * Property {@code ignoreSetter} - Allow to ignore the parameter of a property setter method.
  * Type is {@code boolean}.
  * Default value is {@code false}.
@@ -97,12 +103,6 @@
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code ignoreAbstractMethods} - Control whether to ignore parameters
- * of abstract methods.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -257,7 +257,9 @@ private void visitOtherTokens(DetailAST ast, int type) {
         final DetailAST typeMods = ast.findFirstToken(TokenTypes.MODIFIERS);
         final boolean isStaticInnerType =
                 typeMods != null
-                        && typeMods.findFirstToken(TokenTypes.LITERAL_STATIC) != null;
+                        && typeMods.findFirstToken(TokenTypes.LITERAL_STATIC) != null
+                        // inner record is implicitly static
+                        || ast.getType() == TokenTypes.RECORD_DEF;
         final String frameName;
 
         if (type == TokenTypes.CLASS_DEF
@@ -647,6 +649,8 @@ public void addStaticField(String field) {
          *
          * @param field the field to check
          * @return true if this FieldFrame contains instance field
+         * @noinspection TailRecursion
+         * @noinspectionreason TailRecursion - until issue #14814
          */
         public boolean containsInstanceField(String field) {
             return instanceFields.contains(field)
@@ -659,6 +663,8 @@ public boolean containsInstanceField(String field) {
          *
          * @param field the field to check
          * @return true if this FieldFrame contains static field
+         * @noinspection TailRecursion
+         * @noinspectionreason TailRecursion - until issue #14814
          */
         public boolean containsStaticField(String field) {
             return staticFields.contains(field)
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java
index c9cc9653884..c79a4b73219 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java
index 312d4fc9599..ebeba90b8bf 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -346,7 +346,7 @@ private boolean isStandardClass(String className, String illegal) {
      * @since 3.0
      */
     public void setClasses(String... names) {
-        classes = Arrays.stream(names).collect(Collectors.toSet());
+        classes = Arrays.stream(names).collect(Collectors.toUnmodifiableSet());
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java
index 2c487c1c0db..3c0b42ce995 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,10 +41,10 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code illegalClassNames} - Specify throw class names to reject.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code Error, RuntimeException, Throwable, java.lang.Error,
- * java.lang.RuntimeException, java.lang.Throwable}.
+ * Property {@code ignoreOverriddenMethods} - Allow to ignore checking overridden methods
+ * (marked with {@code Override} or {@code java.lang.Override} annotation).
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
  * </li>
  * <li>
  * Property {@code ignoredMethodNames} - Specify names of methods to ignore.
@@ -52,10 +52,10 @@
  * Default value is {@code finalize}.
  * </li>
  * <li>
- * Property {@code ignoreOverriddenMethods} - allow to ignore checking overridden methods
- * (marked with {@code Override} or {@code java.lang.Override} annotation).
- * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Property {@code illegalClassNames} - Specify throw class names to reject.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code Error, RuntimeException, Throwable, java.lang.Error,
+ * java.lang.RuntimeException, java.lang.Throwable}.
  * </li>
  * </ul>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java
index d85043bb7f2..7e11e64bcf1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java
index 0aa1bcacd55..4c94138170e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -113,6 +113,7 @@ public int[] getAcceptableTokens() {
             TokenTypes.STRING_LITERAL,
             TokenTypes.CHAR_LITERAL,
             TokenTypes.TEXT_BLOCK_CONTENT,
+            TokenTypes.STRING_TEMPLATE_CONTENT,
         };
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java
index 7e7a1365a8b..92b89b0cb60 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -81,9 +81,15 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code validateAbstractClassNames} - Control whether to validate abstract class names.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code ignoredMethodNames} - Specify methods that should not be checked.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code getEnvironment, getInitialContext}.
+ * </li>
+ * <li>
+ * Property {@code illegalAbstractClassNameFormat} - Specify RegExp for illegal abstract class
+ * names.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^(.*[.])?Abstract.*$"}.
  * </li>
  * <li>
  * Property {@code illegalClassNames} - Specify classes that should not be used
@@ -99,17 +105,6 @@
  * Default value is {@code ""}.
  * </li>
  * <li>
- * Property {@code ignoredMethodNames} - Specify methods that should not be checked.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code getEnvironment, getInitialContext}.
- * </li>
- * <li>
- * Property {@code illegalAbstractClassNameFormat} - Specify RegExp for illegal abstract class
- * names.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^(.*[.])?Abstract.*$"}.
- * </li>
- * <li>
  * Property {@code memberModifiers} - Control whether to check only methods and fields with any
  * of the specified modifiers.
  * This property does not affect method calls nor method references nor record components.
@@ -118,6 +113,11 @@
  * Default value is {@code ""}.
  * </li>
  * <li>
+ * Property {@code validateAbstractClassNames} - Control whether to validate abstract class names.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java
index 2a923a04e14..3fc5ba33430 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -101,6 +101,7 @@ public class InnerAssignmentCheck
             TokenTypes.RESOURCE_SPECIFICATION,
         },
         {TokenTypes.EXPR, TokenTypes.LAMBDA},
+        {TokenTypes.EXPR, TokenTypes.SWITCH_RULE, TokenTypes.LITERAL_SWITCH, TokenTypes.SLIST},
     };
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java
index 48a2949de18..60cb98bb019 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -55,32 +55,6 @@
  * </pre>
  * <ul>
  * <li>
- * Property {@code ignoreNumbers} - Specify non-magic numbers.
- * Type is {@code double[]}.
- * Default value is {@code -1, 0, 1, 2}.
- * </li>
- * <li>
- * Property {@code ignoreHashCodeMethod} - Ignore magic numbers in hashCode methods.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
- * Property {@code ignoreAnnotation} - Ignore magic numbers in annotation declarations.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
- * Property {@code ignoreFieldDeclaration} - Ignore magic numbers in field declarations.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
- * Property {@code ignoreAnnotationElementDefaults} -
- * Ignore magic numbers in annotation elements defaults.
- * Type is {@code boolean}.
- * Default value is {@code true}.
- * </li>
- * <li>
  * Property {@code constantWaiverParentToken} - Specify tokens that are allowed in the AST path
  * from the number literal to the enclosing constant definition.
  * Type is {@code java.lang.String[]}.
@@ -114,6 +88,32 @@
  * UNARY_PLUS</a>.
  * </li>
  * <li>
+ * Property {@code ignoreAnnotation} - Ignore magic numbers in annotation declarations.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
+ * Property {@code ignoreAnnotationElementDefaults} -
+ * Ignore magic numbers in annotation elements defaults.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
+ * </li>
+ * <li>
+ * Property {@code ignoreFieldDeclaration} - Ignore magic numbers in field declarations.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
+ * Property {@code ignoreHashCodeMethod} - Ignore magic numbers in hashCode methods.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
+ * Property {@code ignoreNumbers} - Specify non-magic numbers.
+ * Type is {@code double[]}.
+ * Default value is {@code -1, 0, 1, 2}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -387,7 +387,7 @@ private boolean isInIgnoreList(DetailAST ast) {
     private static boolean isFieldDeclaration(DetailAST ast) {
         DetailAST varDefAST = null;
         DetailAST node = ast;
-        while (node.getType() != TokenTypes.OBJBLOCK) {
+        while (node != null && node.getType() != TokenTypes.OBJBLOCK) {
             if (node.getType() == TokenTypes.VARIABLE_DEF) {
                 varDefAST = node;
                 break;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.java
index 723e9c2d547..7705c3a61e1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -49,9 +49,10 @@
  * </p>
  * <p>
  * Please read more about Xpath syntax at
- * <a href="https://www.saxonica.com/html/documentation10/expressions/">Xpath Syntax</a>.
+ * <a href="https://www.saxonica.com/html/documentation10/expressions/index.html">Xpath Syntax</a>.
  * Information regarding Xpath functions can be found at
- * <a href="https://www.saxonica.com/html/documentation10/functions/fn/">XSLT/XPath Reference</a>.
+ * <a href="https://www.saxonica.com/html/documentation10/functions/fn/index.html">
+ *     XSLT/XPath Reference</a>.
  * Note, that <b>@text</b> attribute can be used only with token types that are listed in
  * <a href="https://github.com/checkstyle/checkstyle/search?q=%22TOKEN_TYPES_WITH_TEXT_ATTRIBUTE+%3D+Arrays.asList%22">
  *     XpathUtil</a>.
@@ -134,7 +135,7 @@ public boolean isCommentNodesRequired() {
 
     @Override
     public void beginTree(DetailAST rootAST) {
-        if (xpathExpression != null) {
+        if (!query.isEmpty()) {
             final List<DetailAST> matchingNodes = findMatchingNodesByXpathQuery(rootAST);
             matchingNodes.forEach(node -> log(node, MSG_KEY));
         }
@@ -155,7 +156,7 @@ private List<DetailAST> findMatchingNodesByXpathQuery(DetailAST rootAST) {
             final List<Item> matchingItems = xpathExpression.evaluate(xpathDynamicContext);
             return matchingItems.stream()
                     .map(item -> (DetailAST) ((AbstractNode) item).getUnderlyingNode())
-                    .collect(Collectors.toList());
+                    .collect(Collectors.toUnmodifiableList());
         }
         catch (XPathException ex) {
             throw new IllegalStateException("Evaluation of Xpath query failed: " + query, ex);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java
index 62b7d53e784..d405df15968 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java
index 5cbe9b1e9a2..c3642f7af63 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -97,6 +97,7 @@ public void visitToken(DetailAST ast) {
         if (!containsDefaultLabel(ast)
                 && !containsPatternCaseLabelElement(ast)
                 && !containsDefaultCaseLabelElement(ast)
+                && !containsNullCaseLabelElement(ast)
                 && !isSwitchExpression(ast)) {
             log(ast, MSG_KEY);
         }
@@ -142,6 +143,19 @@ private static boolean containsDefaultCaseLabelElement(DetailAST detailAst) {
         }).isPresent();
     }
 
+    /**
+     * Checks if a switch block contains a null case label.
+     *
+     * @param detailAst first case group to check.
+     * @return true if switch block contains null case label
+     */
+    private static boolean containsNullCaseLabelElement(DetailAST detailAst) {
+        return TokenUtil.findFirstTokenByPredicate(detailAst, ast -> {
+            return ast.getFirstChild() != null
+                     && hasNullCaseLabel(ast.getFirstChild());
+        }).isPresent();
+    }
+
     /**
      * Checks if this LITERAL_SWITCH token is part of a switch expression.
      *
@@ -152,4 +166,17 @@ private static boolean isSwitchExpression(DetailAST ast) {
         return ast.getParent().getType() == TokenTypes.EXPR
                 || ast.getParent().getParent().getType() == TokenTypes.EXPR;
     }
+
+    /**
+     * Checks if the case contains null label.
+     *
+     * @param ast the switch statement we are checking
+     * @return returnValue the ast of null label
+     */
+    private static boolean hasNullCaseLabel(DetailAST ast) {
+        final DetailAST firstChild = ast.getFirstChild();
+        return firstChild != null
+                && TokenUtil.isOfType(firstChild.getFirstChild(), TokenTypes.LITERAL_NULL);
+
+    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java
index a1eb1b74e06..c70dc27c39d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -312,7 +312,7 @@ private static Set<String> getVariablesManagedByForLoop(DetailAST ast) {
         final Set<String> initializedVariables = getForInitVariables(ast);
         final Set<String> iteratingVariables = getForIteratorVariables(ast);
         return initializedVariables.stream().filter(iteratingVariables::contains)
-            .collect(Collectors.toSet());
+            .collect(Collectors.toUnmodifiableSet());
     }
 
     /**
@@ -408,7 +408,7 @@ private static Set<String> getForIteratorVariables(DetailAST ast) {
     }
 
     /**
-     * Find all child of given AST of type TokenType.EXPR
+     * Find all child of given AST of type TokenType.EXPR.
      *
      * @param ast parent of expressions to find
      * @return all child of given ast
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java
index c33aa0cec55..6952c426ff7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -51,17 +51,19 @@
  * Default value is {@code 1}.
  * </li>
  * <li>
- * Property {@code ignoreStringsRegexp} - Specify RegExp for ignored strings (with quotation marks).
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^""$"}.
- * </li>
- * <li>
  * Property {@code ignoreOccurrenceContext} - Specify token type names where duplicate
  * strings are ignored even if they don't match ignoredStringsRegexp. This allows you to
  * exclude syntactical contexts like annotations or static initializers from the check.
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenTypesSet}.
- * Default value is {@code ANNOTATION}.
+ * Default value is
+ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION">
+ * ANNOTATION</a>.
+ * </li>
+ * <li>
+ * Property {@code ignoreStringsRegexp} - Specify RegExp for ignored strings (with quotation marks).
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^""$"}.
  * </li>
  * </ul>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java
index d3d218ebc2d..d5c54c718fb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java
index 796bbcc37d0..54284568aa4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java
index 7f44b2fbca5..278cad9f1ed 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java
index 071844ef5cf..ef3fa583930 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.java
index d069e78cfa5..f985ff464eb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.java
index 2789b0e1813..4eec4c59567 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.java
index 2bcb31516e7..f77e5887a6c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java
index e4321ff84d4..8a743eca039 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
index 6694948da1a..1c7512148e6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java
index e9973c91618..8fc95c85513 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -110,7 +110,11 @@ private void checkOverloadMethodsGrouping(DetailAST objectBlock) {
                 final String methodName =
                         currentToken.findFirstToken(TokenTypes.IDENT).getText();
                 final Integer previousIndex = methodIndexMap.get(methodName);
-                if (previousIndex != null && currentIndex - previousIndex > allowedDistance) {
+                final DetailAST previousSibling = currentToken.getPreviousSibling();
+                final boolean isMethod = previousSibling.getType() == TokenTypes.METHOD_DEF;
+
+                if (previousIndex != null
+                        && (!isMethod || currentIndex - previousIndex > allowedDistance)) {
                     final int previousLineWithOverloadMethod =
                             methodLineNumberMap.get(methodName);
                     log(currentToken, MSG_KEY,
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java
index 7a7faa4a3ec..da15b84a8dd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java
index 2885027e211..635760b47e5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java
index bb712b9b95b..36676f94a19 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java
index cb57314e7e4..e3f99d49f82 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -51,6 +51,11 @@
  * </p>
  * <ul>
  * <li>
+ * Property {@code format} - Specify method names to ignore.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^equals$"}.
+ * </li>
+ * <li>
  * Property {@code max} - Specify maximum allowed number of return statements
  * in non-void methods/lambdas.
  * Type is {@code int}.
@@ -63,11 +68,6 @@
  * Default value is {@code 1}.
  * </li>
  * <li>
- * Property {@code format} - Specify method names to ignore.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^equals$"}.
- * </li>
- * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.java
index 288fd0f3ec0..fe08ec41392 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java
index 9ffc44f84c1..70212adbc8d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,8 @@
  * </pre>
  * <p>
  * The idea for this Check has been shamelessly stolen from the equivalent
- * <a href="https://pmd.github.io/">PMD</a> rule.
+ * <a href="https://pmd.github.io/pmd/pmd_rules_java_design.html#simplifybooleanreturns">
+ *     PMD</a> rule.
  * </p>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java
index 59e07af0301..5ffac838940 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.java
index 4a935e71682..a67978cb54f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.java
index 5a4b6e74298..5a4d8ec3f8f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java
index 84d78f3b0cb..9ce4045033a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.java
index a00448cc9fd..f35296848bb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.java
index 9856fdaf511..db0daf32475 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.java
index 1e65839ad79..33666ecc980 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.java
index 03dc0283d53..07d52056236 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java
index 28e8c1fa1b4..e9770ae2906 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -128,6 +128,21 @@ public class UnusedLocalVariableCheck extends AbstractCheck {
         TokenTypes.COMPACT_CTOR_DEF,
     };
 
+    /**
+     * An array of token types that indicate a variable is being used within
+     * an expression involving increment or decrement operators, or within a switch statement.
+     * When a token of one of these types is the parent of an expression, it indicates that the
+     * variable associated with the increment or decrement operation is being used.
+     * Ex:- TokenTypes.LITERAL_SWITCH: Indicates a switch statement. Variables used within the
+     * switch expression are considered to be used
+     */
+    private static final int[] INCREMENT_DECREMENT_VARIABLE_USAGE_TYPES = {
+        TokenTypes.ELIST,
+        TokenTypes.INDEX_OP,
+        TokenTypes.ASSIGN,
+        TokenTypes.LITERAL_SWITCH,
+    };
+
     /** Package separator. */
     private static final String PACKAGE_SEPARATOR = ".";
 
@@ -232,8 +247,8 @@ else if (type == TokenTypes.IDENT) {
         else if (isInsideLocalAnonInnerClass(ast)) {
             visitLocalAnonInnerClass(ast);
         }
-        else if (TokenUtil.isTypeDeclaration(type)) {
-            visitTypeDeclarationToken(ast);
+        else if (isNonLocalTypeDeclaration(ast)) {
+            visitNonLocalTypeDeclarationToken(ast);
         }
         else if (type == TokenTypes.PACKAGE_DEF) {
             packageName = CheckUtil.extractQualifiedName(ast.getFirstChild().getNextSibling());
@@ -263,7 +278,10 @@ else if (isNonLocalTypeDeclaration(ast)) {
     private static void visitDotToken(DetailAST dotAst, Deque<VariableDesc> variablesStack) {
         if (dotAst.getParent().getType() != TokenTypes.LITERAL_NEW
                 && shouldCheckIdentTokenNestedUnderDot(dotAst)) {
-            checkIdentifierAst(dotAst.findFirstToken(TokenTypes.IDENT), variablesStack);
+            final DetailAST identifier = dotAst.findFirstToken(TokenTypes.IDENT);
+            if (identifier != null) {
+                checkIdentifierAst(identifier, variablesStack);
+            }
         }
     }
 
@@ -301,18 +319,16 @@ private static void visitIdentToken(DetailAST identAst, Deque<VariableDesc> vari
     }
 
     /**
-     * Visit the type declaration token.
+     * Visit the non-local type declaration token.
      *
      * @param typeDeclAst type declaration ast
      */
-    private void visitTypeDeclarationToken(DetailAST typeDeclAst) {
-        if (isNonLocalTypeDeclaration(typeDeclAst)) {
-            final String qualifiedName = getQualifiedTypeDeclarationName(typeDeclAst);
-            final TypeDeclDesc currTypeDecl = new TypeDeclDesc(qualifiedName, depth, typeDeclAst);
-            depth++;
-            typeDeclarations.push(currTypeDecl);
-            typeDeclAstToTypeDeclDesc.put(typeDeclAst, currTypeDecl);
-        }
+    private void visitNonLocalTypeDeclarationToken(DetailAST typeDeclAst) {
+        final String qualifiedName = getQualifiedTypeDeclarationName(typeDeclAst);
+        final TypeDeclDesc currTypeDecl = new TypeDeclDesc(qualifiedName, depth, typeDeclAst);
+        depth++;
+        typeDeclarations.push(currTypeDecl);
+        typeDeclAstToTypeDeclDesc.put(typeDeclAst, currTypeDecl);
     }
 
     /**
@@ -397,16 +413,18 @@ private static boolean isNonLocalTypeDeclaration(DetailAST typeDeclAst) {
     private static DetailAST getBlockContainingLocalAnonInnerClass(DetailAST literalNewAst) {
         DetailAST currentAst = literalNewAst;
         DetailAST result = null;
-        while (!TokenUtil.isOfType(currentAst, CONTAINERS_FOR_ANON_INNERS)) {
-            if (currentAst.getType() == TokenTypes.LAMBDA
-                    && currentAst.getParent()
-                    .getParent().getParent().getType() == TokenTypes.OBJBLOCK) {
-                result = currentAst;
-                break;
+        DetailAST topMostLambdaAst = null;
+        while (currentAst != null && !TokenUtil.isOfType(currentAst, CONTAINERS_FOR_ANON_INNERS)) {
+            if (currentAst.getType() == TokenTypes.LAMBDA) {
+                topMostLambdaAst = currentAst;
             }
             currentAst = currentAst.getParent();
             result = currentAst;
         }
+
+        if (currentAst == null) {
+            result = topMostLambdaAst;
+        }
         return result;
     }
 
@@ -420,14 +438,15 @@ private static DetailAST getBlockContainingLocalAnonInnerClass(DetailAST literal
     private static void addLocalVariables(DetailAST varDefAst, Deque<VariableDesc> variablesStack) {
         final DetailAST parentAst = varDefAst.getParent();
         final DetailAST grandParent = parentAst.getParent();
-        final boolean isInstanceVarInAnonymousInnerClass =
-                grandParent.getType() == TokenTypes.LITERAL_NEW;
-        if (isInstanceVarInAnonymousInnerClass
+        final boolean isInstanceVarInInnerClass =
+                grandParent.getType() == TokenTypes.LITERAL_NEW
+                || grandParent.getType() == TokenTypes.CLASS_DEF;
+        if (isInstanceVarInInnerClass
                 || parentAst.getType() != TokenTypes.OBJBLOCK) {
             final DetailAST ident = varDefAst.findFirstToken(TokenTypes.IDENT);
             final VariableDesc desc = new VariableDesc(ident.getText(),
                     varDefAst.findFirstToken(TokenTypes.TYPE), findScopeOfVariable(varDefAst));
-            if (isInstanceVarInAnonymousInnerClass) {
+            if (isInstanceVarInInnerClass) {
                 desc.registerAsInstOrClassVar();
             }
             variablesStack.push(desc);
@@ -480,7 +499,7 @@ private TypeDeclDesc getSuperClassOfAnonInnerClass(DetailAST literalNewAst) {
                     })
                     .findFirst();
             if (classWithCompletePackageName.isPresent()) {
-                obtainedClass = classWithCompletePackageName.get();
+                obtainedClass = classWithCompletePackageName.orElseThrow();
             }
         }
         else {
@@ -517,14 +536,14 @@ private void modifyVariablesStack(TypeDeclDesc obtainedClass,
      * Checks if there is a type declaration with same name as the super class.
      *
      * @param superClassName name of the super class
-     * @return true if there is another type declaration with same name.
+     * @return list if there is another type declaration with same name.
      */
     private List<TypeDeclDesc> typeDeclWithSameName(String superClassName) {
         return typeDeclAstToTypeDeclDesc.values().stream()
                 .filter(typeDeclDesc -> {
                     return hasSameNameAsSuperClass(superClassName, typeDeclDesc);
                 })
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
     }
 
     /**
@@ -748,8 +767,7 @@ private static boolean isStandAloneIncrementOrDecrement(DetailAST identAst) {
      * @return true if variable nested in exprAst is used
      */
     private static boolean isIncrementOrDecrementVariableUsed(DetailAST exprAst) {
-        return TokenUtil.isOfType(exprAst.getParent(),
-                TokenTypes.ELIST, TokenTypes.INDEX_OP, TokenTypes.ASSIGN)
+        return TokenUtil.isOfType(exprAst.getParent(), INCREMENT_DECREMENT_VARIABLE_USAGE_TYPES)
                 && exprAst.getParent().getParent().getType() != TokenTypes.FOR_ITERATOR;
     }
 
@@ -962,7 +980,7 @@ public DetailAST getTypeDeclAst() {
          * @return copy of variables in instanceAndClassVar stack with updated scope.
          */
         public Deque<VariableDesc> getUpdatedCopyOfVarStack(DetailAST literalNewAst) {
-            final DetailAST updatedScope = literalNewAst.getLastChild();
+            final DetailAST updatedScope = literalNewAst;
             final Deque<VariableDesc> instAndClassVarDeque = new ArrayDeque<>();
             instanceAndClassVarStack.forEach(instVar -> {
                 final VariableDesc variableDesc = new VariableDesc(instVar.getName(),
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java
index fa01f9034e0..a5d777e2225 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,6 +47,11 @@
  * Default value is {@code 3}.
  * </li>
  * <li>
+ * Property {@code ignoreFinal} - Allow to ignore variables with a 'final' modifier.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
+ * </li>
+ * <li>
  * Property {@code ignoreVariablePattern} - Define RegExp to ignore distance calculation
  * for variables listed in this pattern.
  * Type is {@code java.util.regex.Pattern}.
@@ -58,11 +63,6 @@
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
- * <li>
- * Property {@code ignoreFinal} - Allow to ignore variables with a 'final' modifier.
- * Type is {@code boolean}.
- * Default value is {@code true}.
- * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
@@ -306,7 +306,7 @@ private static Entry<DetailAST, Integer> calculateDistanceInSingleScope(
         while (!firstUsageFound && currentAst != null) {
             if (currentAst.getFirstChild() != null) {
                 if (isChild(currentAst, variableIdentAst)) {
-                    dist = getDistToVariableUsageInChildNode(currentAst, variableIdentAst, dist);
+                    dist = getDistToVariableUsageInChildNode(currentAst, dist);
                     variableUsageAst = currentAst;
                     firstUsageFound = true;
                 }
@@ -324,11 +324,10 @@ else if (currentAst.getType() != TokenTypes.VARIABLE_DEF) {
      * Returns the distance to variable usage for in the child node.
      *
      * @param childNode child node.
-     * @param varIdent variable variable identifier.
      * @param currentDistToVarUsage current distance to the variable usage.
      * @return the distance to variable usage for in the child node.
      */
-    private static int getDistToVariableUsageInChildNode(DetailAST childNode, DetailAST varIdent,
+    private static int getDistToVariableUsageInChildNode(DetailAST childNode,
                                                          int currentDistToVarUsage) {
         DetailAST examineNode = childNode;
         if (examineNode.getType() == TokenTypes.LABELED_STAT) {
@@ -336,6 +335,7 @@ private static int getDistToVariableUsageInChildNode(DetailAST childNode, Detail
         }
 
         int resultDist = currentDistToVarUsage;
+
         switch (examineNode.getType()) {
             case TokenTypes.SLIST:
                 resultDist = 0;
@@ -345,17 +345,12 @@ private static int getDistToVariableUsageInChildNode(DetailAST childNode, Detail
             case TokenTypes.LITERAL_DO:
             case TokenTypes.LITERAL_IF:
             case TokenTypes.LITERAL_SWITCH:
-                if (isVariableInOperatorExpr(examineNode, varIdent)) {
-                    resultDist++;
-                }
-                else {
-                    // variable usage is in inner scope
-                    // reset counters, because we can't determine distance
-                    resultDist = 0;
-                }
+                // variable usage is in inner scope, treated as 1 block
+                // or in operator expression, then distance + 1
+                resultDist++;
                 break;
             default:
-                if (examineNode.findFirstToken(TokenTypes.SLIST) == null) {
+                if (childNode.findFirstToken(TokenTypes.SLIST) == null) {
                     resultDist++;
                 }
                 else {
@@ -708,22 +703,6 @@ private static boolean isVariableInOperatorExpr(
             ast = ast.getNextSibling();
         }
 
-        // Variable may be met in ELSE declaration
-        // So, check variable usage in these declarations.
-        if (!isVarInOperatorDeclaration) {
-            final DetailAST elseBlock = operator.getLastChild();
-
-            if (elseBlock.getType() == TokenTypes.LITERAL_ELSE) {
-                // Get IF followed by ELSE
-                final DetailAST firstNodeInsideElseBlock = elseBlock.getFirstChild();
-
-                if (firstNodeInsideElseBlock.getType() == TokenTypes.LITERAL_IF) {
-                    isVarInOperatorDeclaration =
-                        isVariableInOperatorExpr(firstNodeInsideElseBlock, variable);
-                }
-            }
-        }
-
         return isVarInOperatorDeclaration;
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/package-info.java
index ef59e218b90..4df044a7d1b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java
index 79dc6430f5c..3532c23406f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -170,193 +170,6 @@
  * </li>
  * </ul>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name=&quot;DesignForExtension&quot;/&gt;
- * </pre>
- * <p>Example:</p>
- * <pre>
- * public abstract class Foo {
- *   private int bar;
- *
- *   public int m1() {return 2;}  // Violation. No javadoc.
- *
- *   public int m2() {return 8;}  // Violation. No javadoc.
- *
- *   private void m3() {m4();}  // OK. Private method.
- *
- *   protected void m4() { }  // OK. No implementation.
- *
- *   public abstract void m5();  // OK. Abstract method.
- *
- *   &#47;**
- *    * This implementation ...
- *    &#64;return some int value.
- *    *&#47;
- *   public int m6() {return 1;}  // OK. Have javadoc on overridable method.
- *
- *   &#47;**
- *    * Some comments ...
- *    *&#47;
- *   public int m7() {return 1;}  // OK. Have javadoc on overridable method.
- *
- *   &#47;**
- *    * This
- *    * implementation ...
- *    *&#47;
- *   public int m8() {return 2;}  // OK. Have javadoc on overridable method.
- *
- *   &#64;Override
- *   public String toString() {  // Violation. No javadoc for @Override method.
- *     return "";
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check to allow methods which have @Override annotations
- * to be designed for extension.
- * </p>
- * <pre>
- * &lt;module name=&quot;DesignForExtension&quot;&gt;
- *   &lt;property name=&quot;ignoredAnnotations&quot; value=&quot;Override&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>Example:</p>
- * <pre>
- * public abstract class Foo {
- *   private int bar;
- *
- *   public int m1() {return 2;}  // Violation. No javadoc.
- *
- *   public int m2() {return 8;}  // Violation. No javadoc.
- *
- *   private void m3() {m4();}  // OK. Private method.
- *
- *   protected void m4() { }  // OK. No implementation.
- *
- *   public abstract void m5();  // OK. Abstract method.
- *
- *   &#47;**
- *    * This implementation ...
- *    &#64;return some int value.
- *    *&#47;
- *   public int m6() {return 1;}  // OK. Have javadoc on overridable method.
- *
- *   &#47;**
- *    * Some comments ...
- *    *&#47;
- *   public int m7() {return 1;}  // OK. Have javadoc on overridable method.
- *
- *   &#47;**
- *    * This
- *    * implementation ...
- *    *&#47;
- *   public int m8() {return 2;}  // OK. Have javadoc on overridable method.
- *
- *   &#64;Override
- *   public String toString() {  // OK. Have javadoc on overridable method.
- *     return "";
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check to allow methods which contain a specified comment text
- * pattern in their javadoc to be designed for extension.
- * </p>
- * <pre>
- * &lt;module name=&quot;DesignForExtension&quot;&gt;
- *   &lt;property name=&quot;requiredJavadocPhrase&quot; value=&quot;This implementation&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>Example:</p>
- * <pre>
- * public abstract class Foo {
- *   private int bar;
- *
- *   public int m1() {return 2;}  // Violation. No javadoc.
- *
- *   public int m2() {return 8;}  // Violation. No javadoc.
- *
- *   private void m3() {m4();}  // OK. Private method.
- *
- *   protected void m4() { }  // OK. No implementation.
- *
- *   public abstract void m5();  // OK. Abstract method.
- *
- *   &#47;**
- *    * This implementation ...
- *    &#64;return some int value.
- *    *&#47;
- *   public int m6() {return 1;}  // OK. Have required javadoc.
- *
- *   &#47;**
- *    * Some comments ...
- *    *&#47;
- *   public int m7() {return 1;}  // Violation. No required javadoc.
- *
- *   &#47;**
- *    * This
- *    * implementation ...
- *    *&#47;
- *   public int m8() {return 2;}  // Violation. No required javadoc.
- *
- *   &#64;Override
- *   public String toString() {  // Violation. No required javadoc.
- *     return "";
- *   }
- * }
- * </pre>
- * <p>
- * To configure the check to allow methods which contain a specified comment text
- * pattern in their javadoc which can span multiple lines
- * to be designed for extension.
- * </p>
- * <pre>
- * &lt;module name=&quot;DesignForExtension&quot;&gt;
- *   &lt;property name=&quot;requiredJavadocPhrase&quot;
- *     value=&quot;This[\s\S]*implementation&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>Example:</p>
- * <pre>
- * public abstract class Foo {
- *   private int bar;
- *
- *   public int m1() {return 2;}  // Violation. No javadoc.
- *
- *   public int m2() {return 8;}  // Violation. No javadoc.
- *
- *   private void m3() {m4();}
- *
- *   protected void m4() { }  // OK. No implementation.
- *
- *   public abstract void m5();  // OK. Abstract method.
- *
- *   &#47;**
- *    * This implementation ...
- *    &#64;return some int value.
- *    *&#47;
- *   public int m6() {return 1;}  // OK. Have required javadoc.
- *
- *   &#47;**
- *    * Some comments ...
- *    *&#47;
- *   public int m7() {return 1;}  // Violation. No required javadoc.
- *
- *   &#47;**
- *    * This
- *    * implementation ...
- *    *&#47;
- *   public int m8() {return 2;}  // OK. Have required javadoc.
- *
- *   &#64;Override
- *   public String toString() {  // Violation. No required javadoc.
- *     return "";
- *   }
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
@@ -383,7 +196,7 @@ public class DesignForExtensionCheck extends AbstractCheck {
      * Specify annotations which allow the check to skip the method from validation.
      */
     private Set<String> ignoredAnnotations = Arrays.stream(new String[] {"Test", "Before", "After",
-        "BeforeClass", "AfterClass", }).collect(Collectors.toSet());
+        "BeforeClass", "AfterClass", }).collect(Collectors.toUnmodifiableSet());
 
     /**
      * Specify the comment text pattern which qualifies a method as designed for extension.
@@ -398,7 +211,8 @@ public class DesignForExtensionCheck extends AbstractCheck {
      * @since 7.2
      */
     public void setIgnoredAnnotations(String... ignoredAnnotations) {
-        this.ignoredAnnotations = Arrays.stream(ignoredAnnotations).collect(Collectors.toSet());
+        this.ignoredAnnotations = Arrays.stream(ignoredAnnotations)
+            .collect(Collectors.toUnmodifiableSet());
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java
index b009be953a8..4819241f99f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,55 +63,6 @@
  *   </li>
  * </ol>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name=&quot;FinalClass&quot;/&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * final class MyClass {  // OK
- *   private MyClass() { }
- * }
- *
- * class MyClass { // violation, class should be declared final
- *   private MyClass() { }
- * }
- *
- * class MyClass { // OK, since it has a public constructor
- *   int field1;
- *   String field2;
- *   private MyClass(int value) {
- *     this.field1 = value;
- *     this.field2 = " ";
- *   }
- *   public MyClass(String value) {
- *     this.field2 = value;
- *     this.field1 = 0;
- *   }
- * }
- *
- * class TestAnonymousInnerClasses { // OK, class has an anonymous inner class.
- *     public static final TestAnonymousInnerClasses ONE = new TestAnonymousInnerClasses() {
- *
- *     };
- *
- *     private TestAnonymousInnerClasses() {
- *     }
- * }
- * class Class1 {
- *
- *     private class Class2 { // violation, class should be declared final
- *     }
- *
- *     public class Class3 { // ok
- *     }
- *
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java
index def6a93710a..795881b1ec9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -52,46 +52,6 @@
  * }
  * </pre>
  * <p>
- * To configure the check:
- * </p>
- * <pre>
- * &lt;module name=&quot;HideUtilityClassConstructor&quot;/&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * class Test { // violation, class only has a static method and a constructor
- *
- *   public Test() {
- *   }
- *
- *   public static void fun() {
- *   }
- * }
- *
- * class Foo { // OK
- *
- *   private Foo() {
- *   }
- *
- *   static int n;
- * }
- *
- * class Bar { // OK
- *
- *   protected Bar() {
- *     // prevents calls from subclass
- *     throw new UnsupportedOperationException();
- *   }
- * }
- *
- * class UtilityClass { // violation, class only has a static field
- *
- *   static float f;
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  * <p>
@@ -202,7 +162,7 @@ private static final class Details {
          * C-tor.
          *
          * @param ast class ast
-         * */
+         */
         private Details(DetailAST ast) {
             this.ast = ast;
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java
index 6ec605ae82c..61d7561b684 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java
index 6fc105dd43c..03d69938db8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java
index 9c189834412..057d7dc0296 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -50,12 +50,12 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specify pattern for exception class names.
+ * Property {@code extendedClassNameFormat} - Specify pattern for extended class names.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^.*Exception$|^.*Error$|^.*Throwable$"}.
  * </li>
  * <li>
- * Property {@code extendedClassNameFormat} - Specify pattern for extended class names.
+ * Property {@code format} - Specify pattern for exception class names.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^.*Exception$|^.*Error$|^.*Throwable$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java
index 00023e4e324..191b1df7f67 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java
index cc69296d0e2..a0eca7caf77 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -55,15 +55,15 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code max} - Specify maximum allowed number of throws statements.
- * Type is {@code int}.
- * Default value is {@code 4}.
- * </li>
- * <li>
  * Property {@code ignorePrivateMethods} - Allow private methods to be ignored.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
+ * <li>
+ * Property {@code max} - Specify maximum allowed number of throws statements.
+ * Type is {@code int}.
+ * Default value is {@code 4}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java
index 1d8b9e9c04c..e7a9a4b73ad 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -105,21 +105,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code packageAllowed} - Control whether package visible members are allowed.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
- * Property {@code protectedAllowed} - Control whether protected members are allowed.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
- * Property {@code publicMemberPattern} - Specify pattern for public members that should be ignored.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^serialVersionUID$"}.
- * </li>
- * <li>
  * Property {@code allowPublicFinalFields} - Allow final fields to be declared as public.
  * Type is {@code boolean}.
  * Default value is {@code false}.
@@ -131,6 +116,13 @@
  * Default value is {@code false}.
  * </li>
  * <li>
+ * Property {@code ignoreAnnotationCanonicalNames} - Specify annotations canonical
+ * names which ignore variables in consideration.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code com.google.common.annotations.VisibleForTesting,
+ * org.junit.ClassRule, org.junit.Rule}.
+ * </li>
+ * <li>
  * Property {@code immutableClassCanonicalNames} - Specify immutable classes canonical names.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code java.io.File, java.lang.Boolean, java.lang.Byte,
@@ -140,11 +132,19 @@
  * java.net.InetSocketAddress, java.net.URI, java.net.URL, java.util.Locale, java.util.UUID}.
  * </li>
  * <li>
- * Property {@code ignoreAnnotationCanonicalNames} - Specify annotations canonical
- * names which ignore variables in consideration.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code com.google.common.annotations.VisibleForTesting,
- * org.junit.ClassRule, org.junit.Rule}.
+ * Property {@code packageAllowed} - Control whether package visible members are allowed.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
+ * Property {@code protectedAllowed} - Control whether protected members are allowed.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
+ * Property {@code publicMemberPattern} - Specify pattern for public members that should be ignored.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^serialVersionUID$"}.
  * </li>
  * </ul>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/package-info.java
index bbcaee9f4cc..37b36c9adbf 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java
index ddf463d5147..c145a7e9dae 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -77,7 +76,7 @@ protected List<String> getHeaderLines() {
     }
 
     /**
-     * Setter to specify the charset to use when reading the headerFile.
+     * Setter to specify the character encoding to use when reading the headerFile.
      *
      * @param charset the charset name to use for loading the header from a file
      */
@@ -86,7 +85,7 @@ public void setCharset(String charset) {
     }
 
     /**
-     * Setter to specify the name of the file containing the required header..
+     * Setter to specify the name of the file containing the required header.
      *
      * @param uri the uri of the header to load.
      * @throws CheckstyleException if fileName is empty.
@@ -147,8 +146,9 @@ private static Charset createCharset(String name) {
     }
 
     /**
-     * Set the header to check against. Individual lines in the header
-     * must be separated by '\n' characters.
+     * Specify the required header specified inline.
+     * Individual header lines must be separated by the string
+     * {@code "\n"}(even on platforms with a different line separator).
      *
      * @param header header content to check against.
      * @throws IllegalArgumentException if the header cannot be interpreted
@@ -200,10 +200,10 @@ public Set<String> getExternalResourceLocations() {
         final Set<String> result;
 
         if (headerFile == null) {
-            result = Collections.emptySet();
+            result = Set.of();
         }
         else {
-            result = Collections.singleton(headerFile.toString());
+            result = Set.of(headerFile.toASCIIString());
         }
 
         return result;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java
index f188900eca0..d0b3a4feac1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -55,31 +55,31 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code headerFile} - Specify the name of the file containing the required header.
- * Type is {@code java.net.URI}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code charset} - Specify the character encoding to use when reading the headerFile.
  * Type is {@code java.lang.String}.
  * Default value is {@code the charset property of the parent
  * <a href="https://checkstyle.org/config.html#Checker">Checker</a> module}.
  * </li>
  * <li>
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
+ * </li>
+ * <li>
  * Property {@code header} - Specify the required header specified inline.
  * Individual header lines must be separated by the string {@code "\n"}
- * (even on platforms with a different line separator), see examples below.
+ * (even on platforms with a different line separator).
  * Type is {@code java.lang.String}.
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code ignoreLines} - Specify the line numbers to ignore.
- * Type is {@code int[]}.
- * Default value is {@code ""}.
+ * Property {@code headerFile} - Specify the name of the file containing the required header.
+ * Type is {@code java.net.URI}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code fileExtensions} - Specify the file type extension of files to process.
- * Type is {@code java.lang.String[]}.
+ * Property {@code ignoreLines} - Specify the line numbers to ignore.
+ * Type is {@code int[]}.
  * Default value is {@code ""}.
  * </li>
  * </ul>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java
index d5c509f17d1..231b6d95156 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -98,17 +98,17 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code headerFile} - Specify the name of the file containing the required header.
- * Type is {@code java.net.URI}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code charset} - Specify the character encoding to use when reading the headerFile.
  * Type is {@code java.lang.String}.
  * Default value is {@code the charset property of the parent
  * <a href="https://checkstyle.org/config.html#Checker">Checker</a> module}.
  * </li>
  * <li>
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
+ * </li>
+ * <li>
  * Property {@code header} - Define the required header specified inline.
  * Individual header lines must be separated by the string {@code "\n"}
  * (even on platforms with a different line separator).
@@ -119,13 +119,13 @@
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code multiLines} - Specify the line numbers to repeat (zero or more times).
- * Type is {@code int[]}.
- * Default value is {@code ""}.
+ * Property {@code headerFile} - Specify the name of the file containing the required header.
+ * Type is {@code java.net.URI}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code fileExtensions} - Specify the file type extension of files to process.
- * Type is {@code java.lang.String[]}.
+ * Property {@code multiLines} - Specify the line numbers to repeat (zero or more times).
+ * Type is {@code int[]}.
  * Default value is {@code ""}.
  * </li>
  * </ul>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/package-info.java
index 2b8d4149d6a..aa12aafda1d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.java
index 1736fedc544..41b6faec12d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportControl.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.java
index 9f33b3e92a3..e1ba16ccf41 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AbstractImportRule.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java
index b2b18643374..a08dd9b66d7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java
index 26db0a1319e..1f75d9bb981 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,12 +44,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code excludes} - Specify packages where starred class imports are
- * allowed and classes where starred static member imports are allowed.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code ""}.
- * </li>
- * <li>
  * Property {@code allowClassImports} - Control whether to allow starred class
  * imports like {@code import java.util.*;}.
  * Type is {@code boolean}.
@@ -61,6 +55,12 @@
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
+ * <li>
+ * Property {@code excludes} - Specify packages where starred class imports are
+ * allowed and classes where starred static member imports are allowed.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java
index 4b2be599602..fb4f1066285 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.java
index 8abd84514f4..43f3b2bb638 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRule.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
index 52c99a6860f..2efcd676aeb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,7 @@
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
@@ -82,7 +83,11 @@
  * </li>
  * </ol>
  * <p>
- * Use the separator '###' between rules.
+ * Rules are configured as a comma-separated ordered list.
+ * </p>
+ * <p>
+ * Note: '###' group separator is deprecated (in favor of a comma-separated list),
+ * but is currently supported for backward compatibility.
  * </p>
  * <p>
  * To set RegExps for THIRD_PARTY_PACKAGE and STANDARD_JAVA_PACKAGE groups use
@@ -135,20 +140,21 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code customImportOrderRules} - Specify format of order declaration
- * customizing by user.
- * Type is {@code java.lang.String}.
+ * Property {@code customImportOrderRules} - Specify ordered list of import groups.
+ * Type is {@code java.lang.String[]}.
  * Default value is {@code ""}.
  * </li>
  * <li>
- * Property {@code standardPackageRegExp} - Specify RegExp for STANDARD_JAVA_PACKAGE group imports.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^(java|javax)\."}.
+ * Property {@code separateLineBetweenGroups} - Force empty line separator between
+ * import groups.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code thirdPartyPackageRegExp} - Specify RegExp for THIRD_PARTY_PACKAGE group imports.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code ".*"}.
+ * Property {@code sortImportsInGroupAlphabetically} - Force grouping alphabetically,
+ * in <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code specialImportsRegExp} - Specify RegExp for SPECIAL_IMPORTS group imports.
@@ -156,16 +162,14 @@
  * Default value is {@code "^$"}.
  * </li>
  * <li>
- * Property {@code separateLineBetweenGroups} - Force empty line separator between
- * import groups.
- * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Property {@code standardPackageRegExp} - Specify RegExp for STANDARD_JAVA_PACKAGE group imports.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^(java|javax)\."}.
  * </li>
  * <li>
- * Property {@code sortImportsInGroupAlphabetically} - Force grouping alphabetically,
- * in <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code thirdPartyPackageRegExp} - Specify RegExp for THIRD_PARTY_PACKAGE group imports.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code ".*"}.
  * </li>
  * </ul>
  * <p>
@@ -257,11 +261,8 @@ public class CustomImportOrderCheck extends AbstractCheck {
     /** Pattern used to separate groups of imports. */
     private static final Pattern GROUP_SEPARATOR_PATTERN = Pattern.compile("\\s*###\\s*");
 
-    /** Specify format of order declaration customizing by user. */
-    private static final String DEFAULT_CUSTOM_IMPORT_ORDER_RULES = "";
-
-    /** Processed list of import order rules. */
-    private final List<String> customOrderRules = new ArrayList<>();
+    /** Specify ordered list of import groups. */
+    private final List<String> customImportOrderRules = new ArrayList<>();
 
     /** Contains objects with import attributes. */
     private final List<ImportDetails> importToGroupList = new ArrayList<>();
@@ -347,19 +348,19 @@ public final void setSortImportsInGroupAlphabetically(boolean value) {
     }
 
     /**
-     * Setter to specify format of order declaration customizing by user.
+     * Setter to specify ordered list of import groups.
      *
-     * @param inputCustomImportOrder
+     * @param rules
      *        user value.
      * @since 5.8
      */
-    public final void setCustomImportOrderRules(final String inputCustomImportOrder) {
-        if (!DEFAULT_CUSTOM_IMPORT_ORDER_RULES.equals(inputCustomImportOrder)) {
-            for (String currentState : GROUP_SEPARATOR_PATTERN.split(inputCustomImportOrder)) {
-                addRulesToList(currentState);
-            }
-            customOrderRules.add(NON_GROUP_RULE_GROUP);
-        }
+    public final void setCustomImportOrderRules(String... rules) {
+        Arrays.stream(rules)
+                .map(GROUP_SEPARATOR_PATTERN::split)
+                .flatMap(Arrays::stream)
+                .forEach(this::addRulesToList);
+
+        customImportOrderRules.add(NON_GROUP_RULE_GROUP);
     }
 
     @Override
@@ -410,7 +411,7 @@ public void finishTree(DetailAST rootAST) {
     /** Examine the order of all the imports and log any violations. */
     private void finishImportList() {
         String currentGroup = getFirstGroup();
-        int currentGroupNumber = customOrderRules.lastIndexOf(currentGroup);
+        int currentGroupNumber = customImportOrderRules.lastIndexOf(currentGroup);
         ImportDetails previousImportObjectFromCurrentGroup = null;
         String previousImportFromCurrentGroup = null;
 
@@ -432,13 +433,13 @@ private void finishImportList() {
             }
             else {
                 // not the last group, last one is always NON_GROUP
-                if (customOrderRules.size() > currentGroupNumber + 1) {
+                if (customImportOrderRules.size() > currentGroupNumber + 1) {
                     final String nextGroup = getNextImportGroup(currentGroupNumber + 1);
                     if (importGroup.equals(nextGroup)) {
                         validateMissedEmptyLine(previousImportObjectFromCurrentGroup,
                                 importObject, fullImportIdent);
                         currentGroup = nextGroup;
-                        currentGroupNumber = customOrderRules.lastIndexOf(nextGroup);
+                        currentGroupNumber = customImportOrderRules.lastIndexOf(nextGroup);
                         previousImportFromCurrentGroup = fullImportIdent;
                     }
                     else {
@@ -584,13 +585,13 @@ else if (NON_GROUP_RULE_GROUP.equals(currentGroupNumber)) {
     private String getNextImportGroup(int currentGroupNumber) {
         int nextGroupNumber = currentGroupNumber;
 
-        while (customOrderRules.size() > nextGroupNumber + 1) {
-            if (hasAnyImportInCurrentGroup(customOrderRules.get(nextGroupNumber))) {
+        while (customImportOrderRules.size() > nextGroupNumber + 1) {
+            if (hasAnyImportInCurrentGroup(customImportOrderRules.get(nextGroupNumber))) {
                 break;
             }
             nextGroupNumber++;
         }
-        return customOrderRules.get(nextGroupNumber);
+        return customImportOrderRules.get(nextGroupNumber);
     }
 
     /**
@@ -623,11 +624,11 @@ private boolean hasAnyImportInCurrentGroup(String currentGroup) {
      */
     private String getImportGroup(boolean isStatic, String importPath) {
         RuleMatchForImport bestMatch = new RuleMatchForImport(NON_GROUP_RULE_GROUP, 0, 0);
-        if (isStatic && customOrderRules.contains(STATIC_RULE_GROUP)) {
+        if (isStatic && customImportOrderRules.contains(STATIC_RULE_GROUP)) {
             bestMatch.group = STATIC_RULE_GROUP;
             bestMatch.matchLength = importPath.length();
         }
-        else if (customOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) {
+        else if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) {
             final String importPathTrimmedToSamePackageDepth =
                     getFirstDomainsFromIdent(samePackageMatchingDepth, importPath);
             if (samePackageDomainsRegExp.equals(importPathTrimmedToSamePackageDepth)) {
@@ -635,7 +636,7 @@ else if (customOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) {
                 bestMatch.matchLength = importPath.length();
             }
         }
-        for (String group : customOrderRules) {
+        for (String group : customImportOrderRules) {
             if (STANDARD_JAVA_PACKAGE_RULE_GROUP.equals(group)) {
                 bestMatch = findBetterPatternMatch(importPath,
                         STANDARD_JAVA_PACKAGE_RULE_GROUP, standardPackageRegExp, bestMatch);
@@ -647,7 +648,7 @@ else if (customOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) {
         }
 
         if (NON_GROUP_RULE_GROUP.equals(bestMatch.group)
-                && customOrderRules.contains(THIRD_PARTY_PACKAGE_RULE_GROUP)
+                && customImportOrderRules.contains(THIRD_PARTY_PACKAGE_RULE_GROUP)
                 && thirdPartyPackageRegExp.matcher(importPath).find()) {
             bestMatch.group = THIRD_PARTY_PACKAGE_RULE_GROUP;
         }
@@ -766,7 +767,7 @@ private void addRulesToList(String ruleStr) {
                 || THIRD_PARTY_PACKAGE_RULE_GROUP.equals(ruleStr)
                 || STANDARD_JAVA_PACKAGE_RULE_GROUP.equals(ruleStr)
                 || SPECIAL_IMPORTS_RULE_GROUP.equals(ruleStr)) {
-            customOrderRules.add(ruleStr);
+            customImportOrderRules.add(ruleStr);
         }
         else if (ruleStr.startsWith(SAME_PACKAGE_RULE_GROUP)) {
             final String rule = ruleStr.substring(ruleStr.indexOf('(') + 1,
@@ -776,7 +777,7 @@ else if (ruleStr.startsWith(SAME_PACKAGE_RULE_GROUP)) {
                 throw new IllegalArgumentException(
                         "SAME_PACKAGE rule parameter should be positive integer: " + ruleStr);
             }
-            customOrderRules.add(SAME_PACKAGE_RULE_GROUP);
+            customImportOrderRules.add(SAME_PACKAGE_RULE_GROUP);
         }
         else {
             throw new IllegalStateException("Unexpected rule: " + ruleStr);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.java
index 0a41cc021b7..83b8273e1a8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControl.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,26 +43,9 @@ class FileImportControl extends AbstractImportControl {
      */
     /* package */ FileImportControl(PkgImportControl parent, String name, boolean regex) {
         super(parent, MismatchStrategy.DELEGATE_TO_PARENT);
-
         this.regex = regex;
-        if (regex) {
-            this.name = encloseInGroup(name);
-            patternForExactMatch = createPatternForExactMatch(this.name);
-        }
-        else {
-            this.name = name;
-            patternForExactMatch = null;
-        }
-    }
-
-    /**
-     * Enclose {@code expression} in a (non-capturing) group.
-     *
-     * @param expression the input regular expression
-     * @return a grouped pattern.
-     */
-    private static String encloseInGroup(String expression) {
-        return "(?:" + expression + ")";
+        this.name = name;
+        patternForExactMatch = createPatternForExactMatch(name);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java
index 9a6902518a4..48c92fdba61 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,14 +43,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code illegalPkgs} - Specify packages to reject, if <b>regexp</b>
- * property is not set, checks if import is the part of package. If <b>regexp</b>
- * property is set, then list of packages will be interpreted as regular expressions.
- * Note, all properties for match will be used.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code sun}.
- * </li>
- * <li>
  * Property {@code illegalClasses} - Specify class names to reject, if <b>regexp</b>
  * property is not set, checks if import equals class name. If <b>regexp</b>
  * property is set, then list of class names will be interpreted as regular expressions.
@@ -59,6 +51,14 @@
  * Default value is {@code ""}.
  * </li>
  * <li>
+ * Property {@code illegalPkgs} - Specify packages to reject, if <b>regexp</b>
+ * property is not set, checks if import is the part of package. If <b>regexp</b>
+ * property is set, then list of packages will be interpreted as regular expressions.
+ * Note, all properties for match will be used.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code sun}.
+ * </li>
+ * <li>
  * Property {@code regexp} - Control whether the {@code illegalPkgs} and
  * {@code illegalClasses} should be interpreted as regular expressions.
  * Type is {@code boolean}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java
index 3aa81ee0d70..faeb4b34f2a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,6 @@
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.net.URI;
-import java.util.Collections;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -253,7 +252,7 @@ else if (currentImportControl != null) {
 
     @Override
     public Set<String> getExternalResourceLocations() {
-        return Collections.singleton(file.toString());
+        return Set.of(file.toASCIIString());
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java
index b1737868519..ed5666405da 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
index 137b728e811..35c859dae37 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,6 +28,8 @@
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FullIdent;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
 
 /**
  * <p>
@@ -61,36 +63,44 @@
  * </ul>
  * <ul>
  * <li>
- * Property {@code option} - specify policy on the relative order between type imports and static
- * imports.
- * Type is {@code com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderOption}.
- * Default value is {@code under}.
+ * Property {@code caseSensitive} - Control whether string comparison should be
+ * case-sensitive or not. Case-sensitive sorting is in
+ * <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>.
+ * It affects both type imports and static imports.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code groups} - specify list of <b>type import</b> groups. Every group identified
+ * Property {@code groups} - Specify list of <b>type import</b> groups. Every group identified
  * either by a common prefix string, or by a regular expression enclosed in forward slashes
  * (e.g. {@code /regexp/}). All type imports, which does not match any group, falls into an
  * additional group, located at the end.
  * Thus, the empty list of type groups (the default value) means one group for all type imports.
- * Type is {@code java.util.regex.Pattern[]}.
+ * Type is {@code java.lang.String[]}.
  * Default value is {@code ""}.
  * </li>
  * <li>
- * Property {@code ordered} - control whether type imports within each group should be
+ * Property {@code option} - Specify policy on the relative order between type imports and static
+ * imports.
+ * Type is {@code com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderOption}.
+ * Default value is {@code under}.
+ * </li>
+ * <li>
+ * Property {@code ordered} - Control whether type imports within each group should be
  * sorted.
  * It doesn't affect sorting for static imports.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code separated} - control whether type import groups should be separated
+ * Property {@code separated} - Control whether type import groups should be separated
  * by, at least, one blank line or comment and aren't separated internally.
  * It doesn't affect separations for static imports.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code separatedStaticGroups} - control whether static import groups should
+ * Property {@code separatedStaticGroups} - Control whether static import groups should
  * be separated by, at least, one blank line or comment and aren't separated internally.
  * This property has effect only when the property {@code option} is set to {@code top}
  * or {@code bottom} and when property {@code staticGroups} is enabled.
@@ -98,31 +108,23 @@
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code caseSensitive} - control whether string comparison should be
- * case-sensitive or not. Case-sensitive sorting is in
- * <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>.
- * It affects both type imports and static imports.
+ * Property {@code sortStaticImportsAlphabetically} - Control whether
+ * <b>static imports</b> located at <b>top</b> or <b>bottom</b> are sorted within the group.
  * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code staticGroups} - specify list of <b>static</b> import groups. Every group
+ * Property {@code staticGroups} - Specify list of <b>static</b> import groups. Every group
  * identified either by a common prefix string, or by a regular expression enclosed in forward
  * slashes (e.g. {@code /regexp/}). All static imports, which does not match any group, fall into
  * an additional group, located at the end. Thus, the empty list of static groups (the default
  * value) means one group for all static imports. This property has effect only when the property
  * {@code option} is set to {@code top} or {@code bottom}.
- * Type is {@code java.util.regex.Pattern[]}.
+ * Type is {@code java.lang.String[]}.
  * Default value is {@code ""}.
  * </li>
  * <li>
- * Property {@code sortStaticImportsAlphabetically} - control whether
- * <b>static imports</b> located at <b>top</b> or <b>bottom</b> are sorted within the group.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
- * Property {@code useContainerOrderingForStatic} - control whether to use container
+ * Property {@code useContainerOrderingForStatic} - Control whether to use container
  * ordering (Eclipse IDE term) for static imports or not.
  * Type is {@code boolean}.
  * Default value is {@code false}.
@@ -186,7 +188,7 @@ public class ImportOrderCheck
      * located at the end. Thus, the empty list of type groups (the default value) means one group
      * for all type imports.
      */
-    private Pattern[] groups = EMPTY_PATTERN_ARRAY;
+    private String[] groups = CommonUtil.EMPTY_STRING_ARRAY;
 
     /**
      * Specify list of <b>static</b> import groups. Every group identified either by a common prefix
@@ -196,7 +198,7 @@ public class ImportOrderCheck
      * static imports. This property has effect only when the property {@code option} is set to
      * {@code top} or {@code bottom}.
      */
-    private Pattern[] staticGroups = EMPTY_PATTERN_ARRAY;
+    private String[] staticGroups = CommonUtil.EMPTY_STRING_ARRAY;
 
     /**
      * Control whether type import groups should be separated by, at least, one blank
@@ -262,6 +264,16 @@ public class ImportOrderCheck
      */
     private ImportOrderOption option = ImportOrderOption.UNDER;
 
+    /**
+     * Complied array of patterns for property {@code groups}.
+     */
+    private Pattern[] groupsReg = EMPTY_PATTERN_ARRAY;
+
+    /**
+     * Complied array of patterns for property {@code staticGroups}.
+     */
+    private Pattern[] staticGroupsReg = EMPTY_PATTERN_ARRAY;
+
     /**
      * Setter to specify policy on the relative order between type imports and static imports.
      *
@@ -284,7 +296,8 @@ public void setOption(String optionStr) {
      * @since 3.2
      */
     public void setGroups(String... packageGroups) {
-        groups = compilePatterns(packageGroups);
+        groups = UnmodifiableCollectionUtil.copyOfArray(packageGroups, packageGroups.length);
+        groupsReg = compilePatterns(packageGroups);
     }
 
     /**
@@ -299,7 +312,8 @@ public void setGroups(String... packageGroups) {
      * @since 8.12
      */
     public void setStaticGroups(String... packageGroups) {
-        staticGroups = compilePatterns(packageGroups);
+        staticGroups = UnmodifiableCollectionUtil.copyOfArray(packageGroups, packageGroups.length);
+        staticGroupsReg = compilePatterns(packageGroups);
     }
 
     /**
@@ -662,10 +676,10 @@ private static String getImportContainer(String qualifiedImportName) {
     private int getGroupNumber(boolean isStatic, String name) {
         final Pattern[] patterns;
         if (isStatic) {
-            patterns = staticGroups;
+            patterns = staticGroupsReg;
         }
         else {
-            patterns = groups;
+            patterns = groupsReg;
         }
 
         int number = getGroupNumber(patterns, name);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java
index 2dc21daf025..f652aa8fd5a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java
index bfb20f31dd8..d309d3116ea 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java
index ed9a09f6961..1e3fd3cd616 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControl.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,13 +29,13 @@
  * be a sub-package, a class, or an allow/disallow rule.
  */
 class PkgImportControl extends AbstractImportControl {
-    /** The package separator: "." */
+    /** The package separator: ".". */
     private static final String DOT = ".";
 
     /** The regex for the package separator: "\\.". */
     private static final String DOT_REGEX = "\\.";
 
-    /** A pattern matching the package separator: "\." */
+    /** A pattern matching the package separator: "\.". */
     private static final Pattern DOT_REGEX_PATTERN = Pattern.compile(DOT_REGEX);
 
     /** The regex for the escaped package separator: "\\\\.". */
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.java
index df1ac2e926d..89459435d62 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRule.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java
index 6d1bffa61a1..6492b236d76 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java
index 50e164e7b3f..862c4af2405 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -58,6 +58,10 @@
  * The class imported is from the same package.
  * </li>
  * <li>
+ * A static method is imported when used as method reference. In that case,
+ * only the type needs to be imported and that's enough to resolve the method.
+ * </li>
+ * <li>
  * <b>Optionally:</b> it is referenced in Javadoc comments. This check is on by
  * default, but it is considered bad practice to introduce a compile-time
  * dependency for documentation purposes only. As an example, the import
@@ -256,21 +260,35 @@ private void processIdent(DetailAST ast) {
         final DetailAST parent = ast.getParent();
         final int parentType = parent.getType();
 
-        final boolean isPossibleDotClassOrInMethod = parentType == TokenTypes.DOT
-                || parentType == TokenTypes.METHOD_DEF;
-
-        final boolean isQualifiedIdent = parentType == TokenTypes.DOT
-                && !TokenUtil.isOfType(ast.getPreviousSibling(), TokenTypes.DOT)
-                && ast.getNextSibling() != null;
+        final boolean isClassOrMethod = parentType == TokenTypes.DOT
+                || parentType == TokenTypes.METHOD_DEF || parentType == TokenTypes.METHOD_REF;
 
         if (TokenUtil.isTypeDeclaration(parentType)) {
             currentFrame.addDeclaredType(ast.getText());
         }
-        else if (!isPossibleDotClassOrInMethod || isQualifiedIdent) {
+        else if (!isClassOrMethod || isQualifiedIdentifier(ast)) {
             currentFrame.addReferencedType(ast.getText());
         }
     }
 
+    /**
+     * Checks whether ast is a fully qualified identifier.
+     *
+     * @param ast to check
+     * @return true if given ast is a fully qualified identifier
+     */
+    private static boolean isQualifiedIdentifier(DetailAST ast) {
+        final DetailAST parent = ast.getParent();
+        final int parentType = parent.getType();
+
+        final boolean isQualifiedIdent = parentType == TokenTypes.DOT
+                && !TokenUtil.isOfType(ast.getPreviousSibling(), TokenTypes.DOT)
+                && ast.getNextSibling() != null;
+        final boolean isQualifiedIdentFromMethodRef = parentType == TokenTypes.METHOD_REF
+                && ast.getNextSibling() != null;
+        return isQualifiedIdent || isQualifiedIdentFromMethodRef;
+    }
+
     /**
      * Collects the details of imports.
      *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/package-info.java
index 2fe14f94523..4731b0e5421 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.java
index 0880befefad..fde840aa6bc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AbstractExpressionHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.java
index 96353a480f8..b84e7d0f135 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/AnnotationArrayInitHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
index 01f6654f32b..1087e76eeea 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
index 8fda9cbab22..12e33bfa5aa 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java
index d44e86f1fc3..50717007a2f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CaseHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.java
index d43587765f4..5ba44deba87 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CatchHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.java
index 2aacaebd574..d299b06a274 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ClassDefHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java
index 7cdc587c294..0a423b82804 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.java
index e9e71b447b3..35875457bbb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DetailAstSet.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.java
index 2a14d95c987..a749d98f553 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/DoWhileHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.java
index 4ecf800fc49..7046e69d5a6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ElseHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.java
index 0432c82e9d8..d2ec9fb360b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/FinallyHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java
index 729a2162abd..bc1881f6a48 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
index 903c197fdff..c482852a99e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java
index 5839baabc00..41db9baaafb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.java
index 6db1d5263c6..2a207984fc3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ImportHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java
index aea6cd32351..db1d9ee284a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentLevel.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java
index f6bbea4ba65..4fb8293e9d5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -68,6 +68,12 @@
  * </pre>
  * <ul>
  * <li>
+ * Property {@code arrayInitIndent} - Specify how far an array initialization
+ * should be indented when on next line.
+ * Type is {@code int}.
+ * Default value is {@code 4}.
+ * </li>
+ * <li>
  * Property {@code basicOffset} - Specify how far new indentation level should be
  * indented when on the next line.
  * Type is {@code int}.
@@ -86,16 +92,12 @@
  * Default value is {@code 4}.
  * </li>
  * <li>
- * Property {@code throwsIndent} - Specify how far a throws clause should be
- * indented when on next line.
- * Type is {@code int}.
- * Default value is {@code 4}.
- * </li>
- * <li>
- * Property {@code arrayInitIndent} - Specify how far an array initialisation
- * should be indented when on next line.
- * Type is {@code int}.
- * Default value is {@code 4}.
+ * Property {@code forceStrictCondition} - Force strict indent level in line
+ * wrapping case. If value is true, line wrap indent have to be same as
+ * lineWrappingIndentation parameter. If value is false, line wrap indent
+ * could be bigger on any value user would like.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code lineWrappingIndentation} - Specify how far continuation line
@@ -104,12 +106,10 @@
  * Default value is {@code 4}.
  * </li>
  * <li>
- * Property {@code forceStrictCondition} - Force strict indent level in line
- * wrapping case. If value is true, line wrap indent have to be same as
- * lineWrappingIndentation parameter. If value is false, line wrap indent
- * could be bigger on any value user would like.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code throwsIndent} - Specify how far a throws clause should be
+ * indented when on next line.
+ * Type is {@code int}.
+ * Default value is {@code 4}.
  * </li>
  * </ul>
  * <p>
@@ -222,7 +222,7 @@ public class IndentationCheck extends AbstractCheck {
     /** Specify how far a throws clause should be indented when on next line. */
     private int throwsIndent = DEFAULT_INDENTATION;
 
-    /** Specify how far an array initialisation should be indented when on next line. */
+    /** Specify how far an array initialization should be indented when on next line. */
     private int arrayInitIndent = DEFAULT_INDENTATION;
 
     /** Specify how far continuation line should be indented when line-wrapping is present. */
@@ -335,9 +335,9 @@ public int getThrowsIndent() {
     }
 
     /**
-     * Setter to specify how far an array initialisation should be indented when on next line.
+     * Setter to specify how far an array initialization should be indented when on next line.
      *
-     * @param arrayInitIndent the array initialisation indentation level
+     * @param arrayInitIndent the array initialization indentation level
      * @since 5.8
      */
     public void setArrayInitIndent(int arrayInitIndent) {
@@ -345,9 +345,9 @@ public void setArrayInitIndent(int arrayInitIndent) {
     }
 
     /**
-     * Getter to query how far an array initialisation should be indented when on next line.
+     * Getter to query how far an array initialization should be indented when on next line.
      *
-     * @return the initialisation indentation level
+     * @return the initialization indentation level
      */
     public int getArrayInitIndent() {
         return arrayInitIndent;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.java
index c3341ca3151..b1372f9c70c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndexHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.java
index 748d96c3fdc..b4a22dad7a5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LabelHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java
index 80e73ad1d93..422ebe7d395 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LambdaHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java
index 25c935242e3..fbca8742708 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -81,6 +81,7 @@ public static LineWrappingOptions ofBoolean(boolean val) {
      * @see CaseHandler#getIndentImpl()
      */
     private static final int[] IGNORED_LIST = {
+        TokenTypes.LCURLY,
         TokenTypes.RCURLY,
         TokenTypes.LITERAL_NEW,
         TokenTypes.ARRAY_INIT,
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.java
index 7de98ff70b7..c9cf977756a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MemberDefHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,8 @@
 
 package com.puppycrawl.tools.checkstyle.checks.indentation;
 
+import java.util.Optional;
+
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
@@ -51,13 +53,30 @@ public void checkIndentation() {
             checkType();
         }
         final DetailAST firstNode = getMainAst();
-        final DetailAST lastNode = getVarDefStatementSemicolon(firstNode);
+        final DetailAST lastNode = getArrayInitNode(firstNode)
+            .orElseGet(() -> getVarDefStatementSemicolon(firstNode));
 
-        if (lastNode != null && !isArrayDeclaration(firstNode)) {
+        if (lastNode != null) {
             checkWrappingIndentation(firstNode, lastNode);
         }
     }
 
+    /**
+     * Finds the array init node.
+     *
+     * @param firstNode Node to begin searching
+     * @return array init node
+     */
+    private static Optional<DetailAST> getArrayInitNode(DetailAST firstNode) {
+        return Optional.ofNullable(firstNode.findFirstToken(TokenTypes.ASSIGN))
+            .map(assign -> {
+                return Optional.ofNullable(assign.findFirstToken(TokenTypes.EXPR))
+                    .map(expr -> expr.findFirstToken(TokenTypes.LITERAL_NEW))
+                    .orElse(assign);
+            })
+            .map(node -> node.findFirstToken(TokenTypes.ARRAY_INIT));
+    }
+
     @Override
     public IndentLevel getSuggestedChildIndent(AbstractExpressionHandler child) {
         return getIndent();
@@ -84,17 +103,6 @@ private void checkType() {
         }
     }
 
-    /**
-     * Checks if variable_def node is array declaration.
-     *
-     * @param variableDef current variable_def.
-     * @return true if variable_def node is array declaration.
-     */
-    private static boolean isArrayDeclaration(DetailAST variableDef) {
-        return variableDef.findFirstToken(TokenTypes.TYPE)
-            .findFirstToken(TokenTypes.ARRAY_DECLARATOR) != null;
-    }
-
     /**
      * Returns semicolon for variable definition statement.
      *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java
index bcbaf129183..f56d1e33599 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.java
index 99ac7afec7b..629b111c9d3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/MethodDefHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java
index eb786c88fb0..1766763186d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/NewHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java
index 76e67779ab4..f7b6db80b07 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ObjectBlockHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.java
index b9f9693e0e8..0bfefbaf270 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PackageDefHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.java
index e05959e623b..1f41799153e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/PrimordialHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java
index 5c730cbbbc0..140492abe5a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.java
index 2145ba4a2f9..8b03fa6c0ec 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/StaticInitHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java
index 010377e858e..dd8cc459f2b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.java
index f2d4cc28f38..95a7cf51e2b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchRuleHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java
index 9f37e88e210..5be7a15f65e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SynchronizedHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java
index 7eae8945c78..730eba8eab8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.java
index 66d0be4dbf8..94484745789 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/WhileHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.java
index 1454eb1af4c..9808bd0c73e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/YieldHandler.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/package-info.java
index e3bbfc65963..ce568eb4e52 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
index f0f18a63fbe..f0cad7474c8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -71,6 +72,12 @@ public abstract class AbstractJavadocCheck extends AbstractCheck {
     public static final String MSG_JAVADOC_PARSE_RULE_ERROR =
             JavadocDetailNodeParser.MSG_JAVADOC_PARSE_RULE_ERROR;
 
+    /**
+     * Message key of error message.
+     */
+    public static final String MSG_KEY_UNCLOSED_HTML_TAG =
+            JavadocDetailNodeParser.MSG_UNCLOSED_HTML_TAG;
+
     /**
      * Key is "line:column". Value is {@link DetailNode} tree. Map is stored in {@link ThreadLocal}
      * to guarantee basic thread safety and avoid shared, mutable state when not necessary.
@@ -166,6 +173,7 @@ public boolean acceptJavadocWithNonTightHtml() {
      *     Tight-HTML Rules</a>.
      *
      * @param shouldReportViolation value to which the field shall be set to
+     * @since 8.3
      */
     public final void setViolateExecutionOnNonTightHtml(boolean shouldReportViolation) {
         violateExecutionOnNonTightHtml = shouldReportViolation;
@@ -187,7 +195,8 @@ public void init() {
         validateDefaultJavadocTokens();
         if (javadocTokens.isEmpty()) {
             javadocTokens.addAll(
-                    Arrays.stream(getDefaultJavadocTokens()).boxed().collect(Collectors.toList()));
+                    Arrays.stream(getDefaultJavadocTokens()).boxed()
+                        .collect(Collectors.toUnmodifiableList()));
         }
         else {
             final int[] acceptableJavadocTokens = getAcceptableJavadocTokens();
@@ -209,19 +218,25 @@ public void init() {
      * @throws IllegalStateException when validation of default javadoc tokens fails
      */
     private void validateDefaultJavadocTokens() {
-        if (getRequiredJavadocTokens().length != 0) {
-            final int[] defaultJavadocTokens = getDefaultJavadocTokens();
-            Arrays.sort(defaultJavadocTokens);
-            for (final int javadocToken : getRequiredJavadocTokens()) {
-                if (Arrays.binarySearch(defaultJavadocTokens, javadocToken) < 0) {
-                    final String message = String.format(Locale.ROOT,
-                            "Javadoc Token \"%s\" from required javadoc "
-                                + "tokens was not found in default "
-                                + "javadoc tokens list in check %s",
-                            javadocToken, getClass().getName());
-                    throw new IllegalStateException(message);
-                }
-            }
+        final Set<Integer> defaultTokens = Arrays.stream(getDefaultJavadocTokens())
+                .boxed()
+                .collect(Collectors.toUnmodifiableSet());
+
+        final List<Integer> missingRequiredTokenNames = Arrays.stream(getRequiredJavadocTokens())
+                .boxed()
+                .filter(token -> !defaultTokens.contains(token))
+                .collect(Collectors.toUnmodifiableList());
+
+        if (!missingRequiredTokenNames.isEmpty()) {
+            final String message = String.format(Locale.ROOT,
+                        "Javadoc Token \"%s\" from required javadoc "
+                            + "tokens was not found in default "
+                            + "javadoc tokens list in check %s",
+                        missingRequiredTokenNames.stream()
+                        .map(String::valueOf)
+                        .collect(Collectors.joining(", ")),
+                        getClass().getName());
+            throw new IllegalStateException(message);
         }
     }
 
@@ -319,7 +334,7 @@ public final void visitToken(DetailAST blockCommentNode) {
 
                 if (violateExecutionOnNonTightHtml && result.isNonTight()) {
                     log(result.getFirstNonTightHtmlTag().getLine(),
-                            JavadocDetailNodeParser.MSG_UNCLOSED_HTML_TAG,
+                            MSG_KEY_UNCLOSED_HTML_TAG,
                             result.getFirstNonTightHtmlTag().getText());
                 }
             }
@@ -374,11 +389,9 @@ private void walk(DetailNode root) {
                 }
 
                 toVisit = JavadocUtil.getNextSibling(curNode);
-                if (toVisit == null) {
-                    curNode = curNode.getParent();
-                    if (curNode != null) {
-                        waitsForProcessing = shouldBeProcessed(curNode);
-                    }
+                curNode = curNode.getParent();
+                if (curNode != null) {
+                    waitsForProcessing = shouldBeProcessed(curNode);
                 }
             }
             curNode = toVisit;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java
index a8f33a6208a..f430bbdb48f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -45,11 +45,10 @@
  *
  * <ul>
  * <li>
- * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations if the
- * Javadoc being examined by this check violates the tight html rules defined at
- * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code tagOrder} - Specify the order by tags.
+ * Type is {@code java.lang.String[]}.
+ * Default value is
+ * {@code @author, @deprecated, @exception, @param, @return, @see, @serial, @serialData, @serialField, @since, @throws, @version}.
  * </li>
  * <li>
  * Property {@code target} - Specify block tags targeted.
@@ -74,10 +73,11 @@
  * VARIABLE_DEF</a>.
  * </li>
  * <li>
- * Property {@code tagOrder} - Specify the order by tags.
- * Type is {@code java.lang.String[]}.
- * Default value is
- * {@code @author, @deprecated, @exception, @param, @return, @see, @serial, @serialData, @serialField, @since, @throws, @version}.
+ * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations if the
+ * Javadoc being examined by this check violates the tight html rules defined at
+ * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * </ul>
  * <p>
@@ -97,6 +97,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * </ul>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java
index 7eba5e67ea3..b2cdd17807d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/HtmlTag.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.java
index f6a69830bd0..65fe749cfb8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.java
index 9439047a231..56d2749bdbd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocTag.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.java
index e59c7d8d62a..d9426555c5b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -88,6 +88,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * </ul>
@@ -149,7 +152,7 @@ public JavadocBlockTagLocationCheck() {
      * @since 8.24
      */
     public final void setTags(String... values) {
-        tags = Arrays.stream(values).collect(Collectors.toSet());
+        tags = Arrays.stream(values).collect(Collectors.toUnmodifiableSet());
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.java
index 9e4c47cd45a..808bd5f7306 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.java
index b0bf56e34d6..efdc52c5137 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java
index b879b1d0139..80553d98975 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,6 +42,7 @@
 import com.puppycrawl.tools.checkstyle.utils.AnnotationUtil;
 import com.puppycrawl.tools.checkstyle.utils.CheckUtil;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
 
 /**
  * <p>
@@ -102,16 +103,6 @@
  * </pre>
  * <ul>
  * <li>
- * Property {@code allowedAnnotations} - Specify annotations that allow missed documentation.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code Override}.
- * </li>
- * <li>
- * Property {@code validateThrows} - Control whether to validate {@code throws} tags.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
  * Property {@code accessModifiers} - Specify the access modifiers where Javadoc comments are
  * checked.
  * Type is {@code com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]}.
@@ -130,6 +121,16 @@
  * Default value is {@code false}.
  * </li>
  * <li>
+ * Property {@code allowedAnnotations} - Specify annotations that allow missed documentation.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code Override}.
+ * </li>
+ * <li>
+ * Property {@code validateThrows} - Control whether to validate {@code throws} tags.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -310,7 +311,7 @@ public void setAllowedAnnotations(String... userAnnotations) {
      */
     public void setAccessModifiers(AccessModifierOption... accessModifiers) {
         this.accessModifiers =
-            Arrays.copyOf(accessModifiers, accessModifiers.length);
+            UnmodifiableCollectionUtil.copyOfArray(accessModifiers, accessModifiers.length);
     }
 
     /**
@@ -519,8 +520,7 @@ else if (javadocNoargMatcher.find()) {
                 tags.add(new JavadocTag(currentLine, col, javadocNoargMatcher.group(1)));
             }
             else if (noargCurlyMatcher.find()) {
-                final int col = calculateTagColumn(noargCurlyMatcher, i, startColumnNumber);
-                tags.add(new JavadocTag(currentLine, col, noargCurlyMatcher.group(1)));
+                tags.add(new JavadocTag(currentLine, 0, noargCurlyMatcher.group(1)));
             }
             else if (noargMultilineStart.find()) {
                 tags.addAll(getMultilineNoArgTags(noargMultilineStart, lines, i, currentLine));
@@ -590,11 +590,9 @@ private static List<DetailAST> getParameters(DetailAST ast) {
 
         DetailAST child = params.getFirstChild();
         while (child != null) {
-            if (child.getType() == TokenTypes.PARAMETER_DEF) {
-                final DetailAST ident = child.findFirstToken(TokenTypes.IDENT);
-                if (ident != null) {
-                    returnValue.add(ident);
-                }
+            final DetailAST ident = child.findFirstToken(TokenTypes.IDENT);
+            if (ident != null) {
+                returnValue.add(ident);
             }
             child = child.getNextSibling();
         }
@@ -686,14 +684,13 @@ private static DetailAST getFirstClassNameNode(DetailAST ast) {
      * @return true if throwAst is inside a block that should be ignored
      */
     private static boolean isInIgnoreBlock(DetailAST methodBodyAst, DetailAST throwAst) {
-        DetailAST ancestor = throwAst.getParent();
+        DetailAST ancestor = throwAst;
         while (ancestor != methodBodyAst) {
-            if (ancestor.getType() == TokenTypes.LITERAL_TRY
-                    && ancestor.findFirstToken(TokenTypes.LITERAL_CATCH) != null
-                    || ancestor.getType() == TokenTypes.LAMBDA
-                    || ancestor.getType() == TokenTypes.OBJBLOCK) {
-                // throw is inside a try block, and there is a catch block,
-                // or throw is inside a lambda expression/anonymous class/local class
+            if (ancestor.getType() == TokenTypes.LAMBDA
+                    || ancestor.getType() == TokenTypes.OBJBLOCK
+                    || ancestor.findFirstToken(TokenTypes.LITERAL_CATCH) != null) {
+                // throw is inside a lambda expression/anonymous class/local class,
+                // or throw is inside a try block, and there is a catch block
                 break;
             }
             if (ancestor.getType() == TokenTypes.LITERAL_CATCH
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java
index f9556620b9e..80a31b8f545 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -62,6 +62,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * </ul>
@@ -150,8 +153,7 @@ private static boolean isLeadingAsterisk(DetailNode detailNode) {
      */
     private static boolean isLastLine(DetailNode detailNode) {
         final DetailNode node;
-        if (detailNode.getType() == JavadocTokenTypes.TEXT
-                && CommonUtil.isBlank(detailNode.getText())) {
+        if (CommonUtil.isBlank(detailNode.getText())) {
             node = getNextNode(detailNode);
         }
         else {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.java
index 1aa0368fb05..f9fa38c1e07 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -57,6 +57,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * </ul>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.java
index fd90c42594d..6dd9645aecb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-import java.util.Arrays;
 import java.util.Objects;
 import java.util.Optional;
 
 import com.puppycrawl.tools.checkstyle.api.DetailNode;
 import com.puppycrawl.tools.checkstyle.utils.JavadocUtil;
+import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
 
 /**
  * Implementation of DetailNode interface that is mutable.
@@ -95,7 +95,7 @@ public int getColumnNumber() {
     @Override
     public DetailNode[] getChildren() {
         return Optional.ofNullable(children)
-                .map(array -> Arrays.copyOf(array, array.length))
+                .map(array -> UnmodifiableCollectionUtil.copyOfArray(array, array.length))
                 .orElse(EMPTY_DETAIL_NODE_ARRAY);
     }
 
@@ -151,7 +151,7 @@ public void setColumnNumber(int columnNumber) {
      * @param children Array of child nodes.
      */
     public void setChildren(DetailNode... children) {
-        this.children = Arrays.copyOf(children, children.length);
+        this.children = UnmodifiableCollectionUtil.copyOfArray(children, children.length);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.java
index 4394962cc81..31ff52d0324 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -45,7 +45,7 @@
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code fileExtensions} - Specify the file type extension of files to process.
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code .java}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.java
index 1c62d765f13..c81839bd297 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,6 +39,12 @@
  * </ul>
  * <ul>
  * <li>
+ * Property {@code allowNewlineParagraph} - Control whether the &lt;p&gt; tag
+ * should be placed immediately before the first word.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
+ * </li>
+ * <li>
  * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations
  * if the Javadoc being examined by this check violates the tight html rules defined at
  * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">
@@ -46,12 +52,6 @@
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
- * <li>
- * Property {@code allowNewlineParagraph} - Control whether the &lt;p&gt; tag
- * should be placed immediately before the first word.
- * Type is {@code boolean}.
- * Default value is {@code true}.
- * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
@@ -79,6 +79,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * </ul>
@@ -249,7 +252,7 @@ private static boolean isFirstParagraph(DetailNode paragraphTag) {
      * @return Some nearest empty line in javadoc.
      */
     private static DetailNode getNearestEmptyLine(DetailNode node) {
-        DetailNode newLine = JavadocUtil.getPreviousSibling(node);
+        DetailNode newLine = node;
         while (newLine != null) {
             final DetailNode previousSibling = JavadocUtil.getPreviousSibling(newLine);
             if (newLine.getType() == JavadocTokenTypes.NEWLINE && isEmptyLine(newLine)) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
index a36e184f3a3..3349075c1a0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,10 +20,12 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import java.util.ArrayDeque;
+import java.util.Arrays;
 import java.util.Deque;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.JavadocDetailNodeParser;
@@ -49,6 +51,9 @@
  * <li>
  * Ensures the first sentence ends with proper punctuation
  * (That is a period, question mark, or exclamation mark, by default).
+ * Note that this check is not applied to inline {@code @return} tags,
+ * because the Javadoc tools automatically appends a period to the end of the tag
+ * content.
  * Javadoc automatically places the first sentence in the method summary
  * table and index. Without proper punctuation the Javadoc may be malformed.
  * All items eligible for the {@code {@inheritDoc}} tag are exempt from this
@@ -85,15 +90,10 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code private}.
- * </li>
- * <li>
- * Property {@code excludeScope} - Specify the visibility scope where
- * Javadoc comments are not checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code null}.
+ * Property {@code checkEmptyJavadoc} - Control whether to check if the Javadoc
+ * is missing a describing text.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code checkFirstSentence} - Control whether to check the first
@@ -102,21 +102,26 @@
  * Default value is {@code true}.
  * </li>
  * <li>
+ * Property {@code checkHtml} - Control whether to check for incomplete HTML tags.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
+ * </li>
+ * <li>
  * Property {@code endOfSentenceFormat} - Specify the format for matching
  * the end of a sentence.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "([.?!][ \t\n\r\f&lt;])|([.?!]$)"}.
  * </li>
  * <li>
- * Property {@code checkEmptyJavadoc} - Control whether to check if the Javadoc
- * is missing a describing text.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code excludeScope} - Specify the visibility scope where
+ * Javadoc comments are not checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code checkHtml} - Control whether to check for incomplete HTML tags.
- * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
+ * Default value is {@code private}.
  * </li>
  * <li>
  * Property {@code tokens} - tokens to check
@@ -215,6 +220,13 @@ public class JavadocStyleCheck
         "tr", "tt", "u", "ul", "var"
     );
 
+    /** Specify the format for inline return Javadoc. */
+    private static final Pattern INLINE_RETURN_TAG_PATTERN =
+            Pattern.compile("\\{@return.*?}\\s*");
+
+    /** Specify the format for first word in javadoc. */
+    private static final Pattern SENTENCE_SEPARATOR = Pattern.compile("\\.(?=\\s|$)");
+
     /** Specify the visibility scope where Javadoc comments are checked. */
     private Scope scope = Scope.PRIVATE;
 
@@ -300,11 +312,9 @@ else if (!ScopeUtil.isInCodeBlock(ast)) {
             final Scope surroundingScope = ScopeUtil.getSurroundingScope(ast);
 
             check = customScope.isIn(scope)
-                    && (surroundingScope == null || surroundingScope.isIn(scope))
-                    && (excludeScope == null
-                        || !customScope.isIn(excludeScope)
-                        || surroundingScope != null
-                            && !surroundingScope.isIn(excludeScope));
+                    && surroundingScope.isIn(scope)
+                    && (excludeScope == null || !customScope.isIn(excludeScope)
+                            || !surroundingScope.isIn(excludeScope));
         }
         return check;
     }
@@ -346,8 +356,14 @@ private void checkComment(final DetailAST ast, final TextBlock comment) {
      */
     private void checkFirstSentenceEnding(final DetailAST ast, TextBlock comment) {
         final String commentText = getCommentText(comment.getText());
-
-        if (!commentText.isEmpty()
+        final boolean hasInLineReturnTag = Arrays.stream(SENTENCE_SEPARATOR.split(commentText))
+                .findFirst()
+                .map(INLINE_RETURN_TAG_PATTERN::matcher)
+                .filter(Matcher::find)
+                .isPresent();
+
+        if (!hasInLineReturnTag
+            && !commentText.isEmpty()
             && !endOfSentenceFormat.matcher(commentText).find()
             && !(commentText.startsWith("{@inheritDoc}")
             && JavadocTagInfo.INHERIT_DOC.isValidOn(ast))) {
@@ -407,10 +423,8 @@ private static int findTextStart(String line) {
         int index = 0;
         while (index < line.length()) {
             if (!Character.isWhitespace(line.charAt(index))) {
-                if (line.regionMatches(index, "/**", 0, "/**".length())) {
-                    index += 2;
-                }
-                else if (line.regionMatches(index, "*/", 0, 2)) {
+                if (line.regionMatches(index, "/**", 0, "/**".length())
+                    || line.regionMatches(index, "*/", 0, 2)) {
                     index++;
                 }
                 else if (line.charAt(index) != '*') {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.java
index ede38fe263f..d8508904c87 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java
index 1009a861834..bae7cb4c715 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,17 +38,17 @@
  * </p>
  * <ul>
  * <li>
+ * Property {@code offset} - Specify how many spaces to use for new indentation level.
+ * Type is {@code int}.
+ * Default value is {@code 4}.
+ * </li>
+ * <li>
  * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations
  * if the Javadoc being examined by this check violates the tight html rules defined at
  * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
- * <li>
- * Property {@code offset} - Specify how many spaces to use for new indentation level.
- * Type is {@code int}.
- * Default value is {@code 4}.
- * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
@@ -64,6 +64,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * <li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java
index d2e52980547..583190797ed 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfo.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.java
index 6e5c423aff9..d3789203f06 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTags.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
index 84578b0bb7f..689665392b4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,27 +63,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code private}.
- * </li>
- * <li>
- * Property {@code excludeScope} - Specify the visibility scope where Javadoc
- * comments are not checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code null}.
- * </li>
- * <li>
- * Property {@code authorFormat} - Specify the pattern for {@code @author} tag.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
- * </li>
- * <li>
- * Property {@code versionFormat} - Specify the pattern for {@code @version} tag.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code allowMissingParamTags} - Control whether to ignore violations
  * when a class has type parameters but does not have matching param tags in the Javadoc.
  * Type is {@code boolean}.
@@ -102,6 +81,27 @@
  * Default value is {@code Generated}.
  * </li>
  * <li>
+ * Property {@code authorFormat} - Specify the pattern for {@code @author} tag.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code null}.
+ * </li>
+ * <li>
+ * Property {@code excludeScope} - Specify the visibility scope where Javadoc
+ * comments are not checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
+ * Default value is {@code null}.
+ * </li>
+ * <li>
+ * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
+ * Default value is {@code private}.
+ * </li>
+ * <li>
+ * Property {@code versionFormat} - Specify the pattern for {@code @version} tag.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code null}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -190,7 +190,7 @@ public class JavadocTypeCheck
 
     /** Pattern to match type name within angle brackets in javadoc param tag. */
     private static final Pattern TYPE_NAME_IN_JAVADOC_TAG =
-            Pattern.compile("\\s*<([^>]+)>.*");
+            Pattern.compile("^<([^>]+)");
 
     /** Pattern to split type name field in javadoc param tag. */
     private static final Pattern TYPE_NAME_IN_JAVADOC_TAG_SPLITTER =
@@ -357,16 +357,11 @@ public void visitToken(DetailAST ast) {
      * @return whether we should check a given node.
      */
     private boolean shouldCheck(DetailAST ast) {
-        final Scope customScope = ScopeUtil.getScope(ast);
         final Scope surroundingScope = ScopeUtil.getSurroundingScope(ast);
 
-        return customScope.isIn(scope)
-            && (surroundingScope == null || surroundingScope.isIn(scope))
-            && (excludeScope == null
-                || !customScope.isIn(excludeScope)
-                || surroundingScope != null
-                && !surroundingScope.isIn(excludeScope))
-            && !AnnotationUtil.containsAnnotation(ast, allowedAnnotations);
+        return surroundingScope.isIn(scope)
+                && (excludeScope == null || !surroundingScope.isIn(excludeScope))
+                && !AnnotationUtil.containsAnnotation(ast, allowedAnnotations);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java
index 046ecbc4cdb..d0e38e1ae99 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,11 +36,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code private}.
- * </li>
- * <li>
  * Property {@code excludeScope} - Specify the visibility scope where Javadoc
  * comments are not checked.
  * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
@@ -52,6 +47,11 @@
  * Default value is {@code null}.
  * </li>
  * <li>
+ * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
+ * Default value is {@code private}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java
index c7f152af3c2..448326414c4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,6 @@
 import com.puppycrawl.tools.checkstyle.api.TextBlock;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.utils.AnnotationUtil;
-import com.puppycrawl.tools.checkstyle.utils.CheckUtil;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 import com.puppycrawl.tools.checkstyle.utils.ScopeUtil;
 
@@ -70,10 +69,10 @@
  * </pre>
  * <ul>
  * <li>
- * Property {@code minLineCount} - Control the minimal amount of lines in method to allow no
- * documentation.
- * Type is {@code int}.
- * Default value is {@code -1}.
+ * Property {@code allowMissingPropertyJavadoc} - Control whether to allow missing Javadoc on
+ * accessor methods for properties (setters and getters).
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code allowedAnnotations} - Configure annotations that allow missed
@@ -82,29 +81,29 @@
  * Default value is {@code Override}.
  * </li>
  * <li>
- * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code public}.
- * </li>
- * <li>
  * Property {@code excludeScope} - Specify the visibility scope where Javadoc comments are
  * not checked.
  * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code allowMissingPropertyJavadoc} - Control whether to allow missing Javadoc on
- * accessor methods for properties (setters and getters).
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
- * Property {@code ignoreMethodNamesRegex} - ignore method whose names are matching specified
+ * Property {@code ignoreMethodNamesRegex} - Ignore method whose names are matching specified
  * regex.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
  * <li>
+ * Property {@code minLineCount} - Control the minimal amount of lines in method to allow no
+ * documentation.
+ * Type is {@code int}.
+ * Default value is {@code -1}.
+ * </li>
+ * <li>
+ * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
+ * Default value is {@code public}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -142,6 +141,18 @@ public class MissingJavadocMethodCheck extends AbstractCheck {
      */
     public static final String MSG_JAVADOC_MISSING = "javadoc.missing";
 
+    /** Maximum children allowed in setter/getter. */
+    private static final int SETTER_GETTER_MAX_CHILDREN = 7;
+
+    /** Pattern matching names of getter methods. */
+    private static final Pattern GETTER_PATTERN = Pattern.compile("^(is|get)[A-Z].*");
+
+    /** Pattern matching names of setter methods. */
+    private static final Pattern SETTER_PATTERN = Pattern.compile("^set[A-Z].*");
+
+    /** Maximum nodes allowed in a body of setter. */
+    private static final int SETTER_BODY_SIZE = 3;
+
     /** Default value of minimal amount of lines in method to allow no documentation.*/
     private static final int DEFAULT_MIN_LINE_COUNT = -1;
 
@@ -290,7 +301,7 @@ private static int getMethodsNumberOfLine(DetailAST methodDef) {
      */
     private boolean isMissingJavadocAllowed(final DetailAST ast) {
         return allowMissingPropertyJavadoc
-                && (CheckUtil.isSetterMethod(ast) || CheckUtil.isGetterMethod(ast))
+                && (isSetterMethod(ast) || isGetterMethod(ast))
             || matchesSkipRegex(ast)
             || isContentsAllowMissingJavadoc(ast);
     }
@@ -303,9 +314,7 @@ private boolean isMissingJavadocAllowed(final DetailAST ast) {
      * @return True if this method or constructor doesn't need Javadoc.
      */
     private boolean isContentsAllowMissingJavadoc(DetailAST ast) {
-        return (ast.getType() == TokenTypes.METHOD_DEF
-                || ast.getType() == TokenTypes.CTOR_DEF
-                || ast.getType() == TokenTypes.COMPACT_CTOR_DEF)
+        return ast.getType() != TokenTypes.ANNOTATION_FIELD_DEF
                 && (getMethodsNumberOfLine(ast) <= minLineCount
                     || AnnotationUtil.containsAnnotation(ast, allowedAnnotations));
     }
@@ -341,11 +350,82 @@ private boolean matchesSkipRegex(DetailAST methodDef) {
     private boolean shouldCheck(final DetailAST ast, final Scope nodeScope) {
         final Scope surroundingScope = ScopeUtil.getSurroundingScope(ast);
 
-        return (excludeScope == null
-                || nodeScope != excludeScope
-                && surroundingScope != excludeScope)
-            && nodeScope.isIn(scope)
-            && surroundingScope.isIn(scope);
+        return nodeScope != excludeScope
+                && surroundingScope != excludeScope
+                && nodeScope.isIn(scope)
+                && surroundingScope.isIn(scope);
     }
 
+    /**
+     * Returns whether an AST represents a getter method.
+     *
+     * @param ast the AST to check with
+     * @return whether the AST represents a getter method
+     */
+    public static boolean isGetterMethod(final DetailAST ast) {
+        boolean getterMethod = false;
+
+        // Check have a method with exactly 7 children which are all that
+        // is allowed in a proper getter method which does not throw any
+        // exceptions.
+        if (ast.getType() == TokenTypes.METHOD_DEF
+                && ast.getChildCount() == SETTER_GETTER_MAX_CHILDREN) {
+            final DetailAST type = ast.findFirstToken(TokenTypes.TYPE);
+            final String name = type.getNextSibling().getText();
+            final boolean matchesGetterFormat = GETTER_PATTERN.matcher(name).matches();
+
+            final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS);
+            final boolean noParams = params.getChildCount(TokenTypes.PARAMETER_DEF) == 0;
+
+            if (matchesGetterFormat && noParams) {
+                // Now verify that the body consists of:
+                // SLIST -> RETURN
+                // RCURLY
+                final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST);
+
+                if (slist != null) {
+                    final DetailAST expr = slist.getFirstChild();
+                    getterMethod = expr.getType() == TokenTypes.LITERAL_RETURN;
+                }
+            }
+        }
+        return getterMethod;
+    }
+
+    /**
+     * Returns whether an AST represents a setter method.
+     *
+     * @param ast the AST to check with
+     * @return whether the AST represents a setter method
+     */
+    public static boolean isSetterMethod(final DetailAST ast) {
+        boolean setterMethod = false;
+
+        // Check have a method with exactly 7 children which are all that
+        // is allowed in a proper setter method which does not throw any
+        // exceptions.
+        if (ast.getType() == TokenTypes.METHOD_DEF
+                && ast.getChildCount() == SETTER_GETTER_MAX_CHILDREN) {
+            final DetailAST type = ast.findFirstToken(TokenTypes.TYPE);
+            final String name = type.getNextSibling().getText();
+            final boolean matchesSetterFormat = SETTER_PATTERN.matcher(name).matches();
+
+            final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS);
+            final boolean singleParam = params.getChildCount(TokenTypes.PARAMETER_DEF) == 1;
+
+            if (matchesSetterFormat && singleParam) {
+                // Now verify that the body consists of:
+                // SLIST -> EXPR -> ASSIGN
+                // SEMI
+                // RCURLY
+                final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST);
+
+                if (slist != null && slist.getChildCount() == SETTER_BODY_SIZE) {
+                    final DetailAST expr = slist.getFirstChild();
+                    setterMethod = expr.getFirstChild().getType() == TokenTypes.ASSIGN;
+                }
+            }
+        }
+        return setterMethod;
+    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.java
index d6012424bd1..b2c5c820553 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -121,7 +121,7 @@ private static boolean hasJavadocAboveAnnotation(DetailAST ast) {
             .map(DetailAST::getFirstChild);
         boolean result = false;
         if (firstAnnotationChild.isPresent()) {
-            for (DetailAST child = firstAnnotationChild.get(); child != null;
+            for (DetailAST child = firstAnnotationChild.orElseThrow(); child != null;
                  child = child.getNextSibling()) {
                 if (isJavadoc(child)) {
                     result = true;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.java
index 6fae53c4600..0453d2dfcf6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,18 +41,18 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code scope} - specify the visibility scope where Javadoc comments are checked.
+ * Property {@code excludeScope} - Specify the visibility scope where Javadoc comments are not
+ * checked.
  * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code public}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code excludeScope} - specify the visibility scope where Javadoc comments are not
- * checked.
+ * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
  * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code null}.
+ * Default value is {@code public}.
  * </li>
  * <li>
- * Property {@code skipAnnotations} - specify annotations that allow missed
+ * Property {@code skipAnnotations} - Specify annotations that allow missed
  * documentation. If annotation is present in target sources in multiple forms of qualified
  * name, all forms should be listed in this property.
  * Type is {@code java.lang.String[]}.
@@ -184,16 +184,11 @@ public void visitToken(DetailAST ast) {
      * @return whether we should check a given node.
      */
     private boolean shouldCheck(final DetailAST ast) {
-        final Scope customScope = ScopeUtil.getScope(ast);
         final Scope surroundingScope = ScopeUtil.getSurroundingScope(ast);
 
-        return customScope.isIn(scope)
-            && (surroundingScope == null || surroundingScope.isIn(scope))
-            && (excludeScope == null
-                || !customScope.isIn(excludeScope)
-                || surroundingScope != null
-                && !surroundingScope.isIn(excludeScope))
-            && !AnnotationUtil.containsAnnotation(ast, skipAnnotations);
+        return surroundingScope.isIn(scope)
+                && (excludeScope == null || !surroundingScope.isIn(excludeScope))
+                && !AnnotationUtil.containsAnnotation(ast, skipAnnotations);
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.java
index e7a7afa8344..511f0b4f644 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -68,6 +68,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * <li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.java
index 85ee8ce85b9..8fdbd2b8286 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -59,6 +59,9 @@
  * {@code javadoc.tag.line.before}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * </ul>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java
index 4248400398a..284c23668a0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -35,11 +35,11 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations
- * if the Javadoc being examined by this check violates the tight html rules defined at
- * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
+ * Property {@code ignoreInlineTags} - Control whether
+ * <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
+ * inline tags</a> must be ignored.
  * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Default value is {@code true}.
  * </li>
  * <li>
  * Property {@code ignoredTags} - Specify
@@ -49,11 +49,11 @@
  * Default value is {@code ""}.
  * </li>
  * <li>
- * Property {@code ignoreInlineTags} - Control whether
- * <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
- * inline tags</a> must be ignored.
+ * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations
+ * if the Javadoc being examined by this check violates the tight html rules defined at
+ * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
  * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Default value is {@code false}.
  * </li>
  * </ul>
  * <p>
@@ -70,6 +70,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * <li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java
index 2b60f6b7262..4f15de5c1fb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,13 +43,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations
- * if the Javadoc being examined by this check violates the tight html rules defined at
- * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
  * Property {@code forbiddenSummaryFragments} - Specify the regexp for forbidden summary fragments.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^$"}.
@@ -59,6 +52,13 @@
  * Type is {@code java.lang.String}.
  * Default value is {@code "."}.
  * </li>
+ * <li>
+ * Property {@code violateExecutionOnNonTightHtml} - Control when to print violations
+ * if the Javadoc being examined by this check violates the tight html rules defined at
+ * <a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
@@ -74,6 +74,9 @@
  * {@code javadoc.parse.rule.error}
  * </li>
  * <li>
+ * {@code javadoc.unclosedHtml}
+ * </li>
+ * <li>
  * {@code javadoc.wrong.singleton.html.tag}
  * </li>
  * <li>
@@ -469,7 +472,7 @@ private static String getVisibleContent(String summary) {
      */
     private boolean containsForbiddenFragment(String firstSentence) {
         final String javadocText = JAVADOC_MULTILINE_TO_SINGLELINE_PATTERN
-                .matcher(firstSentence).replaceAll(" ").trim();
+                .matcher(firstSentence).replaceAll(" ");
         return forbiddenSummaryFragments.matcher(trimExcessWhitespaces(javadocText)).find();
     }
 
@@ -512,15 +515,14 @@ private static String trimExcessWhitespaces(String text) {
      */
     private static boolean startsWithInheritDoc(DetailNode root) {
         boolean found = false;
-        final DetailNode[] children = root.getChildren();
 
-        for (int i = 0; !found; i++) {
-            final DetailNode child = children[i];
+        for (DetailNode child : root.getChildren()) {
             if (child.getType() == JavadocTokenTypes.JAVADOC_INLINE_TAG
                     && child.getChildren()[1].getType() == JavadocTokenTypes.INHERIT_DOC_LITERAL) {
                 found = true;
             }
-            else if (child.getType() != JavadocTokenTypes.LEADING_ASTERISK
+            if ((child.getType() == JavadocTokenTypes.TEXT
+                    || child.getType() == JavadocTokenTypes.HTML_ELEMENT)
                     && !CommonUtil.isBlank(child.getText())) {
                 break;
             }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java
index 1d24e02f6c8..e33cf6ebf1d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/TagParser.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -97,7 +97,7 @@ private void add(HtmlTag tag) {
      */
     private void parseTags(String[] text, int lineNo) {
         final int nLines = text.length;
-        Point position = findChar(text, '<', new Point(0, 0));
+        Point position = new Point(0, 0);
         while (position.getLineNo() < nLines) {
             // if this is html comment then skip it
             if (isCommentTag(text, position)) {
@@ -127,14 +127,7 @@ private Point parseTag(String[] text, int lineNo, final int nLines, Point positi
         final Point endTag = findChar(text, '>', position);
         final boolean incompleteTag = endTag.getLineNo() >= nLines;
         // get tag id (one word)
-        final String tagId;
-
-        if (incompleteTag) {
-            tagId = "";
-        }
-        else {
-            tagId = getTagId(text, position);
-        }
+        final String tagId = getTagId(text, position);
         // is this closed tag
         final boolean closedTag =
                 endTag.getLineNo() < nLines
@@ -183,15 +176,13 @@ private static String getTagId(String[] javadocText, Point tagStart) {
             if (text.charAt(column) == '/') {
                 column++;
             }
-
-            text = text.substring(column).trim();
+            text = text.substring(column);
             int position = 0;
 
             // Character.isJavaIdentifier... may not be a valid HTML
             // identifier but is valid for generics
             while (position < text.length()
-                    && (Character.isJavaIdentifierStart(text.charAt(position))
-                        || Character.isJavaIdentifierPart(text.charAt(position)))) {
+                    && Character.isJavaIdentifierPart(text.charAt(position))) {
                 position++;
             }
 
@@ -221,7 +212,6 @@ private static boolean isCommentTag(String[] text, Point pos) {
      */
     private static Point skipHtmlComment(String[] text, Point fromPoint) {
         Point toPoint = fromPoint;
-        toPoint = findChar(text, '>', toPoint);
         while (toPoint.getLineNo() < text.length && !text[toPoint.getLineNo()]
                 .substring(0, toPoint.getColumnNo() + 1).endsWith("-->")) {
             toPoint = findChar(text, '>', getNextPoint(text, toPoint));
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java
index e5121bf4a4f..a0a8a691442 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/package-info.java
index 74710a8cbc4..8f53b57566a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.java
index 9dcb810e24a..25ff183f06f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java
index 88bf9a323a8..a9e3abc3cd4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.java
index 20667f91952..22227b3d111 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/TagInfo.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/package-info.java
index f94ca5ef58b..a16249eb051 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java
index e5e9bf6868d..ddf00c0441c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/AbstractClassCouplingCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -49,7 +49,7 @@
 @FileStatefulCheck
 public abstract class AbstractClassCouplingCheck extends AbstractCheck {
 
-    /** A package separator - "." */
+    /** A package separator - ".". */
     private static final char DOT = '.';
 
     /** Class names to ignore. */
@@ -101,8 +101,7 @@ public abstract class AbstractClassCouplingCheck extends AbstractCheck {
     private Set<String> excludedClasses = DEFAULT_EXCLUDED_CLASSES;
 
     /**
-     * Specify user-configured packages to ignore. All excluded packages
-     * should end with a period, so it also appends a dot to a package name.
+     * Specify user-configured packages to ignore.
      */
     private Set<String> excludedPackages = DEFAULT_EXCLUDED_PACKAGES;
 
@@ -157,15 +156,12 @@ public final void setExcludedClasses(String... excludedClasses) {
      *
      * @param from array representing regular expressions of classes to ignore.
      */
-    public void setExcludeClassesRegexps(String... from) {
-        Arrays.stream(from)
-                .map(CommonUtil::createPattern)
-                .forEach(excludeClassesRegexps::add);
+    public void setExcludeClassesRegexps(Pattern... from) {
+        excludeClassesRegexps.addAll(Arrays.asList(from));
     }
 
     /**
-     * Setter to specify user-configured packages to ignore. All excluded packages
-     * should end with a period, so it also appends a dot to a package name.
+     * Setter to specify user-configured packages to ignore.
      *
      * @param excludedPackages packages to ignore.
      * @throws IllegalArgumentException if there are invalid identifiers among the packages.
@@ -173,7 +169,7 @@ public void setExcludeClassesRegexps(String... from) {
     public final void setExcludedPackages(String... excludedPackages) {
         final List<String> invalidIdentifiers = Arrays.stream(excludedPackages)
             .filter(Predicate.not(CommonUtil::isName))
-            .collect(Collectors.toList());
+            .collect(Collectors.toUnmodifiableList());
         if (!invalidIdentifiers.isEmpty()) {
             throw new IllegalArgumentException(
                 "the following values are not valid identifiers: " + invalidIdentifiers);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java
index 1d4e8f531c0..07f411e4a8e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java
index c390e010041..ef40ad24ed3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -80,9 +80,10 @@
  * </ol>
  * <ul>
  * <li>
- * Property {@code max} - Specify the maximum threshold allowed.
- * Type is {@code int}.
- * Default value is {@code 7}.
+ * Property {@code excludeClassesRegexps} - Specify user-configured regular
+ * expressions to ignore classes.
+ * Type is {@code java.util.regex.Pattern[]}.
+ * Default value is {@code ^$}.
  * </li>
  * <li>
  * Property {@code excludedClasses} - Specify user-configured class names to ignore.
@@ -98,16 +99,15 @@
  * float, int, long, short, var, void}.
  * </li>
  * <li>
- * Property {@code excludeClassesRegexps} - Specify user-configured regular
- * expressions to ignore classes.
- * Type is {@code java.util.regex.Pattern[]}.
- * Default value is {@code ^$}.
- * </li>
- * <li>
  * Property {@code excludedPackages} - Specify user-configured packages to ignore.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code ""}.
  * </li>
+ * <li>
+ * Property {@code max} - Specify the maximum threshold allowed.
+ * Type is {@code int}.
+ * Default value is {@code 7}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java
index b48a8845727..163b729209e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,9 +47,10 @@
  * </ol>
  * <ul>
  * <li>
- * Property {@code max} - Specify the maximum threshold allowed.
- * Type is {@code int}.
- * Default value is {@code 20}.
+ * Property {@code excludeClassesRegexps} - Specify user-configured regular
+ * expressions to ignore classes.
+ * Type is {@code java.util.regex.Pattern[]}.
+ * Default value is {@code ^$}.
  * </li>
  * <li>
  * Property {@code excludedClasses} - Specify user-configured class names to ignore.
@@ -65,17 +66,15 @@
  * float, int, long, short, var, void}.
  * </li>
  * <li>
- * Property {@code excludeClassesRegexps} - Specify user-configured regular
- * expressions to ignore classes.
- * Type is {@code java.util.regex.Pattern[]}.
- * Default value is {@code ^$}.
- * </li>
- * <li>
  * Property {@code excludedPackages} - Specify user-configured packages to ignore.
- * All excluded packages should end with a period, so it also appends a dot to a package name.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code ""}.
  * </li>
+ * <li>
+ * Property {@code max} - Specify the maximum threshold allowed.
+ * Type is {@code int}.
+ * Default value is {@code 20}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java
index 938b3a4b317..7c7eebeaab0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java
index be72c57f0e8..8dcf5f5c499 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -54,12 +54,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code methodMaximum} - Specify the maximum allowed number of
- * non commenting lines in a method.
- * Type is {@code int}.
- * Default value is {@code 50}.
- * </li>
- * <li>
  * Property {@code classMaximum} - Specify the maximum allowed number of
  * non commenting lines in a class.
  * Type is {@code int}.
@@ -72,6 +66,12 @@
  * Default value is {@code 2000}.
  * </li>
  * <li>
+ * Property {@code methodMaximum} - Specify the maximum allowed number of
+ * non commenting lines in a method.
+ * Type is {@code int}.
+ * Default value is {@code 50}.
+ * </li>
+ * <li>
  * Property {@code recordMaximum} - Specify the maximum allowed number of
  * non commenting lines in a record.
  * Type is {@code int}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java
index 79094b4fb38..12c6dc20acd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/package-info.java
index 170e1293bc9..057e65e10a5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java
index 58e37b64294..e60830d36f9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.java
index 0e86b9f01e9..035e217bf92 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -95,19 +95,19 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code violateImpliedPublicField} - Control whether to enforce that {@code public}
- * is explicitly coded on interface fields.
+ * Property {@code violateImpliedAbstractMethod} - Control whether to enforce that {@code abstract}
+ * is explicitly coded on interface methods.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code violateImpliedStaticField} - Control whether to enforce that {@code static}
+ * Property {@code violateImpliedFinalField} - Control whether to enforce that {@code final}
  * is explicitly coded on interface fields.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code violateImpliedFinalField} - Control whether to enforce that {@code final}
+ * Property {@code violateImpliedPublicField} - Control whether to enforce that {@code public}
  * is explicitly coded on interface fields.
  * Type is {@code boolean}.
  * Default value is {@code true}.
@@ -119,14 +119,14 @@
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code violateImpliedAbstractMethod} - Control whether to enforce that {@code abstract}
- * is explicitly coded on interface methods.
+ * Property {@code violateImpliedPublicNested} - Control whether to enforce that {@code public}
+ * is explicitly coded on interface nested types.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code violateImpliedPublicNested} - Control whether to enforce that {@code public}
- * is explicitly coded on interface nested types.
+ * Property {@code violateImpliedStaticField} - Control whether to enforce that {@code static}
+ * is explicitly coded on interface fields.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java
index e525a3d83ff..c8982c48926 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java
index 5572849a34a..4d0245e306f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/package-info.java
index ea7f267381f..9893ac47353 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
index c7d357bb4b6..28e4fb63d8f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -78,19 +78,19 @@
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code ignoreStatic} - Allow to skip variables with {@code static} modifier.
+ * Property {@code ignoreOverriddenMethods} - Allow to ignore methods tagged with {@code @Override}
+ * annotation (that usually mean inherited name).
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code ignoreStaticFinal} - Allow to skip variables with both {@code static} and
- * {@code final} modifiers.
+ * Property {@code ignoreStatic} - Allow to skip variables with {@code static} modifier.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code ignoreOverriddenMethods} - Allow to ignore methods tagged with {@code @Override}
- * annotation (that usually mean inherited name).
+ * Property {@code ignoreStaticFinal} - Allow to skip variables with both {@code static} and
+ * {@code final} modifiers.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
@@ -246,7 +246,7 @@ public void setAllowedAbbreviationLength(int allowedAbbreviationLength) {
     public void setAllowedAbbreviations(String... allowedAbbreviations) {
         if (allowedAbbreviations != null) {
             this.allowedAbbreviations =
-                Arrays.stream(allowedAbbreviations).collect(Collectors.toSet());
+                Arrays.stream(allowedAbbreviations).collect(Collectors.toUnmodifiableSet());
         }
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.java
index 5a7eab546e6..841f2155d7a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractAccessControlNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -113,7 +113,7 @@ private static boolean isPublic(DetailAST modifiers) {
     }
 
     /**
-     * Sets whether we should apply the check to public members.
+     * Setter to control if check should apply to public members.
      *
      * @param applyTo new value of the property.
      */
@@ -122,7 +122,7 @@ public void setApplyToPublic(boolean applyTo) {
     }
 
     /**
-     * Sets whether we should apply the check to protected members.
+     * Setter to control if check should apply to protected members.
      *
      * @param applyTo new value of the property.
      */
@@ -131,7 +131,7 @@ public void setApplyToProtected(boolean applyTo) {
     }
 
     /**
-     * Sets whether we should apply the check to package-private members.
+     * Setter to control if check should apply to package-private members.
      *
      * @param applyTo new value of the property.
      */
@@ -140,7 +140,7 @@ public void setApplyToPackage(boolean applyTo) {
     }
 
     /**
-     * Sets whether we should apply the check to private members.
+     * Setter to control if check should apply to private members.
      *
      * @param applyTo new value of the property.
      */
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java
index 3f24fb9399a..c08e3fe0c2d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.java
index 24736259a5f..753acab4658 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,7 +63,7 @@ protected AbstractNameCheck(String format) {
     protected abstract boolean mustCheckName(DetailAST ast);
 
     /**
-     * Set the format for the specified regular expression.
+     * Sets the pattern to match valid identifiers.
      *
      * @param pattern the new pattern
      */
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.java
index 72d828940be..817488cff5b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
index a95105abc58..3ad5a867f69 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@
  * </ul>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^(e|t|ex|[a-z][a-z][a-zA-Z]+)$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java
index f05e4aa8d8a..adbe6559acd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[A-Z]$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java
index e630b746168..0fb85ff879f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -33,30 +33,30 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"}.
- * </li>
- * <li>
- * Property {@code applyToPublic} - Controls whether to apply the check to public member.
+ * Property {@code applyToPackage} - Control if check should apply to package-private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToProtected} - Controls whether to apply the check to protected member.
+ * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPackage} - Controls whether to apply the check to package-private member.
+ * Property {@code applyToProtected} - Control if check should apply to protected members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPrivate} - Controls whether to apply the check to private member.
+ * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
+ * <li>
+ * Property {@code format} - Sets the pattern to match valid identifiers.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.java
index a326cfd69a1..cdf8f910a26 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "(?i)^(?!(record|yield|var|permits|sealed|_)$).+$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.java
index 4cb17c0f751..2c4c80a54ef 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[A-Z]$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.java
index a2db1b4d0c5..3fdaf15f17e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java
index 4da4ea40c68..63778c0554b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java
index 4d2db5c9eac..71ca0d96e47 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -31,11 +31,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
- * </li>
- * <li>
  * Property {@code allowOneCharVarInForLoop} - Allow one character variable name in
  * <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/for.html">
  * initialization expressions</a>
@@ -43,6 +38,11 @@
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
+ * <li>
+ * Property {@code format} - Sets the pattern to match valid identifiers.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java
index 92cb77e9ae5..0937b3cfe28 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,30 +29,30 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
- * </li>
- * <li>
- * Property {@code applyToPublic} - Controls whether to apply the check to public member.
+ * Property {@code applyToPackage} - Control if check should apply to package-private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToProtected} - Controls whether to apply the check to protected member.
+ * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPackage} - Controls whether to apply the check to package-private member.
+ * Property {@code applyToProtected} - Control if check should apply to protected members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPrivate} - Controls whether to apply the check to private member.
+ * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
+ * <li>
+ * Property {@code format} - Sets the pattern to match valid identifiers.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java
index 5527d6f67e9..cde9f4ca078 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,43 +38,37 @@
  *
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
- * </li>
- * <li>
- * Property {@code allowClassName} - Controls whether to allow a method name to have the same name
- * as the residing class name. This is not to be confused with a constructor. An easy mistake is
- * to place a return type on a constructor declaration which turns it into a method. For example:
- * <pre>
- * class MyClass {
- *     public void MyClass() {} //this is a method
- *     public MyClass() {} //this is a constructor
- * }
- * </pre>
+ * Property {@code allowClassName} - Control whether to allow a method name to have the same name
+ * as the enclosing class name. Setting this property {@code false} helps to avoid
+ * confusion between constructors and methods.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code applyToPublic} - Controls whether to apply the check to public member.
+ * Property {@code applyToPackage} - Control if check should apply to package-private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToProtected} - Controls whether to apply the check to protected member.
+ * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPackage} - Controls whether to apply the check to package-private member.
+ * Property {@code applyToProtected} - Control if check should apply to protected members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPrivate} - Controls whether to apply the check to private member.
+ * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
+ * <li>
+ * Property {@code format} - Sets the pattern to match valid identifiers.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
@@ -103,15 +97,9 @@ public class MethodNameCheck
     public static final String MSG_KEY = "method.name.equals.class.name";
 
     /**
-     * Controls whether to allow a method name to have the same name as the residing class name.
-     * This is not to be confused with a constructor. An easy mistake is to place a return type on
-     * a constructor declaration which turns it into a method. For example:
-     * <pre>
-     * class MyClass {
-     *     public void MyClass() {} //this is a method
-     *     public MyClass() {} //this is a constructor
-     * }
-     * </pre>
+     * Control whether to allow a method name to have the same name as the enclosing class name.
+     * Setting this property {@code false} helps to avoid confusion
+     * between constructors and methods.
      */
     private boolean allowClassName;
 
@@ -164,15 +152,9 @@ public void visitToken(DetailAST ast) {
     }
 
     /**
-     * Setter to controls whether to allow a method name to have the same name as the residing
-     * class name. This is not to be confused with a constructor. An easy mistake is to place
-     * a return type on a constructor declaration which turns it into a method. For example:
-     * <pre>
-     * class MyClass {
-     *     public void MyClass() {} //this is a method
-     *     public MyClass() {} //this is a constructor
-     * }
-     * </pre>
+     * Setter to control whether to allow a method name to have the same name
+     * as the enclosing class name. Setting this property {@code false}
+     * helps to avoid confusion between constructors and methods.
      *
      * @param allowClassName true to allow false to disallow
      * @since 5.0
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java
index 6bec287f62a..0ebbc405a3d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[A-Z]$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java
index 0740a929ef8..f2b51bd97d8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Control the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[a-z]+(\.[a-zA-Z_]\w*)*$"}.
  * </li>
@@ -71,14 +71,14 @@ public class PackageNameCheck
      */
     public static final String MSG_KEY = "name.invalidPattern";
 
-    /** Specifies valid identifiers. */
+    /** Control the pattern to match valid identifiers. */
     // Uppercase letters seem rather uncommon, but they're allowed in
     // https://docs.oracle.com/javase/specs/
     //  second_edition/html/packages.doc.html#40169
     private Pattern format = Pattern.compile("^[a-z]+(\\.[a-zA-Z_]\\w*)*$");
 
     /**
-     * Setter to specifies valid identifiers.
+     * Setter to control the pattern to match valid identifiers.
      *
      * @param pattern the new pattern
      * @since 3.0
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java
index 5cd3fd96c27..f2f724cd484 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,13 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code accessModifiers} - Access modifiers of methods where parameters are
+ * checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]}.
+ * Default value is {@code public, protected, package, private}.
+ * </li>
+ * <li>
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
  * </li>
@@ -54,12 +60,6 @@
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
- * <li>
- * Property {@code accessModifiers} - Access modifiers of methods where parameters are
- * checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]}.
- * Default value is {@code public, protected, package, private}.
- * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
@@ -174,8 +174,9 @@ private static boolean isOverriddenMethod(DetailAST ast) {
 
         if (annotation.isPresent()) {
             final Optional<DetailAST> overrideToken =
-                Optional.ofNullable(annotation.get().findFirstToken(TokenTypes.IDENT));
-            if (overrideToken.isPresent() && "Override".equals(overrideToken.get().getText())) {
+                Optional.ofNullable(annotation.orElseThrow().findFirstToken(TokenTypes.IDENT));
+            if (overrideToken.isPresent()
+                && "Override".equals(overrideToken.orElseThrow().getText())) {
                 overridden = true;
             }
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.java
index 1de837acc6c..9268cef0831 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.java
index f5f0d5a151f..b154410ab69 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.java
index 26064d41cc7..567ae76a197 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
+ * Property {@code format} - Sets the pattern to match valid identifiers.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "^[A-Z]$"}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java
index 469a07bad3b..d4b90f85290 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,30 +29,32 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
- * </li>
- * <li>
- * Property {@code applyToPublic} - Controls whether to apply the check to public member.
+ * Property {@code applyToPackage} - Control if check should apply to package-private
+ *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToProtected} - Controls whether to apply the check to protected member.
+ * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPackage} - Controls whether to apply the check to package-private member.
+ * Property {@code applyToProtected} - Control if check should apply to protected
+ *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPrivate} - Controls whether to apply the check to private member.
+ * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
+ * <li>
+ * Property {@code format} - Sets the pattern to match valid identifiers.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^[a-z][a-zA-Z0-9]*$"}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java
index 189fc20a7cc..38e07ff798d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,31 +28,33 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specifies valid identifiers.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^[A-Z][a-zA-Z0-9]*$"}.
- * </li>
- * <li>
- * Property {@code applyToPublic} - Controls whether to apply the check to public member.
+ * Property {@code applyToPackage} - Control if check should apply to package-private
+ *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToProtected} - Controls whether to apply the check to protected member.
+ * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPackage} - Controls whether to apply the check to package-private member.
+ * Property {@code applyToProtected} - Control if check should apply to protected
+ *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code applyToPrivate} - Controls whether to apply the check to private member.
+ * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
+ * Property {@code format} - Sets the pattern to match valid identifiers.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^[A-Z][a-zA-Z0-9]*$"}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/package-info.java
index 2e1f29f7332..09e28956e0b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/package-info.java
index 5eac330ecdf..6193e26a39d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.java
index 3563b68c1ab..fd1618f11c0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/CommentSuppressor.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java
index cf1740bf245..3815c68ea4c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/DetectorOptions.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MatchSuppressor.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MatchSuppressor.java
index 6ffed333494..bca01e07a84 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MatchSuppressor.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MatchSuppressor.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.java
index 0a5ed118afb..81ad1a58e62 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/MultilineDetector.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.java
index ab6851bc0ae..3f5c6fadc1d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/NeverSuppress.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java
index 62e978b7ecb..43dc43e6cc0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -86,22 +86,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code format} - Specify the pattern to match against.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "^$"}.
- * </li>
- * <li>
- * Property {@code message} - Specify message which is used to notify about
- * violations, if empty then the default (hard-coded) message is used.
- * Type is {@code java.lang.String}.
- * Default value is {@code null}.
- * </li>
- * <li>
- * Property {@code illegalPattern} - Control whether the pattern is required or illegal.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
  * Property {@code duplicateLimit} - Control whether to check for duplicates
  * of a required pattern, any negative value means no checking for duplicates,
  * any positive value is used as the maximum number of allowed duplicates,
@@ -116,10 +100,26 @@
  * Default value is {@code 100}.
  * </li>
  * <li>
+ * Property {@code format} - Specify the pattern to match against.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "^$"}.
+ * </li>
+ * <li>
  * Property {@code ignoreComments} - Control whether to ignore matches found within comments.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
+ * <li>
+ * Property {@code illegalPattern} - Control whether the pattern is required or illegal.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
+ * Property {@code message} - Specify message which is used to notify about
+ * violations, if empty then the default (hard-coded) message is used.
+ * Type is {@code java.lang.String}.
+ * Default value is {@code null}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
@@ -302,7 +302,12 @@ public void beginTree(DetailAST rootAST) {
         findMatch();
     }
 
-    /** Recursive method that finds the matches. */
+    /**
+     * Recursive method that finds the matches.
+     *
+     * @noinspection TailRecursion
+     * @noinspectionreason TailRecursion - until issue #14814
+     */
     // suppress deprecation until https://github.com/checkstyle/checkstyle/issues/11166
     @SuppressWarnings("deprecation")
     private void findMatch() {
@@ -327,7 +332,8 @@ private void findMatch() {
             }
         }
         else if (!illegalPattern && matchCount == 0) {
-            logMessage(0);
+            final String msg = getMessage();
+            log(1, MSG_REQUIRED_REGEXP, msg);
         }
     }
 
@@ -378,6 +384,22 @@ private boolean isIgnore(int startLine, FileText text, LineColumn start) {
      * @param lineNumber the line number the message relates to.
      */
     private void logMessage(int lineNumber) {
+        final String msg = getMessage();
+
+        if (illegalPattern) {
+            log(lineNumber, MSG_ILLEGAL_REGEXP, msg);
+        }
+        else {
+            log(lineNumber, MSG_DUPLICATE_REGEXP, msg);
+        }
+    }
+
+    /**
+     * Provide right message.
+     *
+     * @return message for violation.
+     */
+    private String getMessage() {
         String msg;
 
         if (message == null || message.isEmpty()) {
@@ -391,17 +413,7 @@ private void logMessage(int lineNumber) {
             msg = ERROR_LIMIT_EXCEEDED_MESSAGE + msg;
         }
 
-        if (illegalPattern) {
-            log(lineNumber, MSG_ILLEGAL_REGEXP, msg);
-        }
-        else {
-            if (lineNumber > 0) {
-                log(lineNumber, MSG_DUPLICATE_REGEXP, msg);
-            }
-            else {
-                log(lineNumber, MSG_REQUIRED_REGEXP, msg);
-            }
-        }
+        return msg;
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.java
index 7c0380d3f55..e570bce5389 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,25 +37,25 @@
  * </p>
  * <ul>
  * <li>
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
+ * </li>
+ * <li>
  * Property {@code format} - Specify the format of the regular expression to match.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "$."}.
  * </li>
  * <li>
- * Property {@code message} - Specify the message which is used to notify about
- * violations, if empty then default (hard-coded) message is used.
- * Type is {@code java.lang.String}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code ignoreCase} - Control whether to ignore case when searching.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code minimum} - Specify the minimum number of matches required in each file.
- * Type is {@code int}.
- * Default value is {@code 0}.
+ * Property {@code matchAcrossLines} - Control whether to match expressions
+ * across multiple lines.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code maximum} - Specify the maximum number of matches required in each file.
@@ -63,15 +63,15 @@
  * Default value is {@code 0}.
  * </li>
  * <li>
- * Property {@code matchAcrossLines} - Control whether to match expressions
- * across multiple lines.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code message} - Specify the message which is used to notify about
+ * violations, if empty then default (hard-coded) message is used.
+ * Type is {@code java.lang.String}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code fileExtensions} - Specify the file type extension of files to process.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code ""}.
+ * Property {@code minimum} - Specify the minimum number of matches required in each file.
+ * Type is {@code int}.
+ * Default value is {@code 0}.
  * </li>
  * </ul>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.java
index fb8c571de21..b0e3b07b7a7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -72,33 +72,27 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code folderPattern} - Specify the regular expression to match the folder path against.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.</li>
- *
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.</li>
  * <li>
  * Property {@code fileNamePattern} - Specify the regular expression to match the file name against.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.</li>
- *
  * <li>
- * Property {@code match} - Control whether to look for a match or mismatch on the file name, if
- * the fileNamePattern is supplied, otherwise it is applied on the folderPattern.
- * Type is {@code boolean}.
- * Default value is {@code true}.</li>
- *
+ * Property {@code folderPattern} - Specify the regular expression to match the folder path against.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code null}.</li>
  * <li>
  * Property {@code ignoreFileNameExtensions} - Control whether to ignore the file extension for
  * the file name match.
  * Type is {@code boolean}.
  * Default value is {@code false}.</li>
- *
  * <li>
- * Property {@code fileExtensions} - Specify the file type extension of files to process. If this is
- * specified, then only files that match these types are examined with the other
- * patterns.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code ""}.</li>
+ * Property {@code match} - Control whether to look for a match or mismatch on the file name, if
+ * the fileNamePattern is supplied, otherwise it is applied on the folderPattern.
+ * Type is {@code boolean}.
+ * Default value is {@code true}.</li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.java
index 4e999d70bb7..061199e3aa5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,35 +38,35 @@
  * </p>
  * <ul>
  * <li>
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
+ * </li>
+ * <li>
  * Property {@code format} - Specify the format of the regular expression to match.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code "$."}.
  * </li>
  * <li>
- * Property {@code message} - Specify the message which is used to notify about
- * violations, if empty then default (hard-coded) message is used.
- * Type is {@code java.lang.String}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code ignoreCase} - Control whether to ignore case when searching.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code minimum} - Specify the minimum number of matches required in each file.
+ * Property {@code maximum} - Specify the maximum number of matches required in each file.
  * Type is {@code int}.
  * Default value is {@code 0}.
  * </li>
  * <li>
- * Property {@code maximum} - Specify the maximum number of matches required in each file.
- * Type is {@code int}.
- * Default value is {@code 0}.
+ * Property {@code message} - Specify the message which is used to notify about
+ * violations, if empty then default (hard-coded) message is used.
+ * Type is {@code java.lang.String}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code fileExtensions} - Specify the file type extension of files to process.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code ""}.
+ * Property {@code minimum} - Specify the minimum number of matches required in each file.
+ * Type is {@code int}.
+ * Default value is {@code 0}.
  * </li>
  * </ul>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.java
index 42f95973a72..ca5f6bafafb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,20 +44,14 @@
  * Default value is {@code "$."}.
  * </li>
  * <li>
- * Property {@code message} - Specify the message which is used to notify about
- * violations, if empty then default (hard-coded) message is used.
- * Type is {@code java.lang.String}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code ignoreCase} - Control whether to ignore case when searching.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code minimum} - Specify the minimum number of matches required in each file.
- * Type is {@code int}.
- * Default value is {@code 0}.
+ * Property {@code ignoreComments} - Control whether to ignore text in comments when searching.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
  * </li>
  * <li>
  * Property {@code maximum} - Specify the maximum number of matches required in each file.
@@ -65,9 +59,15 @@
  * Default value is {@code 0}.
  * </li>
  * <li>
- * Property {@code ignoreComments} - Control whether to ignore text in comments when searching.
- * Type is {@code boolean}.
- * Default value is {@code false}.
+ * Property {@code message} - Specify the message which is used to notify about
+ * violations, if empty then default (hard-coded) message is used.
+ * Type is {@code java.lang.String}.
+ * Default value is {@code null}.
+ * </li>
+ * <li>
+ * Property {@code minimum} - Specify the minimum number of matches required in each file.
+ * Type is {@code int}.
+ * Default value is {@code 0}.
  * </li>
  * </ul>
  * <p>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java
index 5387d2e526f..88916b99839 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/SinglelineDetector.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -97,6 +97,8 @@ private void resetState() {
      * @param line the line to check
      * @param matcher the matcher to use
      * @param startPosition the position to start searching from.
+     * @noinspection TailRecursion
+     * @noinspectionreason TailRecursion - until issue #14814
      */
     private void checkLine(int lineNo, String line, Matcher matcher,
             int startPosition) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/package-info.java
index c53b59ee624..b91dce5b16f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java
index 7e167f09a79..ff7e40a6289 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java
index 2ff789817b0..fa4215a4b02 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.java
index e82722b73a8..de4808e792a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,15 +36,15 @@
  * </p>
  * <ul>
  * <li>
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
+ * </li>
+ * <li>
  * Property {@code max} - Specify the maximum number of lines allowed.
  * Type is {@code int}.
  * Default value is {@code 2000}.
  * </li>
- * <li>
- * Property {@code fileExtensions} - Specify the file type extension of files to process.
- * Type is {@code java.lang.String[]}.
- * Default value is {@code ""}.
- * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.java
index 66602cb5802..3401761c234 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java
index 45110f1cf8f..bfbc7b1e1c6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -60,7 +60,7 @@
  * </ul>
  * <ul>
  * <li>
- * Property {@code fileExtensions} - Specify file extensions that are accepted.
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code ""}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java
index e561f4cf124..d3b941c1c32 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -74,7 +74,7 @@
  * </pre>
  * <ul>
  * <li>
- * Property {@code maxTotal} - Specify the maximum number of methods allowed at all scope levels.
+ * Property {@code maxPackage} - Specify the maximum number of {@code package} methods allowed.
  * Type is {@code int}.
  * Default value is {@code 100}.
  * </li>
@@ -84,17 +84,17 @@
  * Default value is {@code 100}.
  * </li>
  * <li>
- * Property {@code maxPackage} - Specify the maximum number of {@code package} methods allowed.
+ * Property {@code maxProtected} - Specify the maximum number of {@code protected} methods allowed.
  * Type is {@code int}.
  * Default value is {@code 100}.
  * </li>
  * <li>
- * Property {@code maxProtected} - Specify the maximum number of {@code protected} methods allowed.
+ * Property {@code maxPublic} - Specify the maximum number of {@code public} methods allowed.
  * Type is {@code int}.
  * Default value is {@code 100}.
  * </li>
  * <li>
- * Property {@code maxPublic} - Specify the maximum number of {@code public} methods allowed.
+ * Property {@code maxTotal} - Specify the maximum number of methods allowed at all scope levels.
  * Type is {@code int}.
  * Default value is {@code 100}.
  * </li>
@@ -111,7 +111,7 @@
  * ENUM_DEF</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
  * INTERFACE_DEF</a>,
- * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
  * ANNOTATION_DEF</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
  * RECORD_DEF</a>.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java
index 5bedc2372ac..752affef61d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,16 +42,16 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code max} - Specify the maximum number of lines allowed.
- * Type is {@code int}.
- * Default value is {@code 150}.
- * </li>
- * <li>
  * Property {@code countEmpty} - Control whether to count empty lines and comments.
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
  * <li>
+ * Property {@code max} - Specify the maximum number of lines allowed.
+ * Type is {@code int}.
+ * Default value is {@code 150}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java
index 0779302ee38..4c24722dd6a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java
index 11d417c47ea..e4a3fe16dc9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,9 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes;
 
+import java.util.Collections;
+import java.util.Set;
+
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
@@ -32,9 +35,10 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code max} - Specify the maximum number of parameters allowed.
- * Type is {@code int}.
- * Default value is {@code 7}.
+ * Property {@code ignoreAnnotatedBy} - Ignore methods and constructors
+ * annotated with the specified annotation(s).
+ * Type is {@code java.lang.String[]}.
+ * Default value is {@code ""}.
  * </li>
  * <li>
  * Property {@code ignoreOverriddenMethods} - Ignore number of parameters for
@@ -43,6 +47,11 @@
  * Default value is {@code false}.
  * </li>
  * <li>
+ * Property {@code max} - Specify the maximum number of parameters allowed.
+ * Type is {@code int}.
+ * Default value is {@code 7}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -86,6 +95,11 @@ public class ParameterNumberCheck
     /** Ignore number of parameters for methods with {@code @Override} annotation. */
     private boolean ignoreOverriddenMethods;
 
+    /**
+     * Ignore methods and constructors annotated with the specified annotation(s).
+     */
+    private Set<String> ignoreAnnotatedBy = Collections.emptySet();
+
     /**
      * Setter to specify the maximum number of parameters allowed.
      *
@@ -106,6 +120,16 @@ public void setIgnoreOverriddenMethods(boolean ignoreOverriddenMethods) {
         this.ignoreOverriddenMethods = ignoreOverriddenMethods;
     }
 
+    /**
+     * Setter to ignore methods and constructors annotated with the specified annotation(s).
+     *
+     * @param annotationNames specified annotation(s)
+     * @since 10.15.0
+     */
+    public void setIgnoreAnnotatedBy(String... annotationNames) {
+        ignoreAnnotatedBy = Set.of(annotationNames);
+    }
+
     @Override
     public int[] getDefaultTokens() {
         return getAcceptableTokens();
@@ -132,16 +156,33 @@ public void visitToken(DetailAST ast) {
     }
 
     /**
-     * Determine whether to ignore number of parameters for the method.
+     * Determine whether to ignore number of parameters.
      *
      * @param ast the token to process
-     * @return true if this is overridden method and number of parameters should be ignored
-     *         false otherwise
+     * @return true if number of parameters should be ignored.
      */
     private boolean shouldIgnoreNumberOfParameters(DetailAST ast) {
-        // if you override a method, you have no power over the number of parameters
-        return ignoreOverriddenMethods
-                && AnnotationUtil.hasOverrideAnnotation(ast);
+        return isIgnoredOverriddenMethod(ast) || isAnnotatedByIgnoredAnnotations(ast);
+    }
+
+    /**
+     * Checks if method is overridden and should be ignored.
+     *
+     * @param ast method definition to check
+     * @return true if method is overridden and should be ignored.
+     */
+    private boolean isIgnoredOverriddenMethod(DetailAST ast) {
+        return ignoreOverriddenMethods && AnnotationUtil.hasOverrideAnnotation(ast);
+    }
+
+    /**
+     * Checks if method or constructor is annotated by ignored annotation(s).
+     *
+     * @param ast method or constructor definition to check
+     * @return true if annotated by ignored annotation(s).
+     */
+    private boolean isAnnotatedByIgnoredAnnotations(DetailAST ast) {
+        return AnnotationUtil.containsAnnotation(ast, ignoreAnnotatedBy);
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.java
index 47466a3b0de..9c53a033e64 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,17 +38,17 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code max} - Specify the maximum number of components allowed in the header of a
- * record definition.
- * Type is {@code int}.
- * Default value is {@code 8}.
- * </li>
- * <li>
  * Property {@code accessModifiers} - Access modifiers of record definitions where
  * the number of record components should be checked.
  * Type is {@code com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]}.
  * Default value is {@code public, protected, package, private}.
  * </li>
+ * <li>
+ * Property {@code max} - Specify the maximum number of components allowed in the header of a
+ * record definition.
+ * Type is {@code int}.
+ * Default value is {@code 8}.
+ * </li>
  * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/package-info.java
index 3db4be0c19a..480bac23058 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.java
index 8bf6884b4e8..c8bb5471abc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/AbstractParenPadCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,7 +71,7 @@ public abstract class AbstractParenPadCheck
     private PadOption option = PadOption.NOSPACE;
 
     /**
-     * Set the option to enforce.
+     * Specify policy on how to pad parentheses.
      *
      * @param optionStr string to decode option from
      * @throws IllegalArgumentException if unable to decode
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java
index b41bbe3bb46..c11cdcd6047 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java
index 18a8786586f..680d4296c39 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java
index 9b2cc4400d0..d1b5e6233b0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -53,11 +53,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code allowNoEmptyLineBetweenFields} - Allow no empty line between fields.
- * Type is {@code boolean}.
- * Default value is {@code false}.
- * </li>
- * <li>
  * Property {@code allowMultipleEmptyLines} - Allow multiple empty lines between class members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
@@ -69,6 +64,11 @@
  * Default value is {@code true}.
  * </li>
  * <li>
+ * Property {@code allowNoEmptyLineBetweenFields} - Allow no empty line between fields.
+ * Type is {@code boolean}.
+ * Default value is {@code false}.
+ * </li>
+ * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -85,7 +85,7 @@
  * INTERFACE_DEF</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
  * ENUM_DEF</a>,
- * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
  * STATIC_INIT</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
  * INSTANCE_INIT</a>,
@@ -290,9 +290,9 @@ else if (!hasEmptyLineAfter(ast)) {
      */
     private void checkCommentInModifiers(DetailAST packageDef) {
         final Optional<DetailAST> comment = findCommentUnder(packageDef);
-        if (comment.isPresent()) {
-            log(comment.get(), MSG_SHOULD_BE_SEPARATED, comment.get().getText());
-        }
+        comment.ifPresent(commentValue -> {
+            log(commentValue, MSG_SHOULD_BE_SEPARATED, commentValue.getText());
+        });
     }
 
     /**
@@ -340,7 +340,7 @@ private static DetailAST getLastElementBeforeEmptyLines(DetailAST ast, int line)
                 // The first child is DOT in case of POSTFIX which have at least 2 children
                 // First child of DOT again puts us back to normal AST tree which will
                 // recurse down below from here
-                final DetailAST firstChildAfterPostFix = postFixNode.get();
+                final DetailAST firstChildAfterPostFix = postFixNode.orElseThrow();
                 result = getLastElementBeforeEmptyLines(firstChildAfterPostFix, line);
             }
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.java
index a69508cfa2b..2755db438a1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -51,7 +51,7 @@
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code fileExtensions} - Specify file type extension of files to process.
+ * Property {@code fileExtensions} - Specify the file extensions of the files to process.
  * Type is {@code java.lang.String[]}.
  * Default value is {@code ""}.
  * </li>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java
index 5cf117a515f..7106012dc9b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -51,7 +51,8 @@
  * <ul>
  * <li> should not be preceded with whitespace in all cases.</li>
  * <li> should be followed with whitespace in almost all cases,
- *   except diamond operators and when preceding method name or constructor.</li></ul>
+ *   except diamond operators and when preceding a method name, constructor, or record header.</li>
+ * </ul>
  * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
@@ -219,7 +220,9 @@ else if (line[after] == ' ') {
      */
     private void processSingleGeneric(DetailAST ast, int[] line, int after) {
         final char charAfter = Character.toChars(line[after])[0];
-        if (isGenericBeforeMethod(ast) || isGenericBeforeCtor(ast)) {
+        if (isGenericBeforeMethod(ast)
+                || isGenericBeforeCtorInvocation(ast)
+                || isGenericBeforeRecordHeader(ast)) {
             if (Character.isWhitespace(charAfter)) {
                 log(ast, MSG_WS_FOLLOWED, CLOSE_ANGLE_BRACKET);
             }
@@ -230,16 +233,54 @@ else if (!isCharacterValidAfterGenericEnd(charAfter)) {
     }
 
     /**
-     * Checks if generic is before constructor invocation.
+     * Checks if generic is before record header. Identifies two cases:
+     * <ol>
+     *     <li>In record def, eg: {@code record Session<T>()}</li>
+     *     <li>In record pattern def, eg: {@code o instanceof Session<String>(var s)}</li>
+     * </ol>
+     *
+     * @param ast ast
+     * @return true if generic is before record header
+     */
+    private static boolean isGenericBeforeRecordHeader(DetailAST ast) {
+        final DetailAST grandParent = ast.getParent().getParent();
+        return grandParent.getType() == TokenTypes.RECORD_DEF
+                || grandParent.getParent().getType() == TokenTypes.RECORD_PATTERN_DEF;
+    }
+
+    /**
+     * Checks if generic is before constructor invocation. Identifies two cases:
+     * <ol>
+     *     <li>{@code new ArrayList<>();}</li>
+     *     <li>{@code new Outer.Inner<>();}</li>
+     * </ol>
      *
      * @param ast ast
-     * @return true if generic before a constructor invocation
+     * @return true if generic is before constructor invocation
      */
-    private static boolean isGenericBeforeCtor(DetailAST ast) {
+    private static boolean isGenericBeforeCtorInvocation(DetailAST ast) {
+        final DetailAST grandParent = ast.getParent().getParent();
+        return grandParent.getType() == TokenTypes.LITERAL_NEW
+                || grandParent.getParent().getType() == TokenTypes.LITERAL_NEW;
+    }
+
+    /**
+     * Checks if generic is after {@code LITERAL_NEW}. Identifies three cases:
+     * <ol>
+     *     <li>{@code new <String>Object();}</li>
+     *     <li>{@code new <String>Outer.Inner();}</li>
+     *     <li>{@code new <@A Outer>@B Inner();}</li>
+     * </ol>
+     *
+     * @param ast ast
+     * @return true if generic after {@code LITERAL_NEW}
+     */
+    private static boolean isGenericAfterNew(DetailAST ast) {
         final DetailAST parent = ast.getParent();
         return parent.getParent().getType() == TokenTypes.LITERAL_NEW
                 && (parent.getNextSibling().getType() == TokenTypes.IDENT
-                    || parent.getNextSibling().getType() == TokenTypes.DOT);
+                    || parent.getNextSibling().getType() == TokenTypes.DOT
+                    || parent.getNextSibling().getType() == TokenTypes.ANNOTATIONS);
     }
 
     /**
@@ -274,25 +315,29 @@ private void processStart(DetailAST ast) {
         final int before = ast.getColumnNo() - 1;
         final int after = ast.getColumnNo() + 1;
 
-        // Need to handle two cases as in:
+        // Checks if generic needs to be preceded by a whitespace or not.
+        // Handles 3 cases as in:
         //
         //   public static <T> Callable<T> callable(Runnable task, T result)
         //                 ^           ^
-        //      ws reqd ---+           +--- whitespace NOT required
+        //   1. ws reqd ---+        2. +--- whitespace NOT required
         //
+        //   new <String>Object()
+        //       ^
+        //    3. +--- ws required
         if (before >= 0) {
-            // Detect if the first case
             final DetailAST parent = ast.getParent();
             final DetailAST grandparent = parent.getParent();
+            // cases (1, 3) where whitespace is required:
             if (grandparent.getType() == TokenTypes.CTOR_DEF
                     || grandparent.getType() == TokenTypes.METHOD_DEF
-                    || isGenericBeforeCtor(ast)) {
-                // Require whitespace
+                    || isGenericAfterNew(ast)) {
+
                 if (!CommonUtil.isCodePointWhitespace(line, before)) {
                     log(ast, MSG_WS_NOT_PRECEDED, OPEN_ANGLE_BRACKET);
                 }
             }
-            // Whitespace not required
+            // case 2 where whitespace is not required:
             else if (CommonUtil.isCodePointWhitespace(line, before)
                 && !containsWhitespaceBefore(before, line)) {
                 log(ast, MSG_WS_PRECEDED, OPEN_ANGLE_BRACKET);
@@ -344,10 +389,9 @@ private static boolean containsWhitespaceBefore(int before, int... line) {
      * @return checks if given character is valid
      */
     private static boolean isCharacterValidAfterGenericEnd(char charAfter) {
-        return charAfter == '(' || charAfter == ')'
-            || charAfter == ',' || charAfter == '['
-            || charAfter == '.' || charAfter == ':'
-            || charAfter == ';'
+        return charAfter == ')' || charAfter == ','
+            || charAfter == '[' || charAfter == '.'
+            || charAfter == ':' || charAfter == ';'
             || Character.isWhitespace(charAfter);
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java
index 41ffdb2fe07..8a982686698 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.java
index fb6d4089b76..0a2d7e6fb7d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java
index 25e6b6d8d5c..c3f589db617 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -422,7 +422,7 @@ private static DetailAST getTypeLastNode(DetailAST ast) {
                     .findFirstToken(TokenTypes.GENERIC_END);
         }
         else if (objectArrayType.isPresent()) {
-            typeLastNode = objectArrayType.get();
+            typeLastNode = objectArrayType.orElseThrow();
         }
         else {
             typeLastNode = parent.getFirstChild();
@@ -495,7 +495,7 @@ private static DetailAST getIdentLastToken(DetailAST ast) {
         }
         // qualified name case
         else {
-            result = dot.get().getFirstChild().getNextSibling();
+            result = dot.orElseThrow().getFirstChild().getNextSibling();
         }
         return result;
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.java
index 335c18ac9c3..90916df78d6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java
index 450905ef371..6477ffd842c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.java
index b7807f4ad82..06c97aa68ed 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java
index fe12fae80c7..c4dd62e280f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java
index 6f0780cc92c..52a1399efda 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.java
index 51e6354db2b..5cf934f91f7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -132,21 +132,21 @@ public void visitToken(DetailAST ast) {
         final int colNo = ast.getColumnNo();
         final int lineNo = ast.getLineNo();
         final int[] currentLine = getLineCodePoints(lineNo - 1);
-        final int[] substringAfterToken = CodePointUtil.trim(
+        final boolean isLineEmptyAfterToken = CodePointUtil.isBlank(
                 Arrays.copyOfRange(currentLine, colNo + text.length(), currentLine.length)
         );
-        final int[] substringBeforeToken = CodePointUtil.trim(
+        final boolean isLineEmptyBeforeToken = CodePointUtil.isBlank(
                 Arrays.copyOfRange(currentLine, 0, colNo)
         );
 
-        if (option == WrapOption.EOL
-                && substringBeforeToken.length == 0) {
-            log(ast, MSG_LINE_PREVIOUS, text);
-        }
-        else if (option == WrapOption.NL
-                 && substringAfterToken.length == 0) {
+        if (option == WrapOption.NL
+                 && isLineEmptyAfterToken) {
             log(ast, MSG_LINE_NEW, text);
         }
+        else if (option == WrapOption.EOL
+                && isLineEmptyBeforeToken) {
+            log(ast, MSG_LINE_PREVIOUS, text);
+        }
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java
index 05cfbe9b743..82dcc43b15b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java
index a95f2a172b8..2ba4f8b0c46 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java
index 9865e034a29..e1bea5045d7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,7 +63,7 @@
  * LITERAL_YIELD</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
  * LITERAL_CATCH</a>,
- * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
+ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DO_WHILE">
  * DO_WHILE</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
  * ELLIPSIS</a>,
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java
index dd1802f63b5..11fdc9518ac 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,19 +71,23 @@
  * of the catch block (left curly bracket) is not separated from the end
  * of the catch block (right curly bracket).
  * </p>
+ * <p>
+ * Note: <a href="https://openjdk.org/jeps/361">
+ * Switch expressions</a> are ignored by this check.
+ * </p>
  * <ul>
  * <li>
- * Property {@code allowEmptyConstructors} - Allow empty constructor bodies.
+ * Property {@code allowEmptyCatches} - Allow empty catch bodies.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowEmptyMethods} - Allow empty method bodies.
+ * Property {@code allowEmptyConstructors} - Allow empty constructor bodies.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowEmptyTypes} - Allow empty class, interface and enum bodies.
+ * Property {@code allowEmptyLambdas} - Allow empty lambda bodies.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
@@ -93,12 +97,12 @@
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowEmptyLambdas} - Allow empty lambda bodies.
+ * Property {@code allowEmptyMethods} - Allow empty method bodies.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
  * <li>
- * Property {@code allowEmptyCatches} - Allow empty catch bodies.
+ * Property {@code allowEmptyTypes} - Allow empty class, interface and enum bodies.
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
@@ -497,22 +501,31 @@ public void visitToken(DetailAST ast) {
      */
     private boolean isNotRelevantSituation(DetailAST ast, int currentType) {
         final int parentType = ast.getParent().getType();
-        final boolean starImport = currentType == TokenTypes.STAR
-                && parentType == TokenTypes.DOT;
-        final boolean insideCaseGroup = parentType == TokenTypes.CASE_GROUP;
-
-        final boolean starImportOrSlistInsideCaseGroup = starImport || insideCaseGroup;
-        final boolean colonOfCaseOrDefaultOrForEach =
-                isColonOfCaseOrDefault(parentType)
-                        || isColonOfForEach(parentType);
-        final boolean emptyBlockOrType =
-                isEmptyBlock(ast, parentType)
+        final boolean result;
+        switch (parentType) {
+            case TokenTypes.DOT:
+                result = currentType == TokenTypes.STAR;
+                break;
+            case TokenTypes.LITERAL_DEFAULT:
+            case TokenTypes.LITERAL_CASE:
+            case TokenTypes.CASE_GROUP:
+                result = true;
+                break;
+            case TokenTypes.FOR_EACH_CLAUSE:
+                result = ignoreEnhancedForColon;
+                break;
+            case TokenTypes.EXPR:
+                result = currentType == TokenTypes.LITERAL_SWITCH;
+                break;
+            case TokenTypes.ARRAY_INIT:
+            case TokenTypes.ANNOTATION_ARRAY_INIT:
+                result = currentType == TokenTypes.RCURLY;
+                break;
+            default:
+                result = isEmptyBlock(ast, parentType)
                     || allowEmptyTypes && isEmptyType(ast);
-
-        return starImportOrSlistInsideCaseGroup
-                || colonOfCaseOrDefaultOrForEach
-                || emptyBlockOrType
-                || isArrayInitialization(currentType, parentType);
+        }
+        return result;
     }
 
     /**
@@ -615,41 +628,6 @@ private static boolean isEmptyBlock(DetailAST ast, int parentType, int match) {
         return result;
     }
 
-    /**
-     * Whether colon belongs to cases or defaults.
-     *
-     * @param parentType parent
-     * @return true if current token in colon of case or default tokens
-     */
-    private static boolean isColonOfCaseOrDefault(int parentType) {
-        return parentType == TokenTypes.LITERAL_DEFAULT
-                    || parentType == TokenTypes.LITERAL_CASE;
-    }
-
-    /**
-     * Whether colon belongs to for-each.
-     *
-     * @param parentType parent
-     * @return true if current token in colon of for-each token
-     */
-    private boolean isColonOfForEach(int parentType) {
-        return parentType == TokenTypes.FOR_EACH_CLAUSE
-                && ignoreEnhancedForColon;
-    }
-
-    /**
-     * Is array initialization.
-     *
-     * @param currentType current token
-     * @param parentType parent token
-     * @return true is current token inside array initialization
-     */
-    private static boolean isArrayInitialization(int currentType, int parentType) {
-        return currentType == TokenTypes.RCURLY
-                && (parentType == TokenTypes.ARRAY_INIT
-                        || parentType == TokenTypes.ANNOTATION_ARRAY_INIT);
-    }
-
     /**
      * Test if the given {@code DetailAST} is part of an allowed empty
      * method block.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java
index 1d197994f10..a6feeb2dc11 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/package-info.java
index b25f27b124b..56af200ce6c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.java
index f3d3029f4a4..8bf73d20be9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/package-info.java
index 779625d280d..740c0a3996f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filefilters/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java
index 9450b6606aa..1a3f8b64b1b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,13 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.filters;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
-
 /**
  * <p>
  * This filter element is immutable and accepts an integer that matches a CSV value, where
@@ -81,7 +80,7 @@ private void addFilter(IntFilterElement filter) {
      * @return the IntFilters of the filter set.
      */
     protected Set<IntFilterElement> getFilters() {
-        return UnmodifiableCollectionUtil.unmodifiableSet(filters);
+        return Collections.unmodifiableSet(filters);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntFilterElement.java
index ed7ccb3a9ab..9933a482e0e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntFilterElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntFilterElement.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.java
index b8ce30b43c2..65f5f3714d2 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElement.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.java
index 06295c8ebbe..d0d32bace4b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElement.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
index ae5170bd969..88874d3629c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,11 +34,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code severity} - Specify the severity level of this filter.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.SeverityLevel}.
- * Default value is {@code error}.
- * </li>
- * <li>
  * Property {@code acceptOnMatch} - Control whether the filter accepts an audit
  * event if and only if there is a match between the event's severity level and
  * property severity. If acceptOnMatch is {@code false}, then the filter accepts
@@ -47,18 +42,13 @@
  * Type is {@code boolean}.
  * Default value is {@code true}.
  * </li>
+ * <li>
+ * Property {@code severity} - Specify the severity level of this filter.
+ * Type is {@code com.puppycrawl.tools.checkstyle.api.SeverityLevel}.
+ * Default value is {@code error}.
+ * </li>
  * </ul>
  * <p>
- * For example, the following configuration fragment directs the Checker to not
- * report audit events with severity level {@code info}:
- * </p>
- * <pre>
- * &lt;module name=&quot;SeverityMatchFilter&quot;&gt;
- *   &lt;property name=&quot;severity&quot; value=&quot;info&quot;/&gt;
- *   &lt;property name=&quot;acceptOnMatch&quot; value=&quot;false&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java
index 3ad81b77cb7..42709ea82a8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElement.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,21 +43,12 @@ public class SuppressFilterElement
     /** The regexp to match file names against. */
     private final Pattern fileRegexp;
 
-    /** The pattern for file names. */
-    private final String filePattern;
-
     /** The regexp to match check names against. */
     private final Pattern checkRegexp;
 
-    /** The pattern for check class names. */
-    private final String checkPattern;
-
     /** The regexp to match message names against. */
     private final Pattern messageRegexp;
 
-    /** The pattern for message names. */
-    private final String messagePattern;
-
     /** Module id filter. */
     private final String moduleId;
 
@@ -86,21 +77,18 @@ public class SuppressFilterElement
      */
     public SuppressFilterElement(String files, String checks,
                            String message, String modId, String lines, String columns) {
-        filePattern = files;
         if (files == null) {
             fileRegexp = null;
         }
         else {
             fileRegexp = Pattern.compile(files);
         }
-        checkPattern = checks;
         if (checks == null) {
             checkRegexp = null;
         }
         else {
             checkRegexp = Pattern.compile(checks);
         }
-        messagePattern = message;
         if (message == null) {
             messageRegexp = null;
         }
@@ -136,30 +124,9 @@ public SuppressFilterElement(String files, String checks,
      */
     public SuppressFilterElement(Pattern files, Pattern checks, Pattern message, String moduleId,
             String lines, String columns) {
-        if (files == null) {
-            filePattern = null;
-            fileRegexp = null;
-        }
-        else {
-            filePattern = files.pattern();
-            fileRegexp = files;
-        }
-        if (checks == null) {
-            checkPattern = null;
-            checkRegexp = null;
-        }
-        else {
-            checkPattern = checks.pattern();
-            checkRegexp = checks;
-        }
-        if (message == null) {
-            messagePattern = null;
-            messageRegexp = null;
-        }
-        else {
-            messagePattern = message.pattern();
-            messageRegexp = message;
-        }
+        fileRegexp = files;
+        checkRegexp = checks;
+        messageRegexp = message;
         this.moduleId = moduleId;
         if (lines == null) {
             linesCsv = null;
@@ -224,8 +191,8 @@ private boolean isLineAndColumnMatching(AuditEvent event) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(filePattern, checkPattern, messagePattern, moduleId, linesCsv,
-                columnsCsv);
+        return Objects.hash(getPatternSafely(fileRegexp), getPatternSafely(checkRegexp),
+                getPatternSafely(messageRegexp), moduleId, linesCsv, columnsCsv);
     }
 
     @Override
@@ -237,12 +204,29 @@ public boolean equals(Object other) {
             return false;
         }
         final SuppressFilterElement suppressElement = (SuppressFilterElement) other;
-        return Objects.equals(filePattern, suppressElement.filePattern)
-                && Objects.equals(checkPattern, suppressElement.checkPattern)
-                && Objects.equals(messagePattern, suppressElement.messagePattern)
+        return Objects.equals(getPatternSafely(fileRegexp),
+                    getPatternSafely(suppressElement.fileRegexp))
+                && Objects.equals(getPatternSafely(checkRegexp),
+                    getPatternSafely(suppressElement.checkRegexp))
+                && Objects.equals(getPatternSafely(messageRegexp),
+                    getPatternSafely(suppressElement.messageRegexp))
                 && Objects.equals(moduleId, suppressElement.moduleId)
                 && Objects.equals(linesCsv, suppressElement.linesCsv)
                 && Objects.equals(columnsCsv, suppressElement.columnsCsv);
     }
 
+    /**
+     * Util method to get pattern String value from Pattern object safely, return null if
+     * pattern object is null.
+     *
+     * @param pattern pattern object
+     * @return value of pattern or null
+     */
+    private static String getPatternSafely(Pattern pattern) {
+        String result = null;
+        if (pattern != null) {
+            result = pattern.pattern();
+        }
+        return result;
+    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java
index 5f1fd287c73..275ea2d1c6a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -50,70 +50,6 @@
  * Checker as parent module.
  * </p>
  * <p>
- * To configure the check that makes tha annotations available to the filter.
- * </p>
- * <pre>
- * &lt;module name=&quot;TreeWalker&quot;&gt;
- *               ...
- * &lt;module name=&quot;SuppressWarningsHolder&quot; /&gt;
- *               ...
- * &lt;/module&gt;
- * </pre>
- * <p>
- * To configure filter to suppress audit events for annotations add:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressWarningsFilter&quot; /&gt;
- * </pre>
- * <pre>
- * &#64;SuppressWarnings({"memberName"})
- * private int J; // should NOT fail MemberNameCheck
- *
- * &#64;SuppressWarnings({"MemberName"})
- * &#64;SuppressWarnings({"NoWhitespaceAfter"})
- * private int [] ARRAY; // should NOT fail MemberNameCheck and NoWhitespaceAfterCheck
- * </pre>
- * <p>
- * It is possible to specify an ID of checks, so that it can be leveraged by
- * the SuppressWarningsFilter to skip validations. The following examples show how to
- * skip validations near code that has {@code @SuppressWarnings("checkstyle:&lt;ID&gt;")}
- * or just {@code @SuppressWarnings("&lt;ID&gt;")} annotation, where ID is the ID
- * of checks you want to suppress.
- * </p>
- * <p>
- * Example of Checkstyle check configuration:
- * </p>
- * <pre>
- * &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
- *   &lt;property name=&quot;id&quot; value=&quot;systemout&quot;/&gt;
- *   &lt;property name=&quot;format&quot; value=&quot;^.*System\.(out|err).*$&quot;/&gt;
- *   &lt;property name=&quot;message&quot;
- *     value=&quot;Don't use System.out/err, use SLF4J instead.&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * To make the annotations available to the filter.
- * </p>
- * <pre>
- * &lt;module name=&quot;TreeWalker&quot;&gt;
- *   ...
- *   &lt;module name=&quot;SuppressWarningsHolder&quot; /&gt;
- *   ...
- * &lt;/module&gt;
- * </pre>
- * <p>
- * To configure filter to suppress audit events for annotations add:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressWarningsFilter&quot; /&gt;
- * </pre>
- * <pre>
- * &#64;SuppressWarnings("checkstyle:systemout")
- * public static void foo() {
- *   System.out.println("Debug info."); // should NOT fail RegexpSinglelineJava
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
index b328320667f..aed9d871a48 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -61,9 +61,14 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code commentFormat} - Specify comment pattern to trigger filter to begin suppression.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "SUPPRESS CHECKSTYLE (\w+)"}.
+ * Property {@code checkC} - Control whether to check C style comments ({@code &#47;* ... *&#47;}).
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
+ * </li>
+ * <li>
+ * Property {@code checkCPP} - Control whether to check C++ style comments ({@code //}).
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
  * </li>
  * <li>
  * Property {@code checkFormat} - Specify check pattern to suppress.
@@ -71,9 +76,9 @@
  * Default value is {@code ".*"}.
  * </li>
  * <li>
- * Property {@code messageFormat} - Define message pattern to suppress.
+ * Property {@code commentFormat} - Specify comment pattern to trigger filter to begin suppression.
  * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
+ * Default value is {@code "SUPPRESS CHECKSTYLE (\w+)"}.
  * </li>
  * <li>
  * Property {@code idFormat} - Specify check ID pattern to suppress.
@@ -87,174 +92,12 @@
  * Default value is {@code "0"}.
  * </li>
  * <li>
- * Property {@code checkCPP} - Control whether to check C++ style comments ({@code //}).
- * Type is {@code boolean}.
- * Default value is {@code true}.
- * </li>
- * <li>
- * Property {@code checkC} - Control whether to check C style comments ({@code &#47;* ... *&#47;}).
- * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Property {@code messageFormat} - Define message pattern to suppress.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code null}.
  * </li>
  * </ul>
  * <p>
- * To configure a filter to suppress audit events for <i>check</i> on any line
- * with a comment {@code SUPPRESS CHECKSTYLE <i>check</i>}:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;/&gt;
- * </pre>
- * <pre>
- * private int [] array; // SUPPRESS CHECKSTYLE
- * </pre>
- * <p>
- * To configure a filter to suppress all audit events on any line containing
- * the comment {@code CHECKSTYLE IGNORE THIS LINE}:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
- *   &lt;property name=&quot;commentFormat&quot; value=&quot;CHECKSTYLE IGNORE THIS LINE&quot;/&gt;
- *   &lt;property name=&quot;checkFormat&quot; value=&quot;.*&quot;/&gt;
- *   &lt;property name=&quot;influenceFormat&quot; value=&quot;0&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * public static final int lowerCaseConstant; // CHECKSTYLE IGNORE THIS LINE
- * </pre>
- * <p>
- * To configure a filter so that {@code // OK to catch (Throwable|Exception|RuntimeException) here}
- * permits the current and previous line to avoid generating an IllegalCatch audit event:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
- *   &lt;property name=&quot;commentFormat&quot; value=&quot;OK to catch (\w+) here&quot;/&gt;
- *   &lt;property name=&quot;checkFormat&quot; value=&quot;IllegalCatchCheck&quot;/&gt;
- *   &lt;property name=&quot;messageFormat&quot; value=&quot;$1&quot;/&gt;
- *   &lt;property name=&quot;influenceFormat&quot; value=&quot;-1&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * . . .
- * catch (RuntimeException re) {
- * // OK to catch RuntimeException here
- * }
- * catch (Throwable th) { ... }
- * . . .
- * </pre>
- * <p>
- * To configure a filter so that {@code CHECKSTYLE IGNORE <i>check</i> FOR NEXT
- * <i>var</i> LINES} avoids triggering any audits for the given check for
- * the current line and the next <i>var</i> lines (for a total of <i>var</i>+1 lines):
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
- *   &lt;property name=&quot;commentFormat&quot;
- *       value=&quot;CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES&quot;/&gt;
- *   &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
- *   &lt;property name=&quot;influenceFormat&quot; value=&quot;$2&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * static final int lowerCaseConstant; // CHECKSTYLE IGNORE ConstantNameCheck FOR NEXT 3 LINES
- * static final int lowerCaseConstant1;
- * static final int lowerCaseConstant2;
- * static final int lowerCaseConstant3;
- * static final int lowerCaseConstant4; // will warn here
- * </pre>
- * <p>
- * To configure a filter to avoid any audits on code like:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
- *   &lt;property name=&quot;commentFormat&quot;
- *     value=&quot;ALLOW (\\w+) ON PREVIOUS LINE&quot;/&gt;
- *   &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
- *   &lt;property name=&quot;influenceFormat&quot; value=&quot;-1&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * private int D2;
- * // ALLOW MemberName ON PREVIOUS LINE
- * . . .
- * </pre>
- * <p>
- * To configure a filter to allow suppress one or more Checks (separated by "|")
- * and demand comment no less than 14 symbols:
- * </p>
- * <pre>
- * &lt;module name="SuppressWithNearbyCommentFilter"&gt;
- *   &lt;property name="commentFormat"
- *     value="@cs\.suppress \[(\w+(\|\w+)*)\] \w[-\.'`,:;\w ]{14,}"/&gt;
- *   &lt;property name="checkFormat" value="$1"/&gt;
- *   &lt;property name="influenceFormat" value="1"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * public static final int [] array; // @cs.suppress [ConstantName|NoWhitespaceAfter] A comment here
- * </pre>
- * <p>
- * It is possible to specify an ID of checks, so that it can be leveraged by
- * the SuppressWithNearbyCommentFilter to skip validations. The following examples show how to skip
- * validations near code that has comment like {@code // @cs-: &lt;ID/&gt; (reason)},
- * where ID is the ID of checks you want to suppress.
- * </p>
- * <p>
- * Examples of Checkstyle checks configuration:
- * </p>
- * <pre>
- * &lt;module name="RegexpSinglelineJava"&gt;
- *   &lt;property name="id" value="ignore"/&gt;
- *   &lt;property name="format" value="^.*@Ignore\s*$"/&gt;
- *   &lt;property name="message" value="@Ignore should have a reason."/&gt;
- * &lt;/module&gt;
- *
- * &lt;module name="RegexpSinglelineJava"&gt;
- *   &lt;property name="id" value="systemout"/&gt;
- *   &lt;property name="format" value="^.*System\.(out|err).*$"/&gt;
- *   &lt;property name="message" value="Don't use System.out/err, use SLF4J instead."/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example of SuppressWithNearbyCommentFilter configuration (idFormat which is set to
- * '$1' points that ID of the checks is in the first group of commentFormat regular expressions):
- * </p>
- * <pre>
- * &lt;module name="SuppressWithNearbyCommentFilter"&gt;
- *   &lt;property name="commentFormat" value="@cs-: (\w+) \(.*\)"/&gt;
- *   &lt;property name="idFormat" value="$1"/&gt;
- *   &lt;property name="influenceFormat" value="0"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * &#64;Ignore // @cs-: ignore (test has not been implemented yet)
- * &#64;Test
- * public void testMethod() { }
- *
- * public static void foo() {
- *   System.out.println("Debug info."); // @cs-: systemout (should not fail RegexpSinglelineJava)
- * }
- * </pre>
- * <p>
- * Example of how to configure the check to suppress more than one checks.
- * The influence format is specified in the second regexp group.
- * </p>
- * <pre>
- * &lt;module name="SuppressWithNearbyCommentFilter"&gt;
- *   &lt;property name="commentFormat" value="@cs-\: ([\w\|]+) influence (\d+)"/&gt;
- *   &lt;property name="checkFormat" value="$1"/&gt;
- *   &lt;property name="influenceFormat" value="$2"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * // @cs-: ClassDataAbstractionCoupling influence 2
- * // @cs-: MagicNumber influence 4
- * &#64;Service // no violations from ClassDataAbstractionCoupling here
- * &#64;Transactional
- * public class UserService {
- *   private int value = 10022; // no violations from MagicNumber here
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java
index 8c48da78992..41a79726668 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -51,12 +51,6 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code nearbyTextPattern} - Specify nearby text
- * pattern to trigger filter to begin suppression.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "SUPPRESS CHECKSTYLE (\w+)"}.
- * </li>
- * <li>
  * Property {@code checkPattern} - Specify check name pattern to suppress.
  * Property can also be a RegExp group index at {@code nearbyTextPattern} in
  * format of {@code $x} and be picked from line that matches {@code nearbyTextPattern}.
@@ -64,11 +58,6 @@
  * Default value is {@code ".*"}.
  * </li>
  * <li>
- * Property {@code messagePattern} - Specify check violation message pattern to suppress.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code idPattern} - Specify check ID pattern to suppress.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
@@ -81,210 +70,19 @@
  * Type is {@code java.lang.String}.
  * Default value is {@code "0"}.
  * </li>
+ * <li>
+ * Property {@code messagePattern} - Specify check violation message pattern to suppress.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code null}.
+ * </li>
+ * <li>
+ * Property {@code nearbyTextPattern} - Specify nearby text
+ * pattern to trigger filter to begin suppression.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "SUPPRESS CHECKSTYLE (\w+)"}.
+ * </li>
  * </ul>
  * <p>
- * To configure the filter to suppress audit events on the same line:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;/&gt;
- *   &lt;module name=&quot;TreeWalker&quot;&gt;
- *     &lt;module name=&quot;MagicNumber&quot;/&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * int hoursInDay = 24; // SUPPRESS CHECKSTYLE because it is too obvious
- * int daysInWeek = 7; // violation
- * </pre>
- * <p>
- * To configure the filter to suppress audit events on any line that contains
- * {@code DO NOT CHECK THIS LINE}:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;nearbyTextPattern&quot; value=&quot;DO NOT CHECK THIS LINE&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;TreeWalker&quot;&gt;
- *     &lt;module name=&quot;MagicNumber&quot;/&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * int a = 42; // DO NOT CHECK THIS LINE
- * int b = 43; // violation
- * </pre>
- * <p>
- * To configure the filter to suppress audit events whose check message contains
- * the word {@code Line}. In this case, {@code LineLengthCheck}'s violation message
- * contains it:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;messagePattern&quot; value=&quot;.*Line.*&quot;/&gt;
- *     &lt;property name=&quot;nearbyTextPattern&quot; value=&quot;.*&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;LineLength&quot;&gt;
- *     &lt;property name=&quot;max&quot; value=&quot;10&quot;/&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * export FOO=BAR # ok, because violation message is matching suppress pattern
- * </pre>
- * <p>
- * To configure the filter to suppress audit events only on a check whose id is
- * {@code ignoreMe}:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;idPattern&quot; value=&quot;ignoreMe&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;LineLength&quot;&gt;
- *     &lt;property name=&quot;max&quot; value=&quot;55&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;TreeWalker&quot;&gt;
- *     &lt;module name=&quot;MagicNumber&quot;&gt;
- *       &lt;property name=&quot;id&quot; value=&quot;ignoreMe&quot;/&gt;
- *     &lt;/module&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * int a = 42; // SUPPRESS CHECKSTYLE because i want to
- * static final int LONG_VAR_NAME_TO_TAKE_MORE_THAN_55_CHARS = 22; // LineLength violation
- * </pre>
- * <p>
- * To configure the filter to suppress audit events for the current and next 2 lines:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;lineRange&quot; value=&quot;2&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;UniqueProperties&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * key.one=41 # SUPPRESS CHECKSTYLE because I want to
- * key.one=42 # ok
- * key.one=43 # ok
- * key.one=44 # violation
- * </pre>
- * <p>
- * To configure the filter to suppress audit events for the current and previous line:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;lineRange&quot; value=&quot;-1&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;UniqueProperties&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * key.one=41 # violation
- * key.one=42 # ok
- * key.one=43 # SUPPRESS CHECKSTYLE because I want to
- * key.one=44 # violation
- * </pre>
- * <p>
- * To configure the filter with a more compact {@code nearbyTextPattern}
- * to accept variable {@code checkPattern}:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;nearbyTextPattern&quot;
- *       value=&quot;-@cs\[(\w+)\] (\w+)&quot;/&gt;
- *     &lt;property name=&quot;checkPattern&quot; value=&quot;$1&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;TreeWalker&quot;&gt;
- *     &lt;module name=&quot;MagicNumber&quot;/&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * int a = 42; // -@cs[MagicNumber] We do not consider this number as magic for some reason.
- * int b = 43; // violation
- * </pre>
- * <p>
- * To configure the filter to accept variable {@code checkPattern} and {@code lineRange}:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;nearbyTextPattern&quot;
- *       value=&quot;@cs-: (\w+) for ([+-]\d+) lines&quot;/&gt;
- *     &lt;property name=&quot;checkPattern&quot; value=&quot;$1&quot;/&gt;
- *     &lt;property name=&quot;lineRange&quot; value=&quot;$2&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;TreeWalker&quot;&gt;
- *     &lt;module name=&quot;MagicNumber&quot;/&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * int a = 42; // @cs-: MagicNumber for +3 lines
- * int b = 43;
- * int c = 44;
- * int d = 45;
- * int e = 46; // violation
- * </pre>
- * <p>
- * To configure the filter to suppress {@code LineLength} violations for lines containing a URL:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithNearbyTextFilter&quot;&gt;
- *     &lt;property name=&quot;checkPattern&quot; value=&quot;LineLength&quot;/&gt;
- *     &lt;property name=&quot;nearbyTextPattern&quot;
- *       value=&quot;&amp;lt;a href=&amp;quot;[^&amp;quot;]+&amp;quot;&amp;gt;&quot;/&gt;
- *   &lt;/module&gt;
- *   &lt;module name=&quot;LineLength&quot;&gt;
- *     &lt;property name=&quot;max&quot; value=&quot;90&quot;/&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example:
- * </p>
- * <pre>
- * /&#42;&#42;
- *  &#42; Flag description.
- *  &#42;
- *  &#42; Disabled until &lt;a href=&quot;www.github.com/owner/repo/issue/9#comment&quot;&gt; // ok
- *  &#42;/
- * public static final boolean SOME_FLAG = false;
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java
index 079b98a9fdd..0d9ccd465bb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -77,240 +77,34 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code offCommentFormat} - Specify comment pattern to trigger filter
- * to begin suppression.
+ * Property {@code checkFormat} - Specify check pattern to suppress.
  * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "// CHECKSTYLE:OFF"}.
+ * Default value is {@code ".*"}.
  * </li>
  * <li>
- * Property {@code onCommentFormat} - Specify comment pattern to trigger filter
- * to end suppression.
+ * Property {@code idFormat} - Specify check ID pattern to suppress.
  * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "// CHECKSTYLE:ON"}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code checkFormat} - Specify check pattern to suppress.
+ * Property {@code messageFormat} - Specify message pattern to suppress.
  * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code ".*"}.
+ * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code messageFormat} - Specify message pattern to suppress.
+ * Property {@code offCommentFormat} - Specify comment pattern to trigger filter
+ * to begin suppression.
  * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
+ * Default value is {@code "// CHECKSTYLE:OFF"}.
  * </li>
  * <li>
- * Property {@code idFormat} - Specify check ID pattern to suppress.
+ * Property {@code onCommentFormat} - Specify comment pattern to trigger filter
+ * to end suppression.
  * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
+ * Default value is {@code "// CHECKSTYLE:ON"}.
  * </li>
  * </ul>
  * <p>
- * To configure a filter to suppress audit events between a comment containing
- * {@code CHECKSTYLE:OFF} and a comment containing {@code CHECKSTYLE:ON}:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   ...
- *   &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;/&gt;
- *   ...
- * &lt;/module&gt;
- * </pre>
- * <p>
- * To configure a filter to suppress audit events between a comment containing
- * line {@code BEGIN GENERATED CONTENT} and a comment containing line
- * {@code END GENERATED CONTENT}(Checker is configured to check only properties files):
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;property name=&quot;fileExtensions&quot; value=&quot;properties&quot;/&gt;
- *
- *   &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;&gt;
- *     &lt;property name=&quot;offCommentFormat&quot; value=&quot;BEGIN GENERATED CONTENT&quot;/&gt;
- *     &lt;property name=&quot;onCommentFormat&quot; value=&quot;END GENERATED CONTENT&quot;/&gt;
- *   &lt;/module&gt;
- *
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * //BEGIN GENERATED CONTENT
- * my.property=value1 // No violation events will be reported
- * my.property=value2 // No violation events will be reported
- * //END GENERATED CONTENT
- * . . .
- * </pre>
- * <p>
- * To configure a filter so that {@code -- stop tab check} and {@code -- resume tab check}
- * marks allowed tab positions (Checker is configured to check only sql files):
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;property name=&quot;fileExtensions&quot; value=&quot;sql&quot;/&gt;
- *
- *   &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;&gt;
- *     &lt;property name=&quot;offCommentFormat&quot; value=&quot;stop tab check&quot;/&gt;
- *     &lt;property name=&quot;onCommentFormat&quot; value=&quot;resume tab check&quot;/&gt;
- *     &lt;property name=&quot;checkFormat&quot; value=&quot;FileTabCharacterCheck&quot;/&gt;
- *   &lt;/module&gt;
- *
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * -- stop tab check
- *   SELECT * FROM users // won't warn here if there is a tab character on line
- * -- resume tab check
- *   SELECT 1 // will warn here if there is a tab character on line
- * </pre>
- * <p>
- * To configure a filter so that name of suppressed check mentioned in comment
- * {@code CSOFF: <i>regexp</i>} and {@code CSON: <i>regexp</i>} mark a matching
- * check (Checker is configured to check only xml files):
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;property name=&quot;fileExtensions&quot; value=&quot;xml&quot;/&gt;
- *
- *   &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;&gt;
- *     &lt;property name=&quot;offCommentFormat&quot; value=&quot;CSOFF\: ([\w\|]+)&quot;/&gt;
- *     &lt;property name=&quot;onCommentFormat&quot; value=&quot;CSON\: ([\w\|]+)&quot;/&gt;
- *     &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
- *   &lt;/module&gt;
- *
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * // CSOFF: RegexpSinglelineCheck
- *  // RegexpSingleline check won't warn any lines below here if the line matches regexp
- * &lt;condition property=&quot;checkstyle.ant.skip&quot;&gt;
- *   &lt;isset property=&quot;checkstyle.ant.skip&quot;/&gt;
- * &lt;/condition&gt;
- * // CSON: RegexpSinglelineCheck
- * // RegexpSingleline check will warn below here if the line matches regexp
- * &lt;property name=&quot;checkstyle.pattern.todo&quot; value=&quot;NOTHingWillMatCH_-&quot;/&gt;
- * </pre>
- * <p>
- * To configure a filter to suppress all audit events between a comment containing
- * {@code CHECKSTYLE_OFF: ALMOST_ALL} and a comment containing {@code CHECKSTYLE_OFF: ALMOST_ALL}
- * except for the <em>EqualsHashCode</em> check (Checker is configured to check only java files):
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;property name=&quot;fileExtensions&quot; value=&quot;java&quot;/&gt;
- *
- *   &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;&gt;
- *     &lt;property name=&quot;offCommentFormat&quot;
- *       value=&quot;CHECKSTYLE_OFF: ALMOST_ALL&quot;/&gt;
- *     &lt;property name=&quot;onCommentFormat&quot;
- *       value=&quot;CHECKSTYLE_ON: ALMOST_ALL&quot;/&gt;
- *     &lt;property name=&quot;checkFormat&quot;
- *       value=&quot;^((?!(FileTabCharacterCheck)).)*$&quot;/&gt;
- *   &lt;/module&gt;
- *
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * // CHECKSTYLE_OFF: ALMOST_ALL
- * public static final int array [];
- * private String [] strArray;
- * // CHECKSTYLE_ON: ALMOST_ALL
- * private int array1 [];
- * </pre>
- * <p>
- * To configure a filter to suppress Check's violation message <b>which matches
- * specified message in messageFormat</b>(so suppression will not be only by
- * Check's name, but also by message text, as the same Check can report violations
- * with different message format) between a comment containing {@code stop} and
- * comment containing {@code resume}:
- * </p>
- * <pre>
- * &lt;module name=&quot;Checker&quot;&gt;
- *   &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;&gt;
- *     &lt;property name=&quot;offCommentFormat&quot; value=&quot;stop&quot;/&gt;
- *     &lt;property name=&quot;onCommentFormat&quot; value=&quot;resume&quot;/&gt;
- *     &lt;property name=&quot;checkFormat&quot; value=&quot;FileTabCharacterCheck&quot;/&gt;
- *     &lt;property name=&quot;messageFormat&quot;
- *         value=&quot;^File contains tab characters (this is the first instance)\.$&quot;/&gt;
- *   &lt;/module&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * It is possible to specify an ID of checks, so that it can be leveraged by the
- * SuppressWithPlainTextCommentFilter to skip validations. The following examples
- * show how to skip validations near code that is surrounded with
- * {@code -- CSOFF &lt;ID&gt; (reason)} and {@code -- CSON &lt;ID&gt;},
- * where ID is the ID of checks you want to suppress.
- * </p>
- * <p>
- * Examples of Checkstyle checks configuration:
- * </p>
- * <pre>
- * &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
- *   &lt;property name=&quot;id&quot; value=&quot;count&quot;/&gt;
- *   &lt;property name=&quot;format&quot; value=&quot;^.*COUNT(*).*$&quot;/&gt;
- *   &lt;property name=&quot;message&quot;
- *     value=&quot;Don't use COUNT(*), use COUNT(1) instead.&quot;/&gt;
- * &lt;/module&gt;
- *
- * &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
- *   &lt;property name=&quot;id&quot; value=&quot;join&quot;/&gt;
- *   &lt;property name=&quot;format&quot; value=&quot;^.*JOIN\s.+\s(ON|USING)$&quot;/&gt;
- *   &lt;property name=&quot;message&quot;
- *     value=&quot;Don't use JOIN, use sub-select instead.&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Example of SuppressWithPlainTextCommentFilter configuration (checkFormat which
- * is set to '$1' points that ID of the checks is in the first group of offCommentFormat
- * and onCommentFormat regular expressions):
- * </p>
- * <pre>
- * &lt;module name="Checker"&gt;
- *   &lt;property name="fileExtensions" value="sql"/&gt;
- *
- *   &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
- *     &lt;property name="offCommentFormat" value="CSOFF (\w+) \(\w+\)"/&gt;
- *     &lt;property name="onCommentFormat" value="CSON (\w+)"/&gt;
- *     &lt;property name="idFormat" value="$1"/&gt;
- *   &lt;/module&gt;
- *
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * -- CSOFF join (it is ok to use join here for performance reasons)
- * SELECT name, job_name
- * FROM users AS u
- * JOIN jobs AS j ON u.job_id = j.id
- * -- CSON join
- *
- * -- CSOFF count (test query execution plan)
- * EXPLAIN SELECT COUNT(*) FROM restaurants
- * -- CSON count
- * </pre>
- * <p>
- * Example of how to configure the check to suppress more than one check
- * (Checker is configured to check only sql files).
- * </p>
- * <pre>
- * &lt;module name="Checker"&gt;
- *   &lt;property name="fileExtensions" value="sql"/&gt;
- *
- *   &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
- *     &lt;property name="offCommentFormat" value="@cs-\: ([\w\|]+)"/&gt;
- *     &lt;property name="checkFormat" value="$1"/&gt;
- *   &lt;/module&gt;
- *
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * -- @cs-: RegexpSinglelineCheck
- * -- @cs-: FileTabCharacterCheck
- * CREATE TABLE STATION (
- *   ID INTEGER PRIMARY KEY,
- *   CITY CHAR(20),
- *   STATE CHAR(2),
- *   LAT_N REAL,
- *   LONG_W REAL);
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
  * </p>
  *
@@ -467,11 +261,11 @@ private Optional<Suppression> getSuppression(FileText fileText, int lineNo) {
         Suppression suppression = null;
         if (onCommentMatcher.find()) {
             suppression = new Suppression(onCommentMatcher.group(0),
-                lineNo + 1, onCommentMatcher.start(), SuppressionType.ON, this);
+                lineNo + 1, SuppressionType.ON, this);
         }
         if (offCommentMatcher.find()) {
             suppression = new Suppression(offCommentMatcher.group(0),
-                lineNo + 1, offCommentMatcher.start(), SuppressionType.OFF, this);
+                lineNo + 1, SuppressionType.OFF, this);
         }
 
         return Optional.ofNullable(suppression);
@@ -516,12 +310,9 @@ private static final class Suppression {
         /** The regexp which is used to match the event ID.*/
         private final Pattern eventIdRegexp;
 
-        /** Suppression text.*/
-        private final String text;
         /** Suppression line.*/
         private final int lineNo;
-        /** Suppression column number.*/
-        private final int columnNo;
+
         /** Suppression type. */
         private final SuppressionType suppressionType;
 
@@ -530,7 +321,6 @@ private static final class Suppression {
          *
          * @param text suppression text.
          * @param lineNo suppression line number.
-         * @param columnNo suppression column number.
          * @param suppressionType suppression type.
          * @param filter the {@link SuppressWithPlainTextCommentFilter} with the context.
          * @throws IllegalArgumentException if there is an error in the filter regex syntax.
@@ -538,13 +328,10 @@ private static final class Suppression {
         private Suppression(
             String text,
             int lineNo,
-            int columnNo,
             SuppressionType suppressionType,
             SuppressWithPlainTextCommentFilter filter
         ) {
-            this.text = text;
             this.lineNo = lineNo;
-            this.columnNo = columnNo;
             this.suppressionType = suppressionType;
 
             final Pattern commentFormat;
@@ -602,9 +389,7 @@ public boolean equals(Object other) {
             }
             final Suppression suppression = (Suppression) other;
             return Objects.equals(lineNo, suppression.lineNo)
-                    && Objects.equals(columnNo, suppression.columnNo)
                     && Objects.equals(suppressionType, suppression.suppressionType)
-                    && Objects.equals(text, suppression.text)
                     && Objects.equals(eventSourceRegexp, suppression.eventSourceRegexp)
                     && Objects.equals(eventMessageRegexp, suppression.eventMessageRegexp)
                     && Objects.equals(eventIdRegexp, suppression.eventIdRegexp);
@@ -613,7 +398,7 @@ public boolean equals(Object other) {
         @Override
         public int hashCode() {
             return Objects.hash(
-                text, lineNo, columnNo, suppressionType, eventSourceRegexp, eventMessageRegexp,
+                lineNo, suppressionType, eventSourceRegexp, eventMessageRegexp,
                 eventIdRegexp);
         }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
index 8e23b8e2397..13c3e77c335 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -72,15 +72,14 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code offCommentFormat} - Specify comment pattern to
- * trigger filter to begin suppression.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "CHECKSTYLE:OFF"}.
+ * Property {@code checkC} - Control whether to check C style comments ({@code &#47;* ... *&#47;}).
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
  * </li>
  * <li>
- * Property {@code onCommentFormat} - Specify comment pattern to trigger filter to end suppression.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code "CHECKSTYLE:ON"}.
+ * Property {@code checkCPP} - Control whether to check C++ style comments ({@code //}).
+ * Type is {@code boolean}.
+ * Default value is {@code true}.
  * </li>
  * <li>
  * Property {@code checkFormat} - Specify check pattern to suppress.
@@ -88,400 +87,28 @@
  * Default value is {@code ".*"}.
  * </li>
  * <li>
- * Property {@code messageFormat} - Specify message pattern to suppress.
+ * Property {@code idFormat} - Specify check ID pattern to suppress.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code idFormat} - Specify check ID pattern to suppress.
+ * Property {@code messageFormat} - Specify message pattern to suppress.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code checkCPP} - Control whether to check C++ style comments ({@code //}).
- * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Property {@code offCommentFormat} - Specify comment pattern to
+ * trigger filter to begin suppression.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "CHECKSTYLE:OFF"}.
  * </li>
  * <li>
- * Property {@code checkC} - Control whether to check C style comments ({@code &#47;* ... *&#47;}).
- * Type is {@code boolean}.
- * Default value is {@code true}.
+ * Property {@code onCommentFormat} - Specify comment pattern to trigger filter to end suppression.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code "CHECKSTYLE:ON"}.
  * </li>
  * </ul>
  * <p>
- * To configure a filter to suppress audit events (MemberNameCheck,
- * ConstantNameCheck and IllegalCatchCheck have been taken here for reference)
- * between a comment containing {@code CHECKSTYLE:OFF} and a comment
- * containing {@code CHECKSTYLE:ON}:
- * </p>
- * <pre>
- *   &lt;module name="SuppressionCommentFilter"/&gt;
- *   &lt;module name="MemberName"/&gt;
- *   &lt;module name="ConstantName"/&gt;
- *   &lt;module name="IllegalCatch"/&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //CHECKSTYLE:OFF
- *  int VAR2; // suppressed violation
- *  //CHECKSTYLE:ON
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  //CHECKSTYLE:OFF
- *  public static final int var4; // suppressed violation
- *  //CHECKSTYLE:ON
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *
- *    //CHECKSTYLE:OFF
- *
- *    try {}
- *    catch(Exception ex) {} // suppressed violation
- *    catch(Error err) {} // suppressed violation
- *
- *    //CHECKSTYLE:ON
- *  }
- * }
- * </pre>
- * <p>
- * To configure a filter so that {@code // stop constant check} and
- * {@code // resume constant check} marks legitimate constant names:
- * </p>
- * <pre>
- * &lt;module name="SuppressionCommentFilter"&gt;
- *   &lt;property name="offCommentFormat" value="stop constant check"/&gt;
- *   &lt;property name="onCommentFormat" value="resume constant check"/&gt;
- *   &lt;property name="checkFormat" value="ConstantNameCheck"/&gt;
- * &lt;/module&gt;
- * &lt;module name="MemberName"/&gt;
- * &lt;module name="ConstantName"/&gt;
- * &lt;module name="IllegalCatch"/&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //stop constant check
- *  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *  //resume constant check
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  //stop constant check
- *  public static final int var4; // suppressed violation
- *  //resume constant check
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *
- *    //stop constant check
- *
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *    catch(Error err) {} // violation , Catching 'Error' is not allowed
- *
- *    //resume constant check
- *  }
- * }
- * </pre>
- * <p>
- * To configure a filter so that {@code UNUSED OFF: <i>var</i>} and
- * {@code UNUSED ON: <i>var</i>} marks a variable or parameter known not to be
- * used by the code by matching the variable name in the message through a
- * specified message in messageFormat:
- * </p>
- * <pre>
- * &lt;module name="SuppressionCommentFilter"&gt;
- *   &lt;property name="offCommentFormat" value="ILLEGAL OFF\: (\w+)"/&gt;
- *   &lt;property name="onCommentFormat" value="ILLEGAL ON\: (\w+)"/&gt;
- *   &lt;property name="checkFormat" value="IllegalCatch"/&gt;
- *   &lt;property name="messageFormat" value="^Catching '$1' is not allowed.$"/&gt;
- * &lt;/module&gt;
- * &lt;module name="MemberName"/&gt;
- * &lt;module name="ConstantName"/&gt;
- * &lt;module name="IllegalCatch"/&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //ILLEGAL OFF: Exception
- *  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *  //ILLEGAL ON: Exception
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  //ILLEGAL OFF: Exception
- *  public static final int var4;
- *  // violation above ,  Name 'var4' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *  //ILLEGAL ON: Exception
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *
- *    //ILLEGAL OFF: Exception
- *
- *    try {}
- *    catch(Exception ex) {} // suppressed violation
- *    catch(Error err) {} // violation , Catching 'Error' is not allowed
- *
- *    //ILLEGAL ON: Exception
- *  }
- * }
- * </pre>
- * <p>
- * To configure a filter so that name of suppressed check mentioned in comment
- * {@code CSOFF: <i>regexp</i>} and {@code CSON: <i>regexp</i>} mark a matching check:
- * </p>
- * <pre>
- * &lt;module name="SuppressionCommentFilter"&gt;
- *   &lt;property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/&gt;
- *   &lt;property name="onCommentFormat" value="CSON\: ([\w\|]+)"/&gt;
- *   &lt;property name="checkFormat" value="$1"/&gt;
- * &lt;/module&gt;
- * &lt;module name="MemberName"/&gt;
- * &lt;module name="ConstantName"/&gt;
- * &lt;module name="IllegalCatch"/&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //CSOFF: MemberName
- *  int VAR2; // suppressed violation
- *  //CSON: MemberName
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  //CSOFF: ConstantName
- *  public static final int var4; // suppressed violation
- *  //CSON: ConstantName
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *
- *    //CSOFF: IllegalCatch
- *
- *    try {}
- *    catch(Exception ex) {} // suppressed violation
- *    catch(Error err) {} // suppressed violation
- *
- *    //CSON: IllegalCatch
- *  }
- * }
- * </pre>
- * <p>
- * To configure a filter to suppress all audit events between a comment containing
- * {@code CHECKSTYLE_OFF: ALMOST_ALL} and a comment containing
- * {@code CHECKSTYLE_OFF: ALMOST_ALL} except for the <em>ConstantName</em> check:
- * </p>
- * <pre>
- * &lt;module name="SuppressionCommentFilter"&gt;
- *   &lt;property name="offCommentFormat" value="CHECKSTYLE_OFF: ALMOST_ALL"/&gt;
- *   &lt;property name="onCommentFormat" value="CHECKSTYLE_ON: ALMOST_ALL"/&gt;
- *   &lt;property name="checkFormat" value="^((?!(ConstantName)).)*$"/&gt;
- * &lt;/module&gt;
- * &lt;module name="MemberName"/&gt;
- * &lt;module name="ConstantName"/&gt;
- * &lt;module name="IllegalCatch"/&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //CHECKSTYLE_OFF: ALMOST_ALL
- *  int VAR2; // suppressed violation
- *  //CHECKSTYLE_ON: ALMOST_ALL
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  //CHECKSTYLE_OFF: ALMOST_ALL
- *  public static final int var4;
- *  // violation above , Name 'var4' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *  //CHECKSTYLE_ON: ALMOST_ALL
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *
- *    //CHECKSTYLE_OFF: ALMOST_ALL
- *
- *    try {}
- *    catch(Exception ex) {} // suppressed violation
- *    catch(Error err) {} // suppressed violation
- *
- *    //CHECKSTYLE_ON: ALMOST_ALL
- *  }
- * }
- * </pre>
- * <p>
- * It is possible to specify an ID of checks, so that it can be leveraged by the
- * SuppressionCommentFilter to skip validations. The following examples show how
- * to skip validations near code that is surrounded with {@code // CSOFF &lt;ID&gt;}
- * and {@code // CSON &lt;ID&gt;}, where ID is the ID of checks you want to suppress.
- * In the config of SuppressionCommentFilter, checkFormat is set to '$1' which points
- * to the ID written in the offCommentFormat and onCommentFormat. Config for such a
- * case is written below:
- * </p>
- * <pre>
- * &lt;module name="SuppressionCommentFilter"&gt;
- *   &lt;property name="offCommentFormat" value="CSOFF (\w+)"/&gt;
- *   &lt;property name="onCommentFormat" value="CSON (\w+)"/&gt;
- *   &lt;property name="idFormat" value="$1"/&gt;
- * &lt;/module&gt;
- * &lt;module name="MemberName"&gt;
- *   &lt;property name="id" value="MemberID"/&gt;
- * &lt;/module&gt;
- * &lt;module name="ConstantName"&gt;
- *   &lt;property name="id" value="ConstantID"/&gt;
- * &lt;/module&gt;
- * &lt;module name="IllegalCatch"&gt;
- *   &lt;property name="id" value="IllegalID"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //CSOFF MemberID
- *  int VAR2; // suppressed violation
- *  //CSON: MemberID
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  //CSOFF ConstantID
- *  public static final int var4; // suppressed violation
- *  //CSON ConstantID
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *
- *    //CSOFF IllegalID
- *
- *    try {}
- *    catch(Exception ex) {} // suppressed violation
- *    catch(Error err) {} // suppressed violation
- *
- *    //CSON IllegalID
- *  }
- * }
- * </pre>
- * <p>
- * Example of how to configure the check to suppress checks by name defined in comment.
- * </p>
- * <pre>
- * &lt;module name="SuppressionCommentFilter"&gt;
- *   &lt;property name="offCommentFormat" value="csoff (\w+)"/&gt;
- *   &lt;property name="onCommentFormat" value="cson (\w+)"/&gt;
- *   &lt;property name="checkFormat" value="$1"/&gt;
- * &lt;/module&gt;
- *   &lt;module name="MemberName"/&gt;
- *   &lt;module name="ConstantName"/&gt;
- *   &lt;module name="IllegalCatch"/&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //csoff MemberName
- *  int VAR2; // suppressed violation
- *  //cson MemberName
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  //csoff ConstantName
- *  //csoff IllegalCatch
- *
- *  public static final int var4; // suppressed violation
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // suppressed violation
- *
- *    try {}
- *    catch(Exception ex) {} // suppressed violation
- *    catch(Error err) {} // suppressed violation
- *  }
- *
- *    //cson ConstantName
- *    //cson IllegalCatch
- *
- * }
- * </pre>
- * <p>
- * Example depicting use of checkC and checkCPP style comments
- * </p>
- * <pre>
- * &lt;module name="SuppressionCommentFilter"&gt;
- *   &lt;property name="checkC" value="true"/&gt;
- *   &lt;property name="checkCPP" value="false"/&gt;
- * &lt;/module&gt;
- * &lt;module name="MemberName"/&gt;
- * &lt;module name="ConstantName"/&gt;
- * &lt;module name="IllegalCatch"/&gt;
- * </pre>
- * <pre>
- * class InputSuppressionCommentFilter
- * {
- *  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *
- *  //CHECKSTYLE:OFF
- *  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
- *  //CHECKSTYLE:ON
- *
- *  public static final int var3;
- *  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
- *
- *  /&#42;CHECKSTYLE:OFF&#42;/
- *  public static final int var4; // suppressed violation
- *  /&#42;CHECKSTYLE:ON&#42;/
- *
- *  public void method1()
- *  {
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *
- *    //CHECKSTYLE:OFF
- *
- *    try {}
- *    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
- *    catch(Error err) {} // violation , Catching 'Error' is not allowed
- *
- *    //CHECKSTYLE:ON
- *  }
- * }
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
index 5b7915834bc..f76bbaab0e1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,6 @@
 
 package com.puppycrawl.tools.checkstyle.filters;
 
-import java.util.Collections;
 import java.util.Set;
 
 import com.puppycrawl.tools.checkstyle.AbstractAutomaticBean;
@@ -29,6 +28,7 @@
 import com.puppycrawl.tools.checkstyle.api.Filter;
 import com.puppycrawl.tools.checkstyle.api.FilterSet;
 import com.puppycrawl.tools.checkstyle.utils.FilterUtil;
+import com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil;
 
 /**
  * <p>
@@ -123,97 +123,6 @@
  * </li>
  * </ul>
  * <p>
- * For example, the following configuration fragment directs the Checker to use
- * a {@code SuppressionFilter} with suppressions file {@code config/suppressions.xml}:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionFilter&quot;&gt;
- *   &lt;property name=&quot;file&quot; value=&quot;config/suppressions.xml&quot;/&gt;
- *   &lt;property name=&quot;optional&quot; value=&quot;false&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * The following suppressions XML document directs a {@code SuppressionFilter} to
- * reject {@code JavadocStyleCheck} violations for lines 82 and 108 to 122 of file
- * {@code AbstractComplexityCheck.java}, and {@code MagicNumberCheck} violations for
- * line 221 of file {@code JavadocStyleCheck.java}, and
- * {@code 'Missing a Javadoc comment'} violations for all lines and files:
- * </p>
- * <pre>
- * &lt;?xml version=&quot;1.0&quot;?&gt;
- *
- * &lt;!DOCTYPE suppressions PUBLIC
- *   &quot;-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN&quot;
- *   &quot;https://checkstyle.org/dtds/suppressions_1_2.dtd&quot;&gt;
- *
- * &lt;suppressions&gt;
- *   &lt;suppress checks=&quot;JavadocStyleCheck&quot;
- *     files=&quot;AbstractComplexityCheck.java&quot;
- *     lines=&quot;82,108-122&quot;/&gt;
- *   &lt;suppress checks=&quot;MagicNumberCheck&quot;
- *     files=&quot;JavadocStyleCheck.java&quot;
- *     lines=&quot;221&quot;/&gt;
- *   &lt;suppress message=&quot;Missing a Javadoc comment&quot;/&gt;
- * &lt;/suppressions&gt;
- * </pre>
- * <p>
- * Suppress check by <a href="https://checkstyle.org/config.html#Id">module id</a>
- * when config have two instances on the same check:
- * </p>
- * <pre>
- * &lt;suppress id=&quot;stringEqual&quot; files=&quot;SomeTestCode.java&quot;/&gt;
- * </pre>
- * <p>
- * Suppress all checks for hidden files and folders:
- * </p>
- * <pre>
- * &lt;suppress files=&quot;[/\\]\..+&quot; checks=&quot;.*&quot;/&gt;
- * </pre>
- * <p>
- * Suppress all checks for Maven-generated code:
- * </p>
- * <pre>
- * &lt;suppress files=&quot;[/\\]target[/\\]&quot; checks=&quot;.*&quot;/&gt;
- * </pre>
- * <p>
- * Suppress all checks for archives, classes and other binary files:
- * </p>
- * <pre>
- * &lt;suppress files=&quot;.+\.(?:jar|zip|war|class|tar|bin)$&quot; checks=&quot;.*&quot;/&gt;
- * </pre>
- * <p>
- * Suppress all checks for image files:
- * </p>
- * <pre>
- * &lt;suppress files=".+\.(?:png|gif|jpg|jpeg)$" checks=".*"/&gt;
- * </pre>
- * <p>
- * Suppress all checks for non-java files:
- * </p>
- * <pre>
- * &lt;suppress files=&quot;.+\.(?:txt|xml|csv|sh|thrift|html|sql|eot|ttf|woff|css|png)$&quot;
- *     checks=&quot;.*&quot;/&gt;
- * </pre>
- * <p>
- * Suppress all checks in generated sources:
- * </p>
- * <pre>
- * &lt;suppress checks=&quot;.*&quot; files=&quot;com[\\/]mycompany[\\/]app[\\/]gen[\\/]&quot;/&gt;
- * </pre>
- * <p>
- * Suppress FileLength check on integration tests in certain folder:
- * </p>
- * <pre>
- * &lt;suppress checks=&quot;FileLength&quot;
- *   files=&quot;com[\\/]mycompany[\\/]app[\\/].*IT.java&quot;/&gt;
- * </pre>
- * <p>
- * Suppress naming violations on variable named 'log' in all files:
- * </p>
- * <pre>
- * &lt;suppress message=&quot;Name 'log' must match pattern&quot;/&gt;
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
  * </p>
  *
@@ -270,9 +179,6 @@ protected void finishLocalSetup() throws CheckstyleException {
                 if (FilterUtil.isFileExists(file)) {
                     filters = SuppressionsLoader.loadSuppressions(file);
                 }
-                else {
-                    filters = new FilterSet();
-                }
             }
             else {
                 filters = SuppressionsLoader.loadSuppressions(file);
@@ -282,7 +188,7 @@ protected void finishLocalSetup() throws CheckstyleException {
 
     @Override
     public Set<String> getExternalResourceLocations() {
-        return Collections.singleton(file);
+        return UnmodifiableCollectionUtil.singleton(file);
     }
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.java
index 915b6d58d9d..29d197bee29 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -49,20 +49,20 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code files} - Define the RegExp for matching against the file name associated with
- * an audit event.
+ * Property {@code checks} - Define the RegExp for matching against the name of the check
+ * associated with an audit event.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code checks} - Define the RegExp for matching against the name of the check
- * associated with an audit event.
- * Type is {@code java.util.regex.Pattern}.
+ * Property {@code columns} - Specify a comma-separated list of values, where each value is an
+ * integer or a range of integers denoted by integer-integer.
+ * Type is {@code java.lang.String}.
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code message} - Define the RegExp for matching against the message of the check
- * associated with an audit event.
+ * Property {@code files} - Define the RegExp for matching against the file name associated with
+ * an audit event.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
@@ -79,118 +79,13 @@
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code columns} - Specify a comma-separated list of values, where each value is an
- * integer or a range of integers denoted by integer-integer.
- * Type is {@code java.lang.String}.
+ * Property {@code message} - Define the RegExp for matching against the message of the check
+ * associated with an audit event.
+ * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
  * </ul>
  * <p>
- * The following suppressions directs a {@code SuppressionSingleFilter} to reject
- * {@code JavadocStyleCheck} violations for lines 82 and 108 to 122 of file
- * {@code AbstractComplexityCheck.java}, and
- * {@code MagicNumberCheck} violations for line 221 of file
- * {@code JavadocStyleCheck.java}, and {@code 'Missing a Javadoc comment'} violations for all lines
- * and files:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="checks" value="JavadocStyleCheck"/&gt;
- *   &lt;property name="files" value="AbstractComplexityCheck.java"/&gt;
- *   &lt;property name="lines" value="82,108-122"/&gt;
- * &lt;/module&gt;
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="checks" value="MagicNumberCheck"/&gt;
- *   &lt;property name="files" value="JavadocStyleCheck.java"/&gt;
- *   &lt;property name="lines" value="221"/&gt;
- * &lt;/module&gt;
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="message" value="Missing a Javadoc comment"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress check by <a href="https://checkstyle.org/config.html#Id">module id</a> when config
- * have two instances on the same check:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="id" value="stringEqual"/&gt;
- *   &lt;property name="files" value="SomeTestCode.java"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress all checks for hidden files and folders:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="files" value="[/\\]\..+"/&gt;
- *   &lt;property name="checks" value=".*"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress all checks for Maven-generated code:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="files" value="[/\\]target[/\\]"/&gt;
- *   &lt;property name="checks" value=".*"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress all checks for archives, classes and other binary files:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="files" value=".+\.(?:jar|zip|war|class|tar|bin)$"/&gt;
- *   &lt;property name="checks" value=".*"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress all checks for image files:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="files" value=".+\.(?:png|gif|jpg|jpeg)$"/&gt;
- *   &lt;property name="checks" value=".*"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress all checks for non-java files:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="files"
- *     value=".+\.(?:txt|xml|csv|sh|thrift|html|sql|eot|ttf|woff|css|png)$"/&gt;
- *   &lt;property name="checks" value=".*"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress all checks in generated sources:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="files" value="com[\\/]mycompany[\\/]app[\\/]gen[\\/]"/&gt;
- *   &lt;property name="checks" value=".*"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress FileLength check on integration tests in certain folder:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="files" value="com[\\/]mycompany[\\/]app[\\/].*IT.java"/&gt;
- *   &lt;property name="checks" value="FileLength"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Suppress naming violations on variable named 'log' in all files:
- * </p>
- * <pre>
- * &lt;module name="SuppressionSingleFilter"&gt;
- *   &lt;property name="message" value="Name 'log' must match pattern"/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.Checker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java
index 4470a1968f1..6ea0a56d4dd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -189,317 +189,6 @@
  * </li>
  * </ul>
  * <p>
- * For example, the following configuration fragment directs the Checker to use a
- * {@code SuppressionXpathFilter} with suppressions file {@code config/suppressions.xml}:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathFilter&quot;&gt;
- *   &lt;property name=&quot;file&quot; value=&quot;config/suppressions.xml&quot;/&gt;
- *   &lt;property name=&quot;optional&quot; value=&quot;false&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * A <a href="https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd"><em>
- * suppressions XML document</em></a>
- * contains a set of {@code suppress} and {@code suppress-xpath} elements,
- * where each {@code suppress-xpath} element can have the following attributes:
- * </p>
- * <ul>
- * <li>
- * {@code files} - a <a href="https://checkstyle.org/property_types.html#Pattern">Pattern</a>
- * matched against the file name associated with an audit event. It is optional.
- * </li>
- * <li>
- * {@code checks} - a <a href="https://checkstyle.org/property_types.html#Pattern">Pattern</a>
- * matched against the name of the check associated with an audit event.
- * Optional as long as {@code id} or {@code message} is specified.
- * </li>
- * <li>
- * {@code message} - a <a href="https://checkstyle.org/property_types.html#Pattern">Pattern</a>
- * matched against the message of the check associated with an audit event.
- * Optional as long as {@code checks} or {@code id} is specified.
- * </li>
- * <li>
- * {@code id} - a <a href="https://checkstyle.org/property_types.html#String">String</a> matched against
- * the ID of the check associated with an audit event.
- * Optional as long as {@code checks} or {@code message} is specified.
- * </li>
- * <li>
- * {@code query} - a <a href="https://checkstyle.org/property_types.html#String">String</a> xpath query. It is optional.
- * </li>
- * </ul>
- * <p>
- * Each audit event is checked against each {@code suppress} and {@code suppress-xpath} element.
- * It is suppressed if all specified attributes match against the audit event.
- * </p>
- * <p>
- * ATTENTION: filtering by message is dependent on runtime locale.
- * If project is running in different languages it is better to avoid filtering by message.
- * </p>
- * <p>
- * The following suppressions XML document directs a {@code SuppressionXpathFilter} to reject
- * {@code CyclomaticComplexity} violations for all methods with name <i>sayHelloWorld</i> inside
- * <i>FileOne</i> and <i>FileTwo</i> files:
- * </p>
- * <p>
- * Currently, xpath queries support one type of attribute {@code @text}. {@code @text} -
- * addresses to the text value of the node. For example: variable name, annotation name,
- * text content, etc. Only the following token types support {@code @text} attribute:
- * {@code TokenTypes.IDENT}, {@code TokenTypes.STRING_LITERAL}, {@code TokenTypes.CHAR_LITERAL},
- * {@code TokenTypes.NUM_LONG}, {@code TokenTypes.NUM_INT}, {@code TokenTypes.NUM_DOUBLE},
- * {@code TokenTypes.NUM_FLOAT}.
- * These token types were selected because only their text values are different
- * in content from token type and represent text value from file and can be used
- * in xpath queries for more accurate results. Other token types always have constant values.
- * </p>
- * <pre>
- * &lt;?xml version=&quot;1.0&quot;?&gt;
- *
- * &lt;!DOCTYPE suppressions PUBLIC
- * &quot;-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN&quot;
- * &quot;https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd&quot;&gt;
- *
- * &lt;suppressions&gt;
- *   &lt;suppress-xpath checks=&quot;CyclomaticComplexity&quot;
- *   files=&quot;FileOne.java,FileTwo.java&quot;
- *   query=&quot;//METHOD_DEF[./IDENT[@text='sayHelloWorld']]&quot;/&gt;
- * &lt;/suppressions&gt;
- * </pre>
- * <p>
- * Suppress checks for package definitions:
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=".*" query="/PACKAGE_DEF"/&gt;
- * </pre>
- * <p>
- * Suppress checks for parent element of the first variable definition:
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=".*" query="(//VARIABLE_DEF)[1]/.."/&gt;
- * </pre>
- * <p>
- * Suppress checks for elements which are either class definitions, either method definitions.
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=".*" query="//CLASS_DEF | //METHOD_DEF"/&gt;
- * </pre>
- * <p>
- * Suppress checks for certain methods:
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=&quot;.*&quot; query=&quot;//METHOD_DEF[./IDENT[@text='getSomeVar'
- *           or @text='setSomeVar']]&quot;/&gt;
- * </pre>
- * <p>
- * Suppress checks for variable <i>testVariable</i> inside <i>testMethod</i>
- * method inside <i>TestClass</i> class.
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=&quot;.*&quot; query=&quot;//CLASS_DEF[@text='TestClass']
- *           //METHOD_DEF[./IDENT[@text='testMethod']]
- *           //VARIABLE_DEF[./IDENT[@text='testVariable']]&quot;/&gt;
- * </pre>
- * <p>
- * In the following sample, violations for {@code LeftCurly} check will be suppressed
- * for classes with name <i>Main</i> or for methods with name <i>calculate</i>.
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=&quot;LeftCurly&quot; query=&quot;//CLASS_DEF[./IDENT[@text='Main']]//*
- *           | //METHOD_DEF[./IDENT[@text='calculate']]/*&quot;/&gt;
- * </pre>
- * <p>
- * The following example demonstrates how to suppress {@code RequireThis} violations
- * for variable <i>age</i> inside <i>changeAge</i> method.
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=&quot;RequireThis&quot;
- *      query=&quot;//CLASS_DEF[./IDENT[@text='InputTest']]
- *           //METHOD_DEF[./IDENT[@text='changeAge']]//ASSIGN/IDENT[@text='age']&quot;/&gt;
- * </pre>
- * <pre>
- * public class InputTest {
- *   private int age = 23;
- *
- *   public void changeAge() {
- *     age = 24; //violation will be suppressed
- *   }
- * }
- * </pre>
- * <p>
- * Suppress {@code IllegalThrows} violations only for methods with name <i>throwsMethod</i>
- * and only for {@code RuntimeException} exceptions. Double colon is used for axis iterations.
- * In the following example {@code ancestor} axis is used to iterate all ancestor nodes
- * of the current node with type {@code METHOD_DEF} and name <i>throwsMethod</i>.
- * Please read more about xpath axes at <a href="https://www.w3schools.com/xml/xpath_axes.asp">
- * W3Schools Xpath Axes</a>.
- * </p>
- * <pre>
- * &lt;suppress-xpath checks="IllegalThrows" query="//LITERAL_THROWS
- *           /IDENT[@text='RuntimeException' and
- *           ./ancestor::METHOD_DEF[./IDENT[@text='throwsMethod']]]"/&gt;
- * </pre>
- * <pre>
- * public class InputTest {
- *   public void throwsMethod() throws RuntimeException { // violation will be suppressed
- *   }
- *
- *   public void sampleMethod() throws RuntimeException { // will throw violation here
- *   }
- * }
- * </pre>
- * <p>
- * The following sample demonstrates how to suppress all violations for method
- * itself and all descendants. {@code descendant-or-self} axis iterates through
- * current node and all children nodes at any level. Keyword {@code node()}
- * selects node elements. Please read more about xpath syntax at
- * <a href="https://www.w3schools.com/xml/xpath_syntax.asp">W3Schools Xpath Syntax</a>.
- * </p>
- * <pre>
- * &lt;suppress-xpath checks=".*" query="//METHOD_DEF[./IDENT[@text='legacyMethod']]
- *           /descendant-or-self::node()"/&gt;
- * </pre>
- * <p>
- * Some elements can be suppressed in different ways. For example, to suppress
- * violation on variable {@code wordCount} in following code:
- * </p>
- * <pre>
- * public class InputTest {
- *     private int wordCount = 11;
- * }
- * </pre>
- * <p>
- * You need to look at AST of such code by our CLI tool:
- * </p>
- * <pre>
- * $ java -jar checkstyle-X.XX-all.jar -t InputTest.java
- * CLASS_DEF -&gt; CLASS_DEF [1:0]
- * |--MODIFIERS -&gt; MODIFIERS [1:0]
- * |   `--LITERAL_PUBLIC -&gt; public [1:0]
- * |--LITERAL_CLASS -&gt; class [1:7]
- * |--IDENT -&gt; InputTest [1:13]
- * `--OBJBLOCK -&gt; OBJBLOCK [1:23]
- * |--LCURLY -&gt; { [1:23]
- * |--VARIABLE_DEF -&gt; VARIABLE_DEF [2:4]
- * |   |--MODIFIERS -&gt; MODIFIERS [2:4]
- * |   |   `--LITERAL_PRIVATE -&gt; private [2:4]
- * |   |--TYPE -&gt; TYPE [2:12]
- * |   |   `--LITERAL_INT -&gt; int [2:12]
- * |   |--IDENT -&gt; wordCount [2:16]
- * |   |--ASSIGN -&gt; = [2:26]
- * |   |   `--EXPR -&gt; EXPR [2:28]
- * |   |       `--NUM_INT -&gt; 11 [2:28]
- * |   `--SEMI -&gt; ; [2:30]
- * `--RCURLY -&gt; } [3:0]
- * </pre>
- * <p>
- * The easiest way is to suppress by variable name. As you can see {@code VARIABLE_DEF}
- * node refers to variable declaration statement and has child node with token type
- * {@code IDENT} which is used for storing class, method, variable names.
- * </p>
- * <p>
- * The following example demonstrates how variable can be queried by its name:
- * </p>
- * <pre>
- * &lt;suppress-xpath checks="." query="//VARIABLE_DEF[
- *             ./IDENT[@text='wordCount']]"/&gt;
- * </pre>
- * <p>
- * Another way is to suppress by variable value. Again, if you look at the printed
- * AST tree above, you will notice that one of the grandchildren of {@code VARIABLE_DEF}
- * node is responsible for storing variable value -{@code NUM_INT} with value <b>11</b>.
- * </p>
- * <p>
- * The following example demonstrates how variable can be queried by its value,
- * same approach applies to {@code String, char, float, double, int, long} data types:
- * </p>
- * <pre>
- * &lt;suppress-xpath checks="." query="//VARIABLE_DEF[.//NUM_INT[@text=11]]"/&gt;
- * </pre>
- * <p>
- * Next example is about suppressing method with certain annotation by its name and element value.
- * </p>
- * <pre>
- * public class InputTest {
- *             &#64;Generated("first") // should not be suppressed
- *             public void test1() {
- *             }
- *
- *             &#64;Generated("second") // should be suppressed
- *             public void test2() {
- *             }
- *         }
- * </pre>
- * <p>
- * First of all we need to look at AST tree printed by our CLI tool:
- * </p>
- * <pre>
- * $ java -jar checkstyle-X.XX-all.jar -t InputTest.java
- * CLASS_DEF -&gt; CLASS_DEF [1:0]
- * |--MODIFIERS -&gt; MODIFIERS [1:0]
- * |   `--LITERAL_PUBLIC -&gt; public [1:0]
- * |--LITERAL_CLASS -&gt; class [1:7]
- * |--IDENT -&gt; InputTest [1:13]
- * `--OBJBLOCK -&gt; OBJBLOCK [1:23]
- * |--LCURLY -&gt; { [1:23]
- * |--METHOD_DEF -&gt; METHOD_DEF [2:4]
- * |   |--MODIFIERS -&gt; MODIFIERS [2:4]
- * |   |   |--ANNOTATION -&gt; ANNOTATION [2:4]
- * |   |   |   |--AT -&gt; @ [2:4]
- * |   |   |   |--IDENT -&gt; Generated [2:5]
- * |   |   |   |--LPAREN -&gt; ( [2:14]
- * |   |   |   |--EXPR -&gt; EXPR [2:15]
- * |   |   |   |   `--STRING_LITERAL -&gt; "first" [2:15]
- * |   |   |   `--RPAREN -&gt; ) [2:22]
- * |   |   `--LITERAL_PUBLIC -&gt; public [3:4]
- * |   |--TYPE -&gt; TYPE [3:11]
- * |   |   `--LITERAL_VOID -&gt; void [3:11]
- * |   |--IDENT -&gt; test1 [3:16]
- * |   |--LPAREN -&gt; ( [3:21]
- * |   |--PARAMETERS -&gt; PARAMETERS [3:22]
- * |   |--RPAREN -&gt; ) [3:22]
- * |   `--SLIST -&gt; { [3:24]
- * |       `--RCURLY -&gt; } [4:4]
- * |--METHOD_DEF -&gt; METHOD_DEF [6:4]
- * |   |--MODIFIERS -&gt; MODIFIERS [6:4]
- * |   |   |--ANNOTATION -&gt; ANNOTATION [6:4]
- * |   |   |   |--AT -&gt; @ [6:4]
- * |   |   |   |--IDENT -&gt; Generated [6:5]
- * |   |   |   |--LPAREN -&gt; ( [6:14]
- * |   |   |   |--EXPR -&gt; EXPR [6:15]
- * |   |   |   |   `--STRING_LITERAL -&gt; "second" [6:15]
- * |   |   |   `--RPAREN -&gt; ) [6:23]
- * |   |   `--LITERAL_PUBLIC -&gt; public [7:4]
- * |   |--TYPE -&gt; TYPE [7:11]
- * |   |   `--LITERAL_VOID -&gt; void [7:11]
- * |   |--IDENT -&gt; test2 [7:16]
- * |   |--LPAREN -&gt; ( [7:21]
- * |   |--PARAMETERS -&gt; PARAMETERS [7:22]
- * |   |--RPAREN -&gt; ) [7:22]
- * |   `--SLIST -&gt; { [7:24]
- * |       `--RCURLY -&gt; } [8:4]
- * `--RCURLY -&gt; } [9:0]
- * </pre>
- * <p>
- * AST node {@code ANNOTATION -> ANNOTATION [6:4]} has direct child
- * {@code IDENT -> Generated [6:5]}, therefore can be queried by {@code IDENT} value:
- * </p>
- * <pre>
- * &lt;suppress-xpath checks="." query="//METHOD_DEF[
- *             .//ANNOTATION/IDENT[@text='Generated']]"/&gt;
- * </pre>
- * <p>
- * The problem with query above that it will suppress violations for all methods
- * with annotation {@code @Generated}. In order to suppress methods with
- * {@code @Generated("second")} annotations only, you need to look at AST tree again.
- * Value of the {@code ANNOTATION} node is stored inside sub-node with token type
- * {@code STRING_LITERAL}. Use the following query to suppress methods with
- * {@code @Generated("second")} annotation:
- * </p>
- * <pre>
- * &lt;suppress-xpath checks="." query="//METHOD_DEF[.//ANNOTATION[
- *             ./IDENT[@text='Generated'] and ./EXPR/STRING_LITERAL[@text='second']]]"/&gt;
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java
index 4a26458eea7..336d1a30b66 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -49,20 +49,14 @@
  * </p>
  * <ul>
  * <li>
- * Property {@code files} - Define a Regular Expression matched against the file
- * name associated with an audit event.
- * Type is {@code java.util.regex.Pattern}.
- * Default value is {@code null}.
- * </li>
- * <li>
  * Property {@code checks} - Define a Regular Expression matched against the name
  * of the check associated with an audit event.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code message} - Define a Regular Expression matched against the message
- * of the check associated with an audit event.
+ * Property {@code files} - Define a Regular Expression matched against the file
+ * name associated with an audit event.
  * Type is {@code java.util.regex.Pattern}.
  * Default value is {@code null}.
  * </li>
@@ -73,337 +67,18 @@
  * Default value is {@code null}.
  * </li>
  * <li>
+ * Property {@code message} - Define a Regular Expression matched against the message
+ * of the check associated with an audit event.
+ * Type is {@code java.util.regex.Pattern}.
+ * Default value is {@code null}.
+ * </li>
+ * <li>
  * Property {@code query} - Define a string xpath query.
  * Type is {@code java.lang.String}.
  * Default value is {@code null}.
  * </li>
  * </ul>
  * <p>
- * To configure to suppress the MethodName check for all methods with
- * name MyMethod inside FileOne and FileTwo files:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;files&quot; value=&quot;File(One|Two)\.java&quot;/&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;(//CLASS_DEF[@text='FileOne']/OBJBLOCK/
- *             METHOD_DEF[@text='MyMethod']/IDENT)|
- *             (//CLASS_DEF[@text='FileTwo']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code example:
- * </p>
- * <pre>
- * public class FileOne {
- *   public void MyMethod() {} // OK
- * }
- *
- * public class FileTwo {
- *   public void MyMethod() {} // OK
- * }
- *
- * public class FileThree {
- *   public void MyMethod() {} // violation, name 'MyMethod'
- *                             // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
- * }
- * </pre>
- * <p>
- * To suppress MethodName check for method names matched pattern 'MyMethod[0-9]':
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
- *   &lt;property name=&quot;message&quot; value=&quot;MyMethod[0-9]&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code Example:
- * </p>
- * <pre>
- * public class FileOne {
- *   public void MyMethod1() {} // OK
- *   public void MyMethod2() {} // OK
- *   public void MyMethodA() {} // violation, name 'MyMethodA' must
- *                              // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
- * }
- * </pre>
- * <p>
- * To suppress checks being specified by id property:
- * </p>
- * <pre>
- * &lt;module name=&quot;MethodName&quot;&gt;
- *   &lt;property name=&quot;id&quot; value=&quot;MethodName1&quot;/&gt;
- *   &lt;property name=&quot;format&quot; value=&quot;^[a-z](_?[a-zA-Z0-9]+)*$&quot;/&gt;
- * &lt;module/&gt;
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;files&quot; value=&quot;FileOne.java&quot;/&gt;
- *   &lt;property name=&quot;id&quot; value=&quot;MethodName1&quot;/&gt;
- * &lt;module/&gt;
- * </pre>
- * <p>
- * Code example:
- * </p>
- * <pre>
- * public class FileOne {
- *   public void MyMethod() {} // OK
- * }
- * public class FileTwo {
- *   public void MyMethod() {} // violation,  name 'MyMethod' must
- *                             //match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
- * }
- * </pre>
- * <p>
- * To suppress checks for all package definitions:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter"&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;PackageName&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;/PACKAGE_DEF[@text='File']/IDENT&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code example:
- * </p>
- * <pre>
- * package File; // OK
- *
- * public class FileOne {}
- * </pre>
- * <p>
- * To suppress RedundantModifier check for interface definitions:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;RedundantModifier&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;//INTERFACE_DEF//*&quot;/&gt;
- * &lt;module/&gt;
- * </pre>
- * <p>
- * Code Example:
- * </p>
- * <pre>
- * public interface TestClass {
- *   public static final int CONSTANT1 = 1;  // OK
- * }
- * </pre>
- * <p>
- * To suppress checks in the FileOne file by non-query:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;files&quot; value=&quot;FileOne.java&quot;/&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;MyMethod&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code example:
- * </p>
- * <pre>
- * public class FileOne {
- *   public void MyMethod() {} // OK
- * }
- *
- * public class FileTwo {
- *   public void MyMethod() {} // violation, name 'MyMethod'
- *                             // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
- * }
- * </pre>
- * <p>
- * Suppress checks for elements which are either class definitions, either method definitions:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
- *   &lt;property name=&quot;query&quot;
- *             value=&quot;(//CLASS_DEF[@text='FileOne'])|
- *             (//CLASS_DEF[@text='FileOne']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code example:
- * </p>
- * <pre>
- * abstract class FileOne { // OK
- *   public void MyMethod() {} // OK
- * }
- *
- * abstract class FileTwo { // violation of the AbstractClassName check,
- *                          // it should match the pattern "^Abstract.+$"
- *   public void MyMethod() {} // violation, name 'MyMethod'
- *                             // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
- * }
- * </pre>
- * <p>
- * Suppress checks for MyMethod1 or MyMethod2 methods:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='FileOne']/OBJBLOCK/
- *             METHOD_DEF[@text='MyMethod1' or @text='MyMethod2']/IDENT&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code example:
- * </p>
- * <pre>
- * public class FileOne {
- *   public void MyMethod1() {} // OK
- *   public void MyMethod2() {} // OK
- *   public void MyMethod3() {} // violation, name 'MyMethod3' must
- *                              // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
- * }
- * </pre>
- * <p>
- * Suppress checks for variable testVariable inside testMethod method inside TestClass class:
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;LocalFinalVariableName&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='TestClass']/OBJBLOCK
- *         /METHOD_DEF[@text='testMethod']/SLIST
- *         /VARIABLE_DEF[@text='testVariable1']/IDENT&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code Example:
- * </p>
- * <pre>
- * public class TestClass {
- *   public void testMethod() {
- *     final int testVariable1 = 10; // OK
- *     final int testVariable2 = 10; // violation of the LocalFinalVariableName check,
- *                                   // name 'testVariable2' must match pattern '^[A-Z][A-Z0-9]*$'
- *   }
- * }
- * </pre>
- * <p>
- * In the following sample, violations for LeftCurly check will be suppressed
- * for classes with name Main or for methods with name calculate.
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;LeftCurly&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='TestClass']/OBJBLOCK
- *         /METHOD_DEF[@text='testMethod1']/SLIST*&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code Example:
- * </p>
- * <pre>
- * public class TestClass {
- *   public void testMethod1()
- *   { // OK
- *   }
- *
- *   public void testMethod2()
- *   { // violation, '{' should be on the previous line
- *   }
- * }
- * </pre>
- * <p>
- * The following example demonstrates how to suppress RequireThis violations for
- * variable age inside changeAge method.
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;RequireThis&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='InputTest']
- *         //METHOD_DEF[@text='changeAge']//ASSIGN[@text='age']/IDENT&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code Example:
- * </p>
- * <pre>
- * public class InputTest {
- *   private int age = 23;
- *
- *   public void changeAge() {
- *     age = 24; // violation will be suppressed
- *   }
- * }
- * </pre>
- * <p>
- * Suppress {@code IllegalThrows} violations only for methods with name
- * <i>throwsMethod</i> and only for {@code RuntimeException} exceptions.
- * Double colon is used for axis iterations. In the following example
- * {@code ancestor} axis is used to iterate all ancestor nodes of the current
- * node with type {@code METHOD_DEF} and name <i>throwsMethod</i>.
- * Please read more about xpath axes at
- * <a href="https://www.w3schools.com/xml/xpath_axes.asp">W3Schools Xpath Axes</a>.
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;IllegalThrows&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;//LITERAL_THROWS/IDENT[
- *       ..[@text='RuntimeException'] and ./ancestor::METHOD_DEF[@text='throwsMethod']]&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code Example:
- * </p>
- * <pre>
- * public class InputTest {
- *   public void throwsMethod() throws RuntimeException { // violation will be suppressed
- *   }
- *
- *   public void sampleMethod() throws RuntimeException { // will throw violation here
- *   }
- * }
- * </pre>
- * <p>
- * The following sample demonstrates how to suppress all violations for method
- * itself and all descendants. {@code descendant-or-self} axis iterates through
- * current node and all children nodes at any level. Keyword {@code node()}
- * selects node elements. Please read more about xpath syntax at
- * <a href="https://www.w3schools.com/xml/xpath_syntax.asp">W3Schools Xpath Syntax</a>.
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
- *   &lt;property name=&quot;query&quot; value=&quot;//METHOD_DEF[@text='TestMethod1']
- *         /descendant-or-self::node()&quot;/&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
- * Code Example:
- * </p>
- * <pre>
- * public class TestClass {
- *   public void TestMethod1() { // OK
- *     final int num = 10; // OK
- *   }
- *
- *   public void TestMethod2() { // violation of the MethodName check,
- *                               // name 'TestMethod2' must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
- *     final int num = 10; // violation of the LocalFinalVariableName check,
- *                         // name 'num' must match pattern '^[A-Z][A-Z0-9]*$'
- *   }
- * }
- * </pre>
- * <p>
- * The following example is an example of what checks would be suppressed while
- * building Spring projects with checkstyle plugin. Please find more information at:
- * <a href="https://github.com/spring-io/spring-javaformat">spring-javaformat</a>
- * </p>
- * <pre>
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;files&quot; value=&quot;[\\/]src[\\/]test[\\/]java[\\/]&quot;/&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;Javadoc*&quot;/&gt;
- * &lt;/module&gt;
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;files&quot; value=&quot;.*Tests\.java&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;Javadoc*&quot;&gt;
- * &lt;/module&gt;
- * &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
- *   &lt;property name=&quot;files&quot; value=&quot;generated-sources&quot;&gt;
- *   &lt;property name=&quot;checks&quot; value=&quot;[a-zA-Z0-9]*&quot;&gt;
- * &lt;/module&gt;
- * </pre>
- * <p>
  * Parent is {@code com.puppycrawl.tools.checkstyle.TreeWalker}
  * </p>
  *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java
index deff903ddc0..fa6d050c732 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,6 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URI;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Locale;
@@ -218,10 +217,7 @@ private static XpathFilterElement getXpathFilter(Attributes attributes) throws S
      */
     public static FilterSet loadSuppressions(String filename)
             throws CheckstyleException {
-        // figure out if this is a File or a URL
-        final URI uri = CommonUtil.getUriByFilename(filename);
-        final InputSource source = new InputSource(uri.toString());
-        return loadSuppressions(source, filename);
+        return loadSuppressions(CommonUtil.sourceFromFilename(filename), filename);
     }
 
     /**
@@ -247,10 +243,7 @@ private static FilterSet loadSuppressions(
      */
     public static Set<TreeWalkerFilter> loadXpathSuppressions(String filename)
             throws CheckstyleException {
-        // figure out if this is a File or a URL
-        final URI uri = CommonUtil.getUriByFilename(filename);
-        final InputSource source = new InputSource(uri.toString());
-        return loadXpathSuppressions(source, filename);
+        return loadXpathSuppressions(CommonUtil.sourceFromFilename(filename), filename);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java
index 7f04a1a5270..0f60741b652 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElement.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,21 +47,12 @@ public class XpathFilterElement implements TreeWalkerFilter {
     /** The regexp to match file names against. */
     private final Pattern fileRegexp;
 
-    /** The pattern for file names. */
-    private final String filePattern;
-
     /** The regexp to match check names against. */
     private final Pattern checkRegexp;
 
-    /** The pattern for check class names. */
-    private final String checkPattern;
-
     /** The regexp to match message names against. */
     private final Pattern messageRegexp;
 
-    /** The pattern for message names. */
-    private final String messagePattern;
-
     /** Module id filter. */
     private final String moduleId;
 
@@ -105,30 +96,9 @@ public XpathFilterElement(String files, String checks,
      */
     public XpathFilterElement(Pattern files, Pattern checks, Pattern message,
                            String moduleId, String query) {
-        if (files == null) {
-            filePattern = null;
-            fileRegexp = null;
-        }
-        else {
-            filePattern = files.pattern();
-            fileRegexp = files;
-        }
-        if (checks == null) {
-            checkPattern = null;
-            checkRegexp = null;
-        }
-        else {
-            checkPattern = checks.pattern();
-            checkRegexp = checks;
-        }
-        if (message == null) {
-            messagePattern = null;
-            messageRegexp = null;
-        }
-        else {
-            messagePattern = message.pattern();
-            messageRegexp = message;
-        }
+        fileRegexp = files;
+        checkRegexp = checks;
+        messageRegexp = message;
         this.moduleId = moduleId;
         xpathQuery = query;
         if (xpathQuery == null) {
@@ -197,7 +167,8 @@ private boolean isXpathQueryMatching(TreeWalkerAuditEvent event) {
         else {
             isMatching = false;
             final List<AbstractNode> nodes = getItems(event)
-                    .stream().map(AbstractNode.class::cast).collect(Collectors.toList());
+                .stream().map(AbstractNode.class::cast)
+                .collect(Collectors.toUnmodifiableList());
             for (AbstractNode abstractNode : nodes) {
                 isMatching = abstractNode.getTokenType() == event.getTokenType()
                         && abstractNode.getLineNumber() == event.getLine()
@@ -240,8 +211,8 @@ private List<Item> getItems(TreeWalkerAuditEvent event) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(filePattern, checkPattern, messagePattern,
-            moduleId, xpathQuery);
+        return Objects.hash(getPatternSafely(fileRegexp), getPatternSafely(checkRegexp),
+                getPatternSafely(messageRegexp), moduleId, xpathQuery);
     }
 
     @Override
@@ -253,11 +224,28 @@ public boolean equals(Object other) {
             return false;
         }
         final XpathFilterElement xpathFilter = (XpathFilterElement) other;
-        return Objects.equals(filePattern, xpathFilter.filePattern)
-                && Objects.equals(checkPattern, xpathFilter.checkPattern)
-                && Objects.equals(messagePattern, xpathFilter.messagePattern)
+        return Objects.equals(getPatternSafely(fileRegexp),
+                    getPatternSafely(xpathFilter.fileRegexp))
+                && Objects.equals(getPatternSafely(checkRegexp),
+                    getPatternSafely(xpathFilter.checkRegexp))
+                && Objects.equals(getPatternSafely(messageRegexp),
+                    getPatternSafely(xpathFilter.messageRegexp))
                 && Objects.equals(moduleId, xpathFilter.moduleId)
                 && Objects.equals(xpathQuery, xpathFilter.xpathQuery);
     }
 
+    /**
+     * Util method to get pattern String value from Pattern object safely, return null if
+     * pattern object is null.
+     *
+     * @param pattern pattern object
+     * @return value of pattern or null
+     */
+    private static String getPatternSafely(Pattern pattern) {
+        String result = null;
+        if (pattern != null) {
+            result = pattern.pattern();
+        }
+        return result;
+    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/package-info.java
index a296d86f1d6..25148ef8236 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CommentListener.java b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CommentListener.java
index 73dc72e052c..5c3188d71dd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CommentListener.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CommentListener.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.java b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.java
new file mode 100644
index 00000000000..1fee7970d4e
--- /dev/null
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CompositeLexerContextCache.java
@@ -0,0 +1,163 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.grammar;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+import org.antlr.v4.runtime.Lexer;
+
+import com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageLexer;
+
+/**
+ * This class is used to keep track of the lexer context to help us determine
+ * when to switch lexer modes.
+ */
+public final class CompositeLexerContextCache {
+
+    /** Stack for tracking string template contexts. */
+    private final Deque<StringTemplateContext> stringTemplateContextStack;
+
+    /** The lexer to use. */
+    private final Lexer lexer;
+
+    /**
+     * Creates a new CompositeLexerContextCache instance.
+     *
+     * @param lexer the lexer to use
+     */
+    public CompositeLexerContextCache(Lexer lexer) {
+        stringTemplateContextStack = new ArrayDeque<>();
+        this.lexer = lexer;
+    }
+
+    /**
+     * Enter a string template context.
+     *
+     * @param mode the lexer mode to enter
+     */
+    public void enterTemplateContext(int mode) {
+        final StringTemplateContext newContext =
+                new StringTemplateContext(mode, 0);
+        stringTemplateContextStack.push(newContext);
+        lexer.pushMode(mode);
+    }
+
+    /**
+     * Exit a string template context.
+     */
+    public void exitTemplateContext() {
+        stringTemplateContextStack.pop();
+        lexer.popMode();
+    }
+
+    /**
+     * Update the left curly brace context if we are in a string template.
+     */
+    public void updateLeftCurlyBraceContext() {
+        if (isInStringTemplateContext()) {
+            final StringTemplateContext currentContext = stringTemplateContextStack.pop();
+            final StringTemplateContext newContext = new StringTemplateContext(
+                    currentContext.getMode(),
+                    currentContext.getCurlyBraceDepth() + 1
+            );
+            stringTemplateContextStack.push(newContext);
+        }
+    }
+
+    /**
+     * Update the right curly brace context if we are in a string template.
+     */
+    public void updateRightCurlyBraceContext() {
+        if (isInStringTemplateContext()) {
+            final StringTemplateContext currentContext = stringTemplateContextStack.pop();
+            if (currentContext.getCurlyBraceDepth() == 0) {
+                // This right curly brace is the start delimiter
+                // of a template middle or end. We consume
+                // the right curly brace to be used as the first token
+                // in the appropriate lexer mode rule, enter
+                // the corresponding lexer mode, and keep consuming
+                // the rest of the template middle or end.
+                stringTemplateContextStack.push(currentContext);
+                lexer.setType(JavaLanguageLexer.EMBEDDED_EXPRESSION_END);
+                lexer.pushMode(currentContext.getMode());
+            }
+            else {
+                // We've consumed a right curly brace within an embedded expression.
+                final StringTemplateContext newContext = new StringTemplateContext(
+                        currentContext.getMode(),
+                        currentContext.getCurlyBraceDepth() - 1
+                );
+                stringTemplateContextStack.push(newContext);
+            }
+        }
+    }
+
+    /**
+     * Check if we are in a string template context.
+     *
+     * @return true if we are in a string template context
+     */
+    private boolean isInStringTemplateContext() {
+        return !stringTemplateContextStack.isEmpty();
+    }
+
+    /**
+     * A class to represent the context of a string template.
+     */
+    private static final class StringTemplateContext {
+
+        /** The lexer mode of this context. */
+        private final int mode;
+
+        /** The depth of this context. */
+        private final int curlyBraceDepth;
+
+        /**
+         * Creates a new TemplateContext instance.
+         *
+         * @param mode the lexer mode of this context
+         * @param curlyBraceDepth the depth of this context
+         */
+        private StringTemplateContext(int mode, int curlyBraceDepth) {
+            this.mode = mode;
+            this.curlyBraceDepth = curlyBraceDepth;
+        }
+
+        /**
+         * Get the lexer mode of this context.
+         *
+         * @return current lexer mode
+         */
+        public int getMode() {
+            return mode;
+        }
+
+        /**
+         * Current depth of this context.
+         *
+         * @return current depth
+         */
+        public int getCurlyBraceDepth() {
+            return curlyBraceDepth;
+        }
+    }
+
+}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java
index bf127fd994a..f3cc41e3a1b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/package-info.java
index aac700d0603..33fd3670900 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java
index 993c6d42fd8..4432bb51414 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java
index ab862039e0f..f1820779db6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelector.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.java
index 19bdefe17ef..cea85f55df4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentation.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java
index 3f9b11a2b8f..c23865d571a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/Main.java
index 751036d8836..7f3b61f4906 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/Main.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/Main.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java
index 2df7fab8638..cee09c209c9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java
index f0641b289f1..c8f5abb3f24 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java
index 76b5bb7bcf5..2540c0d7642 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java
index 9805b332d52..0bd0b1062eb 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java
index eb686573cbf..22bd9bc19cf 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.java
index fb2f2730d45..44c150f5a3d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableCellRenderer.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
index 662c0d13ffe..87296b88e8b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/package-info.java
index 8f4b8e9ed4c..3fc3c723155 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java
index e2ec83bf283..e4c68b1dc7b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraper.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -297,7 +297,7 @@ private static ModulePropertyDetails createProperties(DetailNode nodeLi) {
         final Optional<DetailNode> propertyNameNode = getFirstChildOfType(nodeLi,
                 JavadocTokenTypes.JAVADOC_INLINE_TAG, 0);
         if (propertyNameNode.isPresent()) {
-            final DetailNode propertyNameTag = propertyNameNode.get();
+            final DetailNode propertyNameTag = propertyNameNode.orElseThrow();
             final String propertyName = getTextFromTag(propertyNameTag);
 
             final DetailNode propertyType = getFirstChildOfMatchingText(nodeLi, TYPE_TAG)
@@ -318,7 +318,7 @@ private static ModulePropertyDetails createProperties(DetailNode nodeLi) {
             final Optional<DetailNode> validationTypeNodeOpt = getFirstChildOfMatchingText(nodeLi,
                 VALIDATION_TYPE_TAG);
             if (validationTypeNodeOpt.isPresent()) {
-                final DetailNode validationTypeNode = validationTypeNodeOpt.get();
+                final DetailNode validationTypeNode = validationTypeNodeOpt.orElseThrow();
                 modulePropertyDetails.setValidationType(getTagTextFromProperty(nodeLi,
                     validationTypeNode));
             }
@@ -349,7 +349,7 @@ private static String getTagTextFromProperty(DetailNode nodeLi, DetailNode prope
                 JavadocTokenTypes.JAVADOC_INLINE_TAG, propertyMeta.getIndex() + 1);
         DetailNode tagNode = null;
         if (tagNodeOpt.isPresent()) {
-            tagNode = tagNodeOpt.get();
+            tagNode = tagNodeOpt.orElseThrow();
         }
         return getTextFromTag(tagNode);
     }
@@ -444,7 +444,7 @@ private static String getPropertyDefaultText(DetailNode nodeLi, DetailNode defau
                 JavadocTokenTypes.JAVADOC_INLINE_TAG, defaultValueNode.getIndex() + 1);
         final String result;
         if (propertyDefaultValueTag.isPresent()) {
-            result = getTextFromTag(propertyDefaultValueTag.get());
+            result = getTextFromTag(propertyDefaultValueTag.orElseThrow());
         }
         else {
             final String tokenText = constructSubTreeText(nodeLi,
@@ -644,7 +644,7 @@ private boolean isTopLevelClassJavadoc() {
                             && child.getType() == TokenTypes.IDENT;
                 });
         return className.isPresent()
-                && getModuleSimpleName().equals(className.get().getText());
+                && getModuleSimpleName().equals(className.orElseThrow().getText());
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.java
index cfc26b90242..dfcd7b6f2bd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGenerationException.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java
index e1f115df5c3..fb3c0bdc242 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -99,7 +99,7 @@ private static List<File> getTargetFiles(String path, String... moduleFolders)
                                     || fileName.endsWith("Check.java")
                                     || fileName.endsWith("Filter.java");
                         })
-                        .collect(Collectors.toList()));
+                        .collect(Collectors.toUnmodifiableList()));
             }
         }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleDetails.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleDetails.java
index 9191666f39b..95c928db1bd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleDetails.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleDetails.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.java
index 205269db2d8..7d8088fabf1 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModulePropertyDetails.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleType.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleType.java
index 75ecba8ce67..dfe2ff7ba26 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleType.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/ModuleType.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java
index ac97f479cad..c35627225a7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java
index 556500946cf..e4a479be4a9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/package-info.java
index cd58480749e..67be0e69b56 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java
index 589b9a1356f..743924f116e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java
new file mode 100644
index 00000000000..d01f53c6a7e
--- /dev/null
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java
@@ -0,0 +1,173 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.site;
+
+import java.beans.Introspector;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import com.puppycrawl.tools.checkstyle.FileStatefulCheck;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.DetailNode;
+import com.puppycrawl.tools.checkstyle.api.JavadocTokenTypes;
+import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck;
+import com.puppycrawl.tools.checkstyle.utils.BlockCommentPosition;
+
+/**
+ * Class for scraping class javadoc and all property setter javadocs from the
+ * given checkstyle module.
+ */
+@FileStatefulCheck
+public class ClassAndPropertiesSettersJavadocScraper extends AbstractJavadocCheck {
+
+    /**
+     * Map of scraped javadocs - name of property, javadoc detail node.
+     * The class javadoc is stored too, with the key being the module name.
+     */
+    private static final Map<String, DetailNode> JAVADOC_FOR_MODULE_OR_PROPERTY =
+            new LinkedHashMap<>();
+
+    /** Name of the module being scraped. */
+    private static String moduleName = "";
+
+    /**
+     * Initialize the scraper. Clears static context and sets the module name.
+     *
+     * @param newModuleName the module name.
+     */
+    public static void initialize(String newModuleName) {
+        JAVADOC_FOR_MODULE_OR_PROPERTY.clear();
+        moduleName = newModuleName;
+    }
+
+    /**
+     * Get the module or property javadocs map.
+     *
+     * @return the javadocs.
+     */
+    public static Map<String, DetailNode> getJavadocsForModuleOrProperty() {
+        return Collections.unmodifiableMap(JAVADOC_FOR_MODULE_OR_PROPERTY);
+    }
+
+    @Override
+    public int[] getDefaultJavadocTokens() {
+        return new int[] {
+            JavadocTokenTypes.JAVADOC,
+        };
+    }
+
+    @Override
+    public void visitJavadocToken(DetailNode ast) {
+        final DetailAST blockCommentAst = getBlockCommentAst();
+        if (BlockCommentPosition.isOnMethod(blockCommentAst)) {
+            final DetailAST methodDef = getParentAst(blockCommentAst, TokenTypes.METHOD_DEF);
+            if (methodDef != null
+                    && isSetterMethod(methodDef)
+                    && isMethodOfScrapedModule(methodDef)) {
+                final String methodName = methodDef.findFirstToken(TokenTypes.IDENT).getText();
+                final String propertyName = getPropertyName(methodName);
+                JAVADOC_FOR_MODULE_OR_PROPERTY.put(propertyName, ast);
+            }
+
+        }
+        else if (BlockCommentPosition.isOnClass(blockCommentAst)) {
+            final DetailAST classDef = getParentAst(blockCommentAst, TokenTypes.CLASS_DEF);
+            if (classDef != null) {
+                final String className = classDef.findFirstToken(TokenTypes.IDENT).getText();
+                if (className.equals(moduleName)) {
+                    JAVADOC_FOR_MODULE_OR_PROPERTY.put(moduleName, ast);
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks if the given method is a method of the module being scraped. Traverses
+     * parent nodes until it finds the class definition and checks if the class name
+     * is the same as the module name. We want to avoid scraping javadocs from
+     * inner classes.
+     *
+     * @param methodDef the method definition.
+     * @return true if the method is a method of the given module, false otherwise.
+     */
+    private static boolean isMethodOfScrapedModule(DetailAST methodDef) {
+        final DetailAST classDef = getParentAst(methodDef, TokenTypes.CLASS_DEF);
+
+        boolean isMethodOfModule = false;
+        if (classDef != null) {
+            final String className = classDef.findFirstToken(TokenTypes.IDENT).getText();
+            isMethodOfModule = className.equals(moduleName);
+        }
+
+        return isMethodOfModule;
+    }
+
+    /**
+     * Get the parent node of the given type. Traverses up the tree until it finds
+     * the given type.
+     *
+     * @param ast the node to start traversing from.
+     * @param type the type of the parent node to find.
+     * @return the parent node of the given type, or null if not found.
+     */
+    private static DetailAST getParentAst(DetailAST ast, int type) {
+        DetailAST node = ast.getParent();
+
+        while (node != null && node.getType() != type) {
+            node = node.getParent();
+        }
+
+        return node;
+    }
+
+    /**
+     * Get the property name from the setter method name. For example, getPropertyName("setFoo")
+     * returns "foo". This method removes the "set" prefix and decapitalizes the first letter
+     * of the property name.
+     *
+     * @param setterName the setter method name.
+     * @return the property name.
+     */
+    private static String getPropertyName(String setterName) {
+        return Introspector.decapitalize(setterName.substring("set".length()));
+    }
+
+    /**
+     * Returns whether an AST represents a setter method.
+     *
+     * @param ast the AST to check with
+     * @return whether the AST represents a setter method
+     */
+    private static boolean isSetterMethod(DetailAST ast) {
+        boolean setterMethod = false;
+
+        if (ast.getType() == TokenTypes.METHOD_DEF) {
+            final DetailAST type = ast.findFirstToken(TokenTypes.TYPE);
+            final String name = type.getNextSibling().getText();
+            final Pattern setterPattern = Pattern.compile("^set[A-Z].*");
+
+            setterMethod = setterPattern.matcher(name).matches();
+        }
+        return setterMethod;
+    }
+}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java
index 3a77a4d797a..a2897e289d3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -80,6 +80,15 @@ public void execute(Sink sink, MacroRequest request) throws MacroExecutionExcept
 
         if ("config".equals(type)) {
             final String config = getConfigSnippet(lines);
+
+            if (config.isBlank()) {
+                final String message = String.format(Locale.ROOT,
+                        "Empty config snippet from %s, check"
+                                + " for xml config snippet delimiters in input file.", path
+                );
+                throw new MacroExecutionException(message);
+            }
+
             writeSnippet(sink, config);
         }
         else if ("code".equals(type)) {
@@ -88,6 +97,15 @@ else if ("code".equals(type)) {
             if (path.contains("filetabcharacter")) {
                 code = code.replace("\t", "  ");
             }
+
+            if (code.isBlank()) {
+                final String message = String.format(Locale.ROOT,
+                        "Empty code snippet from %s, check"
+                                + " for code snippet delimiters in input file.", path
+                );
+                throw new MacroExecutionException(message);
+            }
+
             writeSnippet(sink, code);
         }
         else {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.java
index 22bc5127774..7c2f9cf7e63 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ParentModuleMacro.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -84,7 +84,7 @@ private static void createParentModuleParagraph(XdocSink sink, Class<?> clss, St
      */
     private static String getLinkToParentModule(String parentModule, String moduleName)
             throws MacroExecutionException {
-        final Path templatePath = getTemplatePath(moduleName);
+        final Path templatePath = SiteUtil.getTemplatePath(moduleName);
         if (templatePath == null) {
             throw new MacroExecutionException(
                     String.format(Locale.ROOT, "Could not find template for %s", moduleName));
@@ -100,22 +100,4 @@ private static String getLinkToParentModule(String parentModule, String moduleNa
                 .replace('\\', '/')
                 + "#" + parentModule;
     }
-
-    /**
-     * Returns path to the template for the given module name or throws an exception if the
-     * template cannot be found.
-     *
-     * @param moduleName the module whose template we are looking for.
-     * @return path to the template.
-     * @throws MacroExecutionException if the template cannot be found.
-     */
-    private static Path getTemplatePath(String moduleName) throws MacroExecutionException {
-        final String fileNamePattern = ".*[\\\\/]"
-                + moduleName.toLowerCase(Locale.ROOT) + "\\..*";
-        return SiteUtil.getXdocsTemplatesFilePaths()
-            .stream()
-            .filter(path -> path.toString().matches(fileNamePattern))
-            .findFirst()
-            .orElse(null);
-    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/PropertiesMacro.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/PropertiesMacro.java
new file mode 100644
index 00000000000..cf72e072db6
--- /dev/null
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/PropertiesMacro.java
@@ -0,0 +1,582 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.site;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.maven.doxia.macro.AbstractMacro;
+import org.apache.maven.doxia.macro.Macro;
+import org.apache.maven.doxia.macro.MacroExecutionException;
+import org.apache.maven.doxia.macro.MacroRequest;
+import org.apache.maven.doxia.module.xdoc.XdocSink;
+import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Component;
+
+import com.puppycrawl.tools.checkstyle.PropertyType;
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
+import com.puppycrawl.tools.checkstyle.api.DetailNode;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+import com.puppycrawl.tools.checkstyle.utils.JavadocUtil;
+import com.puppycrawl.tools.checkstyle.utils.TokenUtil;
+
+/**
+ * A macro that inserts a table of properties for the given checkstyle module.
+ */
+@Component(role = Macro.class, hint = "properties")
+public class PropertiesMacro extends AbstractMacro {
+
+    /**
+     * Constant value for cases when tokens set is empty.
+     */
+    public static final String EMPTY = "empty";
+
+    /** Set of properties not inherited from the base token configuration. */
+    public static final Set<String> NON_BASE_TOKEN_PROPERTIES = Collections.unmodifiableSet(
+            Arrays.stream(new String[] {
+                "AtclauseOrder - target",
+                "DescendantToken - limitedTokens",
+                "IllegalType - memberModifiers",
+                "MagicNumber - constantWaiverParentToken",
+                "MultipleStringLiterals - ignoreOccurrenceContext",
+            }).collect(Collectors.toSet()));
+
+    /** The precompiled pattern for a comma followed by a space. */
+    private static final Pattern COMMA_SPACE_PATTERN = Pattern.compile(", ");
+
+    /** The precompiled pattern for a Check. */
+    private static final Pattern CHECK_PATTERN = Pattern.compile("Check$");
+
+    /** The string '{}'. */
+    private static final String CURLY_BRACKET = "{}";
+
+    /** Represents the relative path to the property types XML. */
+    private static final String PROPERTY_TYPES_XML = "property_types.xml";
+
+    /** Represents the format string for constructing URLs with two placeholders. */
+    private static final String URL_F = "%s#%s";
+
+    /** Reflects start of a code segment. */
+    private static final String CODE_START = "<code>";
+
+    /** Reflects end of a code segment. */
+    private static final String CODE_END = "</code>";
+
+    /** A newline with 10 spaces of indentation. */
+    private static final String INDENT_LEVEL_10 = SiteUtil.getNewlineAndIndentSpaces(10);
+    /** A newline with 12 spaces of indentation. */
+    private static final String INDENT_LEVEL_12 = SiteUtil.getNewlineAndIndentSpaces(12);
+    /** A newline with 14 spaces of indentation. */
+    private static final String INDENT_LEVEL_14 = SiteUtil.getNewlineAndIndentSpaces(14);
+    /** A newline with 16 spaces of indentation. */
+    private static final String INDENT_LEVEL_16 = SiteUtil.getNewlineAndIndentSpaces(16);
+    /** A newline with 18 spaces of indentation. */
+    private static final String INDENT_LEVEL_18 = SiteUtil.getNewlineAndIndentSpaces(18);
+    /** A newline with 20 spaces of indentation. */
+    private static final String INDENT_LEVEL_20 = SiteUtil.getNewlineAndIndentSpaces(20);
+
+    /**
+     * This property is used to change the existing properties for javadoc.
+     * Tokens always present at the end of all properties.
+     */
+    private static final String TOKENS_PROPERTY = SiteUtil.TOKENS;
+
+    /** The name of the current module being processed. */
+    private static String currentModuleName = "";
+
+    /** The file of the current module being processed. */
+    private static File currentModuleFile = new File("");
+
+    @Override
+    public void execute(Sink sink, MacroRequest request) throws MacroExecutionException {
+        // until https://github.com/checkstyle/checkstyle/issues/13426
+        if (!(sink instanceof XdocSink)) {
+            throw new MacroExecutionException("Expected Sink to be an XdocSink.");
+        }
+
+        final String modulePath = (String) request.getParameter("modulePath");
+
+        configureGlobalProperties(modulePath);
+
+        writePropertiesTable((XdocSink) sink);
+    }
+
+    /**
+     * Configures the global properties for the current module.
+     *
+     * @param modulePath the path of the current module processed.
+     */
+    private static void configureGlobalProperties(String modulePath) {
+        final File moduleFile = new File(modulePath);
+        currentModuleFile = moduleFile;
+        currentModuleName = CommonUtil.getFileNameWithoutExtension(moduleFile.getName());
+    }
+
+    /**
+     * Writes the properties table for the given module. Expects that the module has been processed
+     * with the ClassAndPropertiesSettersJavadocScraper before calling this method.
+     *
+     * @param sink the sink to write to.
+     * @throws MacroExecutionException if an error occurs during writing.
+     */
+    private static void writePropertiesTable(XdocSink sink)
+            throws MacroExecutionException {
+        sink.table();
+        sink.setInsertNewline(false);
+        sink.tableRows(null, false);
+        sink.rawText(INDENT_LEVEL_12);
+        writeTableHeaderRow(sink);
+        writeTablePropertiesRows(sink);
+        sink.rawText(INDENT_LEVEL_10);
+        sink.tableRows_();
+        sink.table_();
+        sink.setInsertNewline(true);
+    }
+
+    /**
+     * Writes the table header row with 5 columns - name, description, type, default value, since.
+     *
+     * @param sink sink to write to.
+     */
+    private static void writeTableHeaderRow(Sink sink) {
+        sink.tableRow();
+        writeTableHeaderCell(sink, "name");
+        writeTableHeaderCell(sink, "description");
+        writeTableHeaderCell(sink, "type");
+        writeTableHeaderCell(sink, "default value");
+        writeTableHeaderCell(sink, "since");
+        sink.rawText(INDENT_LEVEL_12);
+        sink.tableRow_();
+    }
+
+    /**
+     * Writes a table header cell with the given text.
+     *
+     * @param sink sink to write to.
+     * @param text the text to write.
+     */
+    private static void writeTableHeaderCell(Sink sink, String text) {
+        sink.rawText(INDENT_LEVEL_14);
+        sink.tableHeaderCell();
+        sink.text(text);
+        sink.tableHeaderCell_();
+    }
+
+    /**
+     * Writes the rows of the table with the 5 columns - name, description, type, default value,
+     * since. Each row corresponds to a property of the module.
+     *
+     * @param sink sink to write to.
+     * @throws MacroExecutionException if an error occurs during writing.
+     */
+    private static void writeTablePropertiesRows(Sink sink)
+            throws MacroExecutionException {
+        final Object instance = SiteUtil.getModuleInstance(currentModuleName);
+        final Class<?> clss = instance.getClass();
+
+        final Set<String> properties = SiteUtil.getPropertiesForDocumentation(clss, instance);
+        final Map<String, DetailNode> propertiesJavadocs = SiteUtil
+                .getPropertiesJavadocs(properties, currentModuleName, currentModuleFile);
+
+        final List<String> orderedProperties = orderProperties(properties);
+
+        for (String property : orderedProperties) {
+            try {
+                final DetailNode propertyJavadoc = propertiesJavadocs.get(property);
+                final DetailNode currentModuleJavadoc = propertiesJavadocs.get(currentModuleName);
+                writePropertyRow(sink, property, propertyJavadoc, instance, currentModuleJavadoc);
+            }
+            // -@cs[IllegalCatch] we need to get details in wrapping exception
+            catch (Exception exc) {
+                final String message = String.format(Locale.ROOT,
+                        "Exception while handling moduleName: %s propertyName: %s",
+                        currentModuleName, property);
+                throw new MacroExecutionException(message, exc);
+            }
+        }
+    }
+
+    /**
+     * Reorder properties to always have the 'tokens' property last (if present).
+     *
+     * @param properties module properties.
+     * @return Collection of ordered properties.
+     *
+     */
+    private static List<String> orderProperties(Set<String> properties) {
+
+        final List<String> orderProperties = new LinkedList<>(properties);
+
+        if (orderProperties.remove(TOKENS_PROPERTY)) {
+            orderProperties.add(TOKENS_PROPERTY);
+        }
+        if (orderProperties.remove(SiteUtil.JAVADOC_TOKENS)) {
+            orderProperties.add(SiteUtil.JAVADOC_TOKENS);
+        }
+        return List.copyOf(orderProperties);
+
+    }
+
+    /**
+     * Writes a table row with 5 columns for the given property - name, description, type,
+     * default value, since.
+     *
+     * @param sink sink to write to.
+     * @param propertyName the name of the property.
+     * @param propertyJavadoc the Javadoc of the property.
+     * @param instance the instance of the module.
+     * @param moduleJavadoc the Javadoc of the module.
+     * @throws MacroExecutionException if an error occurs during writing.
+     */
+    private static void writePropertyRow(Sink sink, String propertyName,
+                                         DetailNode propertyJavadoc, Object instance,
+                                            DetailNode moduleJavadoc)
+            throws MacroExecutionException {
+        final Field field = SiteUtil.getField(instance.getClass(), propertyName);
+
+        sink.rawText(INDENT_LEVEL_12);
+        sink.tableRow();
+
+        writePropertyNameCell(sink, propertyName);
+        writePropertyDescriptionCell(sink, propertyName, propertyJavadoc);
+        writePropertyTypeCell(sink, propertyName, field, instance);
+        writePropertyDefaultValueCell(sink, propertyName, field, instance);
+        writePropertySinceVersionCell(
+                sink, propertyName, moduleJavadoc, propertyJavadoc);
+
+        sink.rawText(INDENT_LEVEL_12);
+        sink.tableRow_();
+    }
+
+    /**
+     * Writes a table cell with the given property name.
+     *
+     * @param sink sink to write to.
+     * @param propertyName the name of the property.
+     */
+    private static void writePropertyNameCell(Sink sink, String propertyName) {
+        sink.rawText(INDENT_LEVEL_14);
+        sink.tableCell();
+        sink.text(propertyName);
+        sink.tableCell_();
+    }
+
+    /**
+     * Writes a table cell with the property description.
+     *
+     * @param sink sink to write to.
+     * @param propertyName the name of the property.
+     * @param propertyJavadoc the Javadoc of the property containing the description.
+     * @throws MacroExecutionException if an error occurs during retrieval of the description.
+     */
+    private static void writePropertyDescriptionCell(Sink sink, String propertyName,
+                                                     DetailNode propertyJavadoc)
+            throws MacroExecutionException {
+        sink.rawText(INDENT_LEVEL_14);
+        sink.tableCell();
+        final String description = SiteUtil
+                .getPropertyDescription(propertyName, propertyJavadoc, currentModuleName);
+
+        sink.rawText(description);
+        sink.tableCell_();
+    }
+
+    /**
+     * Writes a table cell with the property type.
+     *
+     * @param sink sink to write to.
+     * @param propertyName the name of the property.
+     * @param field the field of the property.
+     * @param instance the instance of the module.
+     * @throws MacroExecutionException if link to the property_types.html file cannot be
+     *                                 constructed.
+     */
+    private static void writePropertyTypeCell(Sink sink, String propertyName,
+                                              Field field, Object instance)
+            throws MacroExecutionException {
+        sink.rawText(INDENT_LEVEL_14);
+        sink.tableCell();
+
+        if (SiteUtil.TOKENS.equals(propertyName)) {
+            final AbstractCheck check = (AbstractCheck) instance;
+            if (check.getRequiredTokens().length == 0
+                    && Arrays.equals(check.getAcceptableTokens(), TokenUtil.getAllTokenIds())) {
+                sink.text("set of any supported");
+                writeLink(sink);
+            }
+            else {
+                final List<String> configurableTokens = SiteUtil
+                        .getDifference(check.getAcceptableTokens(),
+                                check.getRequiredTokens())
+                        .stream()
+                        .map(TokenUtil::getTokenName)
+                        .collect(Collectors.toUnmodifiableList());
+                sink.text("subset of tokens");
+
+                writeTokensList(sink, configurableTokens, SiteUtil.PATH_TO_TOKEN_TYPES, true);
+            }
+        }
+        else if (SiteUtil.JAVADOC_TOKENS.equals(propertyName)) {
+            final AbstractJavadocCheck check = (AbstractJavadocCheck) instance;
+            final List<String> configurableTokens = SiteUtil
+                    .getDifference(check.getAcceptableJavadocTokens(),
+                            check.getRequiredJavadocTokens())
+                    .stream()
+                    .map(JavadocUtil::getTokenName)
+                    .collect(Collectors.toUnmodifiableList());
+            sink.text("subset of javadoc tokens");
+            writeTokensList(sink, configurableTokens, SiteUtil.PATH_TO_JAVADOC_TOKEN_TYPES, true);
+        }
+        else {
+            final String type = SiteUtil.getType(field, propertyName, currentModuleName, instance);
+            if (PropertyType.TOKEN_ARRAY.getDescription().equals(type)) {
+                processLinkForTokenTypes(sink);
+            }
+            else {
+                final String relativePathToPropertyTypes =
+                        SiteUtil.getLinkToDocument(currentModuleName, PROPERTY_TYPES_XML);
+                final String escapedType = type
+                        .replace("[", ".5B")
+                        .replace("]", ".5D");
+
+                final String url =
+                        String.format(Locale.ROOT, URL_F, relativePathToPropertyTypes, escapedType);
+
+                sink.link(url);
+                sink.text(type);
+                sink.link_();
+            }
+        }
+        sink.tableCell_();
+    }
+
+    /**
+     * Writes a formatted link for "TokenTypes" to the given sink.
+     *
+     * @param sink The output target where the link is written.
+     * @throws MacroExecutionException If an error occurs during the link processing.
+     */
+    private static void processLinkForTokenTypes(Sink sink)
+            throws MacroExecutionException {
+        final String link =
+                SiteUtil.getLinkToDocument(currentModuleName, SiteUtil.PATH_TO_TOKEN_TYPES);
+
+        sink.text("subset of tokens ");
+        sink.link(link);
+        sink.text("TokenTypes");
+        sink.link_();
+    }
+
+    /**
+     * Write a link when all types of token supported.
+     *
+     * @param sink sink to write to.
+     * @throws MacroExecutionException if link cannot be constructed.
+     */
+    private static void writeLink(Sink sink)
+            throws MacroExecutionException {
+        sink.rawText(INDENT_LEVEL_16);
+        final String link =
+                SiteUtil.getLinkToDocument(currentModuleName, SiteUtil.PATH_TO_TOKEN_TYPES);
+        sink.link(link);
+        sink.rawText(INDENT_LEVEL_20);
+        sink.text(SiteUtil.TOKENS);
+        sink.link_();
+        sink.rawText(INDENT_LEVEL_14);
+    }
+
+    /**
+     * Write a list of tokens with links to the tokenTypesLink file.
+     *
+     * @param sink sink to write to.
+     * @param tokens the list of tokens to write.
+     * @param tokenTypesLink the link to the token types file.
+     * @param printDotAtTheEnd defines if printing period symbols is required.
+     * @throws MacroExecutionException if link to the tokenTypesLink file cannot be constructed.
+     */
+    private static void writeTokensList(Sink sink, List<String> tokens, String tokenTypesLink,
+                                        boolean printDotAtTheEnd)
+            throws MacroExecutionException {
+        for (int index = 0; index < tokens.size(); index++) {
+            final String token = tokens.get(index);
+            sink.rawText(INDENT_LEVEL_16);
+            if (index != 0) {
+                sink.text(SiteUtil.COMMA_SPACE);
+            }
+            writeLinkToToken(sink, tokenTypesLink, token);
+        }
+        if (tokens.isEmpty()) {
+            sink.rawText(CODE_START);
+            sink.text(EMPTY);
+            sink.rawText(CODE_END);
+        }
+        else if (printDotAtTheEnd) {
+            sink.rawText(INDENT_LEVEL_18);
+            sink.text(SiteUtil.DOT);
+            sink.rawText(INDENT_LEVEL_14);
+        }
+        else {
+            sink.rawText(INDENT_LEVEL_14);
+        }
+    }
+
+    /**
+     * Writes a link to the given token.
+     *
+     * @param sink sink to write to.
+     * @param document the document to link to.
+     * @param tokenName the name of the token.
+     * @throws MacroExecutionException if link to the document file cannot be constructed.
+     */
+    private static void writeLinkToToken(Sink sink, String document, String tokenName)
+            throws MacroExecutionException {
+        final String link = SiteUtil.getLinkToDocument(currentModuleName, document)
+                        + "#" + tokenName;
+        sink.link(link);
+        sink.rawText(INDENT_LEVEL_20);
+        sink.text(tokenName);
+        sink.link_();
+    }
+
+    /**
+     * Writes a table cell with the property default value.
+     *
+     * @param sink sink to write to.
+     * @param propertyName the name of the property.
+     * @param field the field of the property.
+     * @param instance the instance of the module.
+     * @throws MacroExecutionException if an error occurs during retrieval of the default value.
+     */
+    private static void writePropertyDefaultValueCell(Sink sink, String propertyName,
+                                                      Field field, Object instance)
+            throws MacroExecutionException {
+        sink.rawText(INDENT_LEVEL_14);
+        sink.tableCell();
+
+        if (SiteUtil.TOKENS.equals(propertyName)) {
+            final AbstractCheck check = (AbstractCheck) instance;
+            if (check.getRequiredTokens().length == 0
+                    && Arrays.equals(check.getDefaultTokens(), TokenUtil.getAllTokenIds())) {
+                sink.text(SiteUtil.TOKEN_TYPES);
+            }
+            else {
+                final List<String> configurableTokens = SiteUtil
+                        .getDifference(check.getDefaultTokens(),
+                                check.getRequiredTokens())
+                        .stream()
+                        .map(TokenUtil::getTokenName)
+                        .collect(Collectors.toUnmodifiableList());
+                writeTokensList(sink, configurableTokens, SiteUtil.PATH_TO_TOKEN_TYPES, true);
+            }
+        }
+        else if (SiteUtil.JAVADOC_TOKENS.equals(propertyName)) {
+            final AbstractJavadocCheck check = (AbstractJavadocCheck) instance;
+            final List<String> configurableTokens = SiteUtil
+                    .getDifference(check.getDefaultJavadocTokens(),
+                            check.getRequiredJavadocTokens())
+                    .stream()
+                    .map(JavadocUtil::getTokenName)
+                    .collect(Collectors.toUnmodifiableList());
+            writeTokensList(sink, configurableTokens, SiteUtil.PATH_TO_JAVADOC_TOKEN_TYPES, true);
+        }
+        else {
+            final String defaultValue = getDefaultValue(propertyName, field, instance);
+            final String checkName = CHECK_PATTERN
+                    .matcher(instance.getClass().getSimpleName()).replaceAll("");
+
+            final boolean isSpecialTokenProp = NON_BASE_TOKEN_PROPERTIES.stream()
+                    .anyMatch(tokenProp -> tokenProp.equals(checkName + " - " + propertyName));
+
+            if (isSpecialTokenProp && !CURLY_BRACKET.equals(defaultValue)) {
+                final List<String> defaultValuesList =
+                        Arrays.asList(COMMA_SPACE_PATTERN.split(defaultValue));
+                writeTokensList(sink, defaultValuesList, SiteUtil.PATH_TO_TOKEN_TYPES, false);
+            }
+            else {
+                sink.rawText(CODE_START);
+                sink.text(defaultValue);
+                sink.rawText(CODE_END);
+            }
+        }
+
+        sink.tableCell_();
+    }
+
+    /**
+     * Get the default value of the property.
+     *
+     * @param propertyName the name of the property.
+     * @param field the field of the property.
+     * @param instance the instance of the module.
+     * @return the default value of the property.
+     * @throws MacroExecutionException if an error occurs during retrieval of the default value.
+     */
+    private static String getDefaultValue(String propertyName, Field field, Object instance)
+            throws MacroExecutionException {
+        final String result;
+
+        if (field != null) {
+            result = SiteUtil.getDefaultValue(
+                    propertyName, field, instance, currentModuleName);
+        }
+        else {
+            final Class<?> fieldClass = SiteUtil.getPropertyClass(propertyName, instance);
+
+            if (fieldClass.isArray()) {
+                result = CURLY_BRACKET;
+            }
+            else {
+                result = "null";
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Writes a table cell with the property since version.
+     *
+     * @param sink sink to write to.
+     * @param propertyName the name of the property.
+     * @param moduleJavadoc the Javadoc of the module.
+     * @param propertyJavadoc the Javadoc of the property containing the since version.
+     * @throws MacroExecutionException if an error occurs during retrieval of the since version.
+     */
+    private static void writePropertySinceVersionCell(Sink sink, String propertyName,
+                                                      DetailNode moduleJavadoc,
+                                                      DetailNode propertyJavadoc)
+            throws MacroExecutionException {
+        sink.rawText(INDENT_LEVEL_14);
+        sink.tableCell();
+        final String sinceVersion = SiteUtil.getSinceVersion(
+                currentModuleName, moduleJavadoc, propertyName, propertyJavadoc);
+        sink.text(sinceVersion);
+        sink.tableCell_();
+    }
+}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java
index e63ed6b6e6c..4232b45c88e 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,42 +19,109 @@
 
 package com.puppycrawl.tools.checkstyle.site;
 
+import java.beans.PropertyDescriptor;
+import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import javax.annotation.Nullable;
+
+import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.maven.doxia.macro.MacroExecutionException;
 
+import com.google.common.collect.Lists;
 import com.puppycrawl.tools.checkstyle.Checker;
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.ModuleFactory;
 import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
 import com.puppycrawl.tools.checkstyle.PackageObjectFactory;
+import com.puppycrawl.tools.checkstyle.PropertyCacheFile;
 import com.puppycrawl.tools.checkstyle.TreeWalker;
 import com.puppycrawl.tools.checkstyle.TreeWalkerFilter;
+import com.puppycrawl.tools.checkstyle.XdocsPropertyType;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck;
 import com.puppycrawl.tools.checkstyle.api.BeforeExecutionFileFilter;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import com.puppycrawl.tools.checkstyle.api.DetailNode;
 import com.puppycrawl.tools.checkstyle.api.Filter;
+import com.puppycrawl.tools.checkstyle.api.JavadocTokenTypes;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck;
+import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;
 import com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck;
 import com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineCheck;
 import com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+import com.puppycrawl.tools.checkstyle.utils.JavadocUtil;
+import com.puppycrawl.tools.checkstyle.utils.TokenUtil;
 
 /**
  * Utility class for site generation.
  */
 public final class SiteUtil {
 
-    /** Class name and their corresponding parent module name.. */
+    /** The string 'tokens'. */
+    public static final String TOKENS = "tokens";
+    /** The string 'javadocTokens'. */
+    public static final String JAVADOC_TOKENS = "javadocTokens";
+    /** The string '.'. */
+    public static final String DOT = ".";
+    /** The string ', '. */
+    public static final String COMMA_SPACE = ", ";
+    /** The string 'TokenTypes'. */
+    public static final String TOKEN_TYPES = "TokenTypes";
+    /** The path to the TokenTypes.html file. */
+    public static final String PATH_TO_TOKEN_TYPES =
+            "apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html";
+    /** The path to the JavadocTokenTypes.html file. */
+    public static final String PATH_TO_JAVADOC_TOKEN_TYPES =
+            "apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html";
+    /** The url of the checkstyle website. */
+    private static final String CHECKSTYLE_ORG_URL = "https://checkstyle.org/";
+    /** The string 'charset'. */
+    private static final String CHARSET = "charset";
+    /** The string '{}'. */
+    private static final String CURLY_BRACKETS = "{}";
+    /** The string 'fileExtensions'. */
+    private static final String FILE_EXTENSIONS = "fileExtensions";
+    /** The string 'checks'. */
+    private static final String CHECKS = "checks";
+    /** The string 'naming'. */
+    private static final String NAMING = "naming";
+    /** The string 'src'. */
+    private static final String SRC = "src";
+
+    /** Precompiled regex pattern to remove the "Setter to " prefix from strings. */
+    private static final Pattern SETTER_PATTERN = Pattern.compile("^Setter to ");
+
+    /** Class name and their corresponding parent module name. */
     private static final Map<Class<?>, String> CLASS_TO_PARENT_MODULE = Map.ofEntries(
         Map.entry(AbstractCheck.class, TreeWalker.class.getSimpleName()),
         Map.entry(TreeWalkerFilter.class, TreeWalker.class.getSimpleName()),
@@ -63,6 +130,207 @@ public final class SiteUtil {
         Map.entry(BeforeExecutionFileFilter.class, Checker.class.getSimpleName())
     );
 
+    /** Set of properties that every check has. */
+    private static final Set<String> CHECK_PROPERTIES =
+            getProperties(AbstractCheck.class);
+
+    /** Set of properties that every Javadoc check has. */
+    private static final Set<String> JAVADOC_CHECK_PROPERTIES =
+            getProperties(AbstractJavadocCheck.class);
+
+    /** Set of properties that every FileSet check has. */
+    private static final Set<String> FILESET_PROPERTIES =
+            getProperties(AbstractFileSetCheck.class);
+
+    /**
+     * Check and property name.
+     */
+    private static final String HEADER_CHECK_HEADER = "HeaderCheck.header";
+
+    /**
+     * Check and property name.
+     */
+    private static final String REGEXP_HEADER_CHECK_HEADER = "RegexpHeaderCheck.header";
+
+    /** Set of properties that are undocumented. Those are internal properties. */
+    private static final Set<String> UNDOCUMENTED_PROPERTIES = Set.of(
+        "SuppressWithNearbyCommentFilter.fileContents",
+        "SuppressionCommentFilter.fileContents"
+    );
+
+    /** Properties that can not be gathered from class instance. */
+    private static final Set<String> PROPERTIES_ALLOWED_GET_TYPES_FROM_METHOD = Set.of(
+        // static field (all upper case)
+        "SuppressWarningsHolder.aliasList",
+        // loads string into memory similar to file
+        HEADER_CHECK_HEADER,
+        REGEXP_HEADER_CHECK_HEADER,
+        // until https://github.com/checkstyle/checkstyle/issues/13376
+        "CustomImportOrderCheck.customImportOrderRules"
+    );
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_6_9 = "6.9";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_5_0 = "5.0";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_3_2 = "3.2";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_8_24 = "8.24";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_8_36 = "8.36";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_3_0 = "3.0";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_7_7 = "7.7";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_5_7 = "5.7";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_5_1 = "5.1";
+
+    /**
+     * Frequent version.
+     */
+    private static final String VERSION_3_4 = "3.4";
+
+    /**
+     * Map of properties whose since version is different from module version but
+     * are not specified in code because they are inherited from their super class(es).
+     * Until <a href="https://github.com/checkstyle/checkstyle/issues/14052">#14052</a>.
+     *
+     * @noinspection JavacQuirks
+     * @noinspectionreason JavacQuirks until #14052
+     */
+    private static final Map<String, String> SINCE_VERSION_FOR_INHERITED_PROPERTY = Map.ofEntries(
+        Map.entry("MissingDeprecatedCheck.violateExecutionOnNonTightHtml", VERSION_8_24),
+        Map.entry("NonEmptyAtclauseDescriptionCheck.violateExecutionOnNonTightHtml", "8.3"),
+        Map.entry("HeaderCheck.charset", VERSION_5_0),
+        Map.entry("HeaderCheck.fileExtensions", VERSION_6_9),
+        Map.entry("HeaderCheck.headerFile", VERSION_3_2),
+        Map.entry(HEADER_CHECK_HEADER, VERSION_5_0),
+        Map.entry("RegexpHeaderCheck.charset", VERSION_5_0),
+        Map.entry("RegexpHeaderCheck.fileExtensions", VERSION_6_9),
+        Map.entry("RegexpHeaderCheck.headerFile", VERSION_3_2),
+        Map.entry(REGEXP_HEADER_CHECK_HEADER, VERSION_5_0),
+        Map.entry("ClassDataAbstractionCouplingCheck.excludeClassesRegexps", VERSION_7_7),
+        Map.entry("ClassDataAbstractionCouplingCheck.excludedClasses", VERSION_5_7),
+        Map.entry("ClassDataAbstractionCouplingCheck.excludedPackages", VERSION_7_7),
+        Map.entry("ClassDataAbstractionCouplingCheck.max", VERSION_3_4),
+        Map.entry("ClassFanOutComplexityCheck.excludeClassesRegexps", VERSION_7_7),
+        Map.entry("ClassFanOutComplexityCheck.excludedClasses", VERSION_5_7),
+        Map.entry("ClassFanOutComplexityCheck.excludedPackages", VERSION_7_7),
+        Map.entry("ClassFanOutComplexityCheck.max", VERSION_3_4),
+        Map.entry("NonEmptyAtclauseDescriptionCheck.javadocTokens", "7.3"),
+        Map.entry("FileTabCharacterCheck.fileExtensions", VERSION_5_0),
+        Map.entry("NewlineAtEndOfFileCheck.fileExtensions", "3.1"),
+        Map.entry("JavadocPackageCheck.fileExtensions", VERSION_5_0),
+        Map.entry("OrderedPropertiesCheck.fileExtensions", "8.22"),
+        Map.entry("UniquePropertiesCheck.fileExtensions", VERSION_5_7),
+        Map.entry("TranslationCheck.fileExtensions", VERSION_3_0),
+        Map.entry("LineLengthCheck.fileExtensions", VERSION_8_24),
+        // until https://github.com/checkstyle/checkstyle/issues/14052
+        Map.entry("JavadocBlockTagLocationCheck.violateExecutionOnNonTightHtml", VERSION_8_24),
+        Map.entry("JavadocMissingLeadingAsteriskCheck.violateExecutionOnNonTightHtml", "8.38"),
+        Map.entry(
+            "RequireEmptyLineBeforeBlockTagGroupCheck.violateExecutionOnNonTightHtml",
+            VERSION_8_36),
+        Map.entry("ParenPadCheck.option", VERSION_3_0),
+        Map.entry("TypecastParenPadCheck.option", VERSION_3_2),
+        Map.entry("FileLengthCheck.fileExtensions", VERSION_5_0),
+        Map.entry("StaticVariableNameCheck.applyToPackage", VERSION_5_0),
+        Map.entry("StaticVariableNameCheck.applyToPrivate", VERSION_5_0),
+        Map.entry("StaticVariableNameCheck.applyToProtected", VERSION_5_0),
+        Map.entry("StaticVariableNameCheck.applyToPublic", VERSION_5_0),
+        Map.entry("StaticVariableNameCheck.format", VERSION_3_0),
+        Map.entry("TypeNameCheck.applyToPackage", VERSION_5_0),
+        Map.entry("TypeNameCheck.applyToPrivate", VERSION_5_0),
+        Map.entry("TypeNameCheck.applyToProtected", VERSION_5_0),
+        Map.entry("TypeNameCheck.applyToPublic", VERSION_5_0),
+        Map.entry("RegexpMultilineCheck.fileExtensions", VERSION_5_0),
+        Map.entry("RegexpOnFilenameCheck.fileExtensions", "6.15"),
+        Map.entry("RegexpSinglelineCheck.fileExtensions", VERSION_5_0),
+        Map.entry("ClassTypeParameterNameCheck.format", VERSION_5_0),
+        Map.entry("CatchParameterNameCheck.format", "6.14"),
+        Map.entry("LambdaParameterNameCheck.format", "8.11"),
+        Map.entry("IllegalIdentifierNameCheck.format", VERSION_8_36),
+        Map.entry("ConstantNameCheck.format", VERSION_3_0),
+        Map.entry("ConstantNameCheck.applyToPackage", VERSION_5_0),
+        Map.entry("ConstantNameCheck.applyToPrivate", VERSION_5_0),
+        Map.entry("ConstantNameCheck.applyToProtected", VERSION_5_0),
+        Map.entry("ConstantNameCheck.applyToPublic", VERSION_5_0),
+        Map.entry("InterfaceTypeParameterNameCheck.format", "5.8"),
+        Map.entry("LocalFinalVariableNameCheck.format", VERSION_3_0),
+        Map.entry("LocalVariableNameCheck.format", VERSION_3_0),
+        Map.entry("MemberNameCheck.format", VERSION_3_0),
+        Map.entry("MemberNameCheck.applyToPackage", VERSION_3_4),
+        Map.entry("MemberNameCheck.applyToPrivate", VERSION_3_4),
+        Map.entry("MemberNameCheck.applyToProtected", VERSION_3_4),
+        Map.entry("MemberNameCheck.applyToPublic", VERSION_3_4),
+        Map.entry("MethodNameCheck.format", VERSION_3_0),
+        Map.entry("MethodNameCheck.applyToPackage", VERSION_5_1),
+        Map.entry("MethodNameCheck.applyToPrivate", VERSION_5_1),
+        Map.entry("MethodNameCheck.applyToProtected", VERSION_5_1),
+        Map.entry("MethodNameCheck.applyToPublic", VERSION_5_1),
+        Map.entry("MethodTypeParameterNameCheck.format", VERSION_5_0),
+        Map.entry("ParameterNameCheck.format", VERSION_3_0),
+        Map.entry("PatternVariableNameCheck.format", VERSION_8_36),
+        Map.entry("RecordTypeParameterNameCheck.format", VERSION_8_36),
+        Map.entry("RecordComponentNameCheck.format", "8.40"),
+        Map.entry("TypeNameCheck.format", VERSION_3_0)
+    );
+
+    /** Map of all superclasses properties and their javadocs. */
+    private static final Map<String, DetailNode> SUPER_CLASS_PROPERTIES_JAVADOCS =
+            new HashMap<>();
+
+    /** Path to main source code folder. */
+    private static final String MAIN_FOLDER_PATH = Paths.get(
+            SRC, "main", "java", "com", "puppycrawl", "tools", "checkstyle").toString();
+
+    /** List of files who are superclasses and contain certain properties that checks inherit. */
+    private static final List<File> MODULE_SUPER_CLASS_FILES = List.of(
+        new File(Paths.get(MAIN_FOLDER_PATH,
+                CHECKS, NAMING, "AbstractAccessControlNameCheck.java").toString()),
+        new File(Paths.get(MAIN_FOLDER_PATH,
+                CHECKS, NAMING, "AbstractNameCheck.java").toString()),
+        new File(Paths.get(MAIN_FOLDER_PATH,
+                CHECKS, "javadoc", "AbstractJavadocCheck.java").toString()),
+        new File(Paths.get(MAIN_FOLDER_PATH,
+                "api", "AbstractFileSetCheck.java").toString()),
+        new File(Paths.get(MAIN_FOLDER_PATH,
+                CHECKS, "header", "AbstractHeaderCheck.java").toString()),
+        new File(Paths.get(MAIN_FOLDER_PATH,
+                CHECKS, "metrics", "AbstractClassCouplingCheck.java").toString()),
+        new File(Paths.get(MAIN_FOLDER_PATH,
+                CHECKS, "whitespace", "AbstractParenPadCheck.java").toString())
+    );
+
     /**
      * Private utility constructor.
      */
@@ -82,7 +350,7 @@ public static Set<String> getMessageKeys(Class<?> module)
         // We use a TreeSet to sort the message keys alphabetically
         final Set<String> messageKeys = new TreeSet<>();
         for (Field field : messageKeyFields) {
-            messageKeys.add(getFieldValue(field, module));
+            messageKeys.add(getFieldValue(field, module).toString());
         }
         return messageKeys;
     }
@@ -147,12 +415,12 @@ else if (module == RegexpSinglelineCheck.class
      * @return the value of the field.
      * @throws MacroExecutionException if the value could not be retrieved.
      */
-    private static String getFieldValue(Field field, Object instance)
+    public static Object getFieldValue(Field field, Object instance)
             throws MacroExecutionException {
         try {
             // required for package/private classes
             field.trySetAccessible();
-            return field.get(instance).toString();
+            return field.get(instance);
         }
         catch (IllegalAccessException ex) {
             throw new MacroExecutionException("Couldn't get field value", ex);
@@ -207,6 +475,24 @@ public static String getNewlineAndIndentSpaces(int amountOfSpaces) {
         return System.lineSeparator() + " ".repeat(amountOfSpaces);
     }
 
+    /**
+     * Returns path to the template for the given module name or throws an exception if the
+     * template cannot be found.
+     *
+     * @param moduleName the module whose template we are looking for.
+     * @return path to the template.
+     * @throws MacroExecutionException if the template cannot be found.
+     */
+    public static Path getTemplatePath(String moduleName) throws MacroExecutionException {
+        final String fileNamePattern = ".*[\\\\/]"
+                + moduleName.toLowerCase(Locale.ROOT) + "\\..*";
+        return getXdocsTemplatesFilePaths()
+            .stream()
+            .filter(path -> path.toString().matches(fileNamePattern))
+            .findFirst()
+            .orElse(null);
+    }
+
     /**
      * Gets xdocs template file paths. These are files ending with .xml.template.
      * This method will be changed to gather .xml once
@@ -222,7 +508,7 @@ public static Set<Path> getXdocsTemplatesFilePaths() throws MacroExecutionExcept
                     return attr.isRegularFile()
                             && path.toString().endsWith(".xml.template");
                 })) {
-            return stream.collect(Collectors.toSet());
+            return stream.collect(Collectors.toUnmodifiableSet());
         }
         catch (IOException ioException) {
             throw new MacroExecutionException("Failed to find xdocs templates", ioException);
@@ -269,4 +555,860 @@ public static String getParentModule(Class<?> moduleClass)
 
         return parentModuleName;
     }
+
+    /**
+     * Get a set of properties for the given class that should be documented.
+     *
+     * @param clss the class to get the properties for.
+     * @param instance the instance of the module.
+     * @return a set of properties for the given class.
+     */
+    public static Set<String> getPropertiesForDocumentation(Class<?> clss, Object instance) {
+        final Set<String> properties =
+                getProperties(clss).stream()
+                    .filter(prop -> {
+                        return !isGlobalProperty(clss, prop) && !isUndocumentedProperty(clss, prop);
+                    })
+                    .collect(Collectors.toCollection(HashSet::new));
+        properties.addAll(getNonExplicitProperties(instance, clss));
+        return new TreeSet<>(properties);
+    }
+
+    /**
+     * Get the javadocs of the properties of the module. If the property is not present in the
+     * module, then the javadoc of the property from the superclass(es) is used.
+     *
+     * @param properties the properties of the module.
+     * @param moduleName the name of the module.
+     * @param moduleFile the module file.
+     * @return the javadocs of the properties of the module.
+     * @throws MacroExecutionException if an error occurs during processing.
+     */
+    public static Map<String, DetailNode> getPropertiesJavadocs(Set<String> properties,
+                                                                String moduleName, File moduleFile)
+            throws MacroExecutionException {
+        // lazy initialization
+        if (SUPER_CLASS_PROPERTIES_JAVADOCS.isEmpty()) {
+            processSuperclasses();
+        }
+
+        processModule(moduleName, moduleFile);
+
+        final Map<String, DetailNode> unmodifiableJavadocs =
+                ClassAndPropertiesSettersJavadocScraper.getJavadocsForModuleOrProperty();
+        final Map<String, DetailNode> javadocs = new LinkedHashMap<>(unmodifiableJavadocs);
+
+        properties.forEach(property -> {
+            final DetailNode superClassPropertyJavadoc =
+                    SUPER_CLASS_PROPERTIES_JAVADOCS.get(property);
+            if (superClassPropertyJavadoc != null) {
+                javadocs.putIfAbsent(property, superClassPropertyJavadoc);
+            }
+        });
+
+        assertAllPropertySetterJavadocsAreFound(properties, moduleName, javadocs);
+
+        return javadocs;
+    }
+
+    /**
+     * Assert that each property has a corresponding setter javadoc that is not null.
+     * 'tokens' and 'javadocTokens' are excluded from this check, because their
+     * description is different from the description of the setter.
+     *
+     * @param properties the properties of the module.
+     * @param moduleName the name of the module.
+     * @param javadocs the javadocs of the properties of the module.
+     * @throws MacroExecutionException if an error occurs during processing.
+     */
+    private static void assertAllPropertySetterJavadocsAreFound(
+            Set<String> properties, String moduleName, Map<String, DetailNode> javadocs)
+            throws MacroExecutionException {
+        for (String property : properties) {
+            final boolean isPropertySetterJavadocFound = javadocs.containsKey(property)
+                       || TOKENS.equals(property) || JAVADOC_TOKENS.equals(property);
+            if (!isPropertySetterJavadocFound) {
+                final String message = String.format(Locale.ROOT,
+                        "%s: Failed to find setter javadoc for property '%s'",
+                        moduleName, property);
+                throw new MacroExecutionException(message);
+            }
+        }
+    }
+
+    /**
+     * Collect the properties setters javadocs of the superclasses.
+     *
+     * @throws MacroExecutionException if an error occurs during processing.
+     */
+    private static void processSuperclasses() throws MacroExecutionException {
+        for (File superclassFile : MODULE_SUPER_CLASS_FILES) {
+            final String superclassName = CommonUtil
+                    .getFileNameWithoutExtension(superclassFile.getName());
+            processModule(superclassName, superclassFile);
+            final Map<String, DetailNode> superclassJavadocs =
+                    ClassAndPropertiesSettersJavadocScraper.getJavadocsForModuleOrProperty();
+            SUPER_CLASS_PROPERTIES_JAVADOCS.putAll(superclassJavadocs);
+        }
+    }
+
+    /**
+     * Scrape the Javadocs of the class and its properties setters with
+     * ClassAndPropertiesSettersJavadocScraper.
+     *
+     * @param moduleName the name of the module.
+     * @param moduleFile the module file.
+     * @throws MacroExecutionException if an error occurs during processing.
+     */
+    private static void processModule(String moduleName, File moduleFile)
+            throws MacroExecutionException {
+        if (!moduleFile.isFile()) {
+            final String message = String.format(Locale.ROOT,
+                    "File %s is not a file. Please check the 'modulePath' property.", moduleFile);
+            throw new MacroExecutionException(message);
+        }
+        ClassAndPropertiesSettersJavadocScraper.initialize(moduleName);
+        final Checker checker = new Checker();
+        checker.setModuleClassLoader(Checker.class.getClassLoader());
+        final DefaultConfiguration scraperCheckConfig =
+                        new DefaultConfiguration(
+                                ClassAndPropertiesSettersJavadocScraper.class.getName());
+        final DefaultConfiguration defaultConfiguration =
+                new DefaultConfiguration("configuration");
+        final DefaultConfiguration treeWalkerConfig =
+                new DefaultConfiguration(TreeWalker.class.getName());
+        defaultConfiguration.addProperty(CHARSET, StandardCharsets.UTF_8.name());
+        defaultConfiguration.addChild(treeWalkerConfig);
+        treeWalkerConfig.addChild(scraperCheckConfig);
+        try {
+            checker.configure(defaultConfiguration);
+            final List<File> filesToProcess = List.of(moduleFile);
+            checker.process(filesToProcess);
+            checker.destroy();
+        }
+        catch (CheckstyleException checkstyleException) {
+            final String message = String.format(Locale.ROOT, "Failed processing %s", moduleName);
+            throw new MacroExecutionException(message, checkstyleException);
+        }
+    }
+
+    /**
+     * Get a set of properties for the given class.
+     *
+     * @param clss the class to get the properties for.
+     * @return a set of properties for the given class.
+     */
+    public static Set<String> getProperties(Class<?> clss) {
+        final Set<String> result = new TreeSet<>();
+        final PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(clss);
+
+        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (propertyDescriptor.getWriteMethod() != null) {
+                result.add(propertyDescriptor.getName());
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Checks if the property is a global property. Global properties come from the base classes
+     * and are common to all checks. For example id, severity, tabWidth, etc.
+     *
+     * @param clss the class of the module.
+     * @param propertyName the name of the property.
+     * @return true if the property is a global property.
+     */
+    private static boolean isGlobalProperty(Class<?> clss, String propertyName) {
+        return AbstractCheck.class.isAssignableFrom(clss)
+                    && CHECK_PROPERTIES.contains(propertyName)
+                || AbstractJavadocCheck.class.isAssignableFrom(clss)
+                    && JAVADOC_CHECK_PROPERTIES.contains(propertyName)
+                || AbstractFileSetCheck.class.isAssignableFrom(clss)
+                    && FILESET_PROPERTIES.contains(propertyName);
+    }
+
+    /**
+     * Checks if the property is supposed to be documented.
+     *
+     * @param clss the class of the module.
+     * @param propertyName the name of the property.
+     * @return true if the property is supposed to be documented.
+     */
+    private static boolean isUndocumentedProperty(Class<?> clss, String propertyName) {
+        return UNDOCUMENTED_PROPERTIES.contains(clss.getSimpleName() + DOT + propertyName);
+    }
+
+    /**
+     * Gets properties that are not explicitly captured but should be documented if
+     * certain conditions are met.
+     *
+     * @param instance the instance of the module.
+     * @param clss the class of the module.
+     * @return the non explicit properties.
+     */
+    private static Set<String> getNonExplicitProperties(
+            Object instance, Class<?> clss) {
+        final Set<String> result = new TreeSet<>();
+        if (AbstractCheck.class.isAssignableFrom(clss)) {
+            final AbstractCheck check = (AbstractCheck) instance;
+
+            final int[] acceptableTokens = check.getAcceptableTokens();
+            Arrays.sort(acceptableTokens);
+            final int[] defaultTokens = check.getDefaultTokens();
+            Arrays.sort(defaultTokens);
+            final int[] requiredTokens = check.getRequiredTokens();
+            Arrays.sort(requiredTokens);
+
+            if (!Arrays.equals(acceptableTokens, defaultTokens)
+                    || !Arrays.equals(acceptableTokens, requiredTokens)) {
+                result.add(TOKENS);
+            }
+        }
+
+        if (AbstractJavadocCheck.class.isAssignableFrom(clss)) {
+            final AbstractJavadocCheck check = (AbstractJavadocCheck) instance;
+            result.add("violateExecutionOnNonTightHtml");
+
+            final int[] acceptableJavadocTokens = check.getAcceptableJavadocTokens();
+            Arrays.sort(acceptableJavadocTokens);
+            final int[] defaultJavadocTokens = check.getDefaultJavadocTokens();
+            Arrays.sort(defaultJavadocTokens);
+            final int[] requiredJavadocTokens = check.getRequiredJavadocTokens();
+            Arrays.sort(requiredJavadocTokens);
+
+            if (!Arrays.equals(acceptableJavadocTokens, defaultJavadocTokens)
+                    || !Arrays.equals(acceptableJavadocTokens, requiredJavadocTokens)) {
+                result.add(JAVADOC_TOKENS);
+            }
+        }
+
+        if (AbstractFileSetCheck.class.isAssignableFrom(clss)) {
+            result.add(FILE_EXTENSIONS);
+        }
+        return result;
+    }
+
+    /**
+     * Get the description of the property.
+     *
+     * @param propertyName the name of the property.
+     * @param javadoc the Javadoc of the property setter method.
+     * @param moduleName the name of the module.
+     * @return the description of the property.
+     * @throws MacroExecutionException if the description could not be extracted.
+     */
+    public static String getPropertyDescription(
+            String propertyName, DetailNode javadoc, String moduleName)
+            throws MacroExecutionException {
+        final String description;
+        if (TOKENS.equals(propertyName)) {
+            description = "tokens to check";
+        }
+        else if (JAVADOC_TOKENS.equals(propertyName)) {
+            description = "javadoc tokens to check";
+        }
+        else {
+            final String descriptionString = SETTER_PATTERN.matcher(
+                    DescriptionExtractor.getDescriptionFromJavadoc(javadoc, moduleName))
+                    .replaceFirst("");
+
+            final String firstLetterCapitalized = descriptionString.substring(0, 1)
+                    .toUpperCase(Locale.ROOT);
+            description = firstLetterCapitalized + descriptionString.substring(1);
+        }
+        return description;
+    }
+
+    /**
+     * Get the since version of the property.
+     *
+     * @param moduleName the name of the module.
+     * @param moduleJavadoc the Javadoc of the module.
+     * @param propertyName the name of the property.
+     * @param propertyJavadoc the Javadoc of the property setter method.
+     * @return the since version of the property.
+     * @throws MacroExecutionException if the since version could not be extracted.
+     */
+    public static String getSinceVersion(String moduleName, DetailNode moduleJavadoc,
+                                         String propertyName, DetailNode propertyJavadoc)
+            throws MacroExecutionException {
+        final String sinceVersion;
+        final String superClassSinceVersion = SINCE_VERSION_FOR_INHERITED_PROPERTY
+                   .get(moduleName + DOT + propertyName);
+        if (superClassSinceVersion != null) {
+            sinceVersion = superClassSinceVersion;
+        }
+        else if (TOKENS.equals(propertyName)
+                        || JAVADOC_TOKENS.equals(propertyName)) {
+            // Use module's since version for inherited properties
+            sinceVersion = getSinceVersionFromJavadoc(moduleJavadoc);
+        }
+        else {
+            sinceVersion = getSinceVersionFromJavadoc(propertyJavadoc);
+        }
+
+        if (sinceVersion == null) {
+            final String message = String.format(Locale.ROOT,
+                    "Failed to find '@since' version for '%s' property"
+                            + " in '%s' and all parent classes.", propertyName, moduleName);
+            throw new MacroExecutionException(message);
+        }
+
+        return sinceVersion;
+    }
+
+    /**
+     * Extract the since version from the Javadoc.
+     *
+     * @param javadoc the Javadoc to extract the since version from.
+     * @return the since version of the setter.
+     */
+    @Nullable
+    private static String getSinceVersionFromJavadoc(DetailNode javadoc) {
+        final DetailNode sinceJavadocTag = getSinceJavadocTag(javadoc);
+        return Optional.ofNullable(sinceJavadocTag)
+            .map(tag -> JavadocUtil.findFirstToken(tag, JavadocTokenTypes.DESCRIPTION))
+            .map(description -> JavadocUtil.findFirstToken(description, JavadocTokenTypes.TEXT))
+            .map(DetailNode::getText)
+            .orElse(null);
+    }
+
+    /**
+     * Find the since Javadoc tag node in the given Javadoc.
+     *
+     * @param javadoc the Javadoc to search.
+     * @return the since Javadoc tag node or null if not found.
+     */
+    private static DetailNode getSinceJavadocTag(DetailNode javadoc) {
+        final DetailNode[] children = javadoc.getChildren();
+        DetailNode javadocTagWithSince = null;
+        for (final DetailNode child : children) {
+            if (child.getType() == JavadocTokenTypes.JAVADOC_TAG) {
+                final DetailNode sinceNode = JavadocUtil.findFirstToken(
+                        child, JavadocTokenTypes.SINCE_LITERAL);
+                if (sinceNode != null) {
+                    javadocTagWithSince = child;
+                    break;
+                }
+            }
+        }
+        return javadocTagWithSince;
+    }
+
+    /**
+     * Get the type of the property.
+     *
+     * @param field the field to get the type of.
+     * @param propertyName the name of the property.
+     * @param moduleName the name of the module.
+     * @param instance the instance of the module.
+     * @return the type of the property.
+     * @throws MacroExecutionException if an error occurs during getting the type.
+     */
+    public static String getType(Field field, String propertyName,
+                                 String moduleName, Object instance)
+            throws MacroExecutionException {
+        final Class<?> fieldClass = getFieldClass(field, propertyName, moduleName, instance);
+        return Optional.ofNullable(field)
+                .map(nonNullField -> nonNullField.getAnnotation(XdocsPropertyType.class))
+                .map(propertyType -> propertyType.value().getDescription())
+                .orElseGet(fieldClass::getSimpleName);
+    }
+
+    /**
+     * Get the default value of the property.
+     *
+     * @param propertyName the name of the property.
+     * @param field the field to get the default value of.
+     * @param classInstance the instance of the class to get the default value of.
+     * @param moduleName the name of the module.
+     * @return the default value of the property.
+     * @throws MacroExecutionException if an error occurs during getting the default value.
+     * @noinspection IfStatementWithTooManyBranches
+     * @noinspectionreason IfStatementWithTooManyBranches - complex nature of getting properties
+     *      from XML files requires giant if/else statement
+     */
+    // -@cs[CyclomaticComplexity] Splitting would not make the code more readable
+    public static String getDefaultValue(String propertyName, Field field,
+                                         Object classInstance, String moduleName)
+            throws MacroExecutionException {
+        final Object value = getFieldValue(field, classInstance);
+        final Class<?> fieldClass = getFieldClass(field, propertyName, moduleName, classInstance);
+        String result = null;
+        if (CHARSET.equals(propertyName)) {
+            result = "the charset property of the parent"
+                    + " <a href=\"https://checkstyle.org/config.html#Checker\">Checker</a> module";
+        }
+        else if (classInstance instanceof PropertyCacheFile) {
+            result = "null (no cache file)";
+        }
+        else if (fieldClass == boolean.class) {
+            result = value.toString();
+        }
+        else if (fieldClass == int.class) {
+            result = value.toString();
+        }
+        else if (fieldClass == int[].class) {
+            result = getIntArrayPropertyValue(value);
+        }
+        else if (fieldClass == double[].class) {
+            result = removeSquareBrackets(Arrays.toString((double[]) value).replace(".0", ""));
+            if (result.isEmpty()) {
+                result = CURLY_BRACKETS;
+            }
+        }
+        else if (fieldClass == String[].class) {
+            result = getStringArrayPropertyValue(propertyName, value);
+        }
+        else if (fieldClass == URI.class || fieldClass == String.class) {
+            if (value != null) {
+                result = '"' + value.toString() + '"';
+            }
+        }
+        else if (fieldClass == Pattern.class) {
+            if (value != null) {
+                result = '"' + value.toString().replace("\n", "\\n").replace("\t", "\\t")
+                        .replace("\r", "\\r").replace("\f", "\\f") + '"';
+            }
+        }
+        else if (fieldClass == Pattern[].class) {
+            result = getPatternArrayPropertyValue(value);
+        }
+        else if (fieldClass.isEnum()) {
+            if (value != null) {
+                result = value.toString().toLowerCase(Locale.ENGLISH);
+            }
+        }
+        else if (fieldClass == AccessModifierOption[].class) {
+            result = removeSquareBrackets(Arrays.toString((Object[]) value));
+        }
+        else {
+            final String message = String.format(Locale.ROOT,
+                    "Unknown property type: %s", fieldClass.getSimpleName());
+            throw new MacroExecutionException(message);
+        }
+
+        if (result == null) {
+            result = "null";
+        }
+
+        return result;
+    }
+
+    /**
+     * Gets the name of the bean property's default value for the Pattern array class.
+     *
+     * @param fieldValue The bean property's value
+     * @return String form of property's default value
+     */
+    private static String getPatternArrayPropertyValue(Object fieldValue) {
+        Object value = fieldValue;
+        if (value instanceof Collection) {
+            final Collection<?> collection = (Collection<?>) value;
+
+            value = collection.stream()
+                    .map(Pattern.class::cast)
+                    .toArray(Pattern[]::new);
+        }
+
+        String result = "";
+        if (value != null && Array.getLength(value) > 0) {
+            result = removeSquareBrackets(
+                    Arrays.stream((Pattern[]) value)
+                    .map(Pattern::pattern)
+                    .collect(Collectors.joining(COMMA_SPACE)));
+        }
+
+        if (result.isEmpty()) {
+            result = CURLY_BRACKETS;
+        }
+        return result;
+    }
+
+    /**
+     * Removes square brackets [ and ] from the given string.
+     *
+     * @param value the string to remove square brackets from.
+     * @return the string without square brackets.
+     */
+    private static String removeSquareBrackets(String value) {
+        return value
+                .replace("[", "")
+                .replace("]", "");
+    }
+
+    /**
+     * Gets the name of the bean property's default value for the string array class.
+     *
+     * @param propertyName The bean property's name
+     * @param value The bean property's value
+     * @return String form of property's default value
+     */
+    private static String getStringArrayPropertyValue(String propertyName, Object value) {
+        String result;
+        if (value == null) {
+            result = "";
+        }
+        else {
+            try (Stream<?> valuesStream = getValuesStream(value)) {
+                result = valuesStream
+                    .map(String.class::cast)
+                    .sorted()
+                    .collect(Collectors.joining(COMMA_SPACE));
+            }
+        }
+
+        if (result.isEmpty()) {
+            if (FILE_EXTENSIONS.equals(propertyName)) {
+                result = "all files";
+            }
+            else {
+                result = CURLY_BRACKETS;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Generates a stream of values from the given value.
+     *
+     * @param value the value to generate the stream from.
+     * @return the stream of values.
+     */
+    private static Stream<?> getValuesStream(Object value) {
+        final Stream<?> valuesStream;
+        if (value instanceof Collection) {
+            final Collection<?> collection = (Collection<?>) value;
+            valuesStream = collection.stream();
+        }
+        else {
+            final Object[] array = (Object[]) value;
+            valuesStream = Arrays.stream(array);
+        }
+        return valuesStream;
+    }
+
+    /**
+     * Returns the name of the bean property's default value for the int array class.
+     *
+     * @param value The bean property's value.
+     * @return String form of property's default value.
+     */
+    private static String getIntArrayPropertyValue(Object value) {
+        try (IntStream stream = getIntStream(value)) {
+            String result = stream
+                    .mapToObj(TokenUtil::getTokenName)
+                    .sorted()
+                    .collect(Collectors.joining(COMMA_SPACE));
+            if (result.isEmpty()) {
+                result = CURLY_BRACKETS;
+            }
+            return result;
+        }
+    }
+
+    /**
+     * Get the int stream from the given value.
+     *
+     * @param value the value to get the int stream from.
+     * @return the int stream.
+     */
+    private static IntStream getIntStream(Object value) {
+        final IntStream stream;
+        if (value instanceof Collection) {
+            final Collection<?> collection = (Collection<?>) value;
+            stream = collection.stream()
+                    .mapToInt(int.class::cast);
+        }
+        else if (value instanceof BitSet) {
+            stream = ((BitSet) value).stream();
+        }
+        else {
+            stream = Arrays.stream((int[]) value);
+        }
+        return stream;
+    }
+
+    /**
+     * Gets the class of the given field.
+     *
+     * @param field the field to get the class of.
+     * @param propertyName the name of the property.
+     * @param moduleName the name of the module.
+     * @param instance the instance of the module.
+     * @return the class of the field.
+     * @throws MacroExecutionException if an error occurs during getting the class.
+     */
+    // -@cs[CyclomaticComplexity] Splitting would not make the code more readable
+    private static Class<?> getFieldClass(Field field, String propertyName,
+                                          String moduleName, Object instance)
+            throws MacroExecutionException {
+        Class<?> result = null;
+
+        if (field != null) {
+            result = field.getType();
+        }
+        if (result == null) {
+            if (!PROPERTIES_ALLOWED_GET_TYPES_FROM_METHOD
+                    .contains(moduleName + DOT + propertyName)) {
+                throw new MacroExecutionException(
+                        "Could not find field " + propertyName + " in class " + moduleName);
+            }
+
+            result = getPropertyClass(propertyName, instance);
+        }
+        if (field != null && (result == List.class || result == Set.class)) {
+            final ParameterizedType type = (ParameterizedType) field.getGenericType();
+            final Class<?> parameterClass = (Class<?>) type.getActualTypeArguments()[0];
+
+            if (parameterClass == Integer.class) {
+                result = int[].class;
+            }
+            else if (parameterClass == String.class) {
+                result = String[].class;
+            }
+            else if (parameterClass == Pattern.class) {
+                result = Pattern[].class;
+            }
+            else {
+                final String message = "Unknown parameterized type: "
+                        + parameterClass.getSimpleName();
+                throw new MacroExecutionException(message);
+            }
+        }
+        else if (result == BitSet.class) {
+            result = int[].class;
+        }
+
+        return result;
+    }
+
+    /**
+     * Gets the class of the given java property.
+     *
+     * @param propertyName the name of the property.
+     * @param instance the instance of the module.
+     * @return the class of the java property.
+     * @throws MacroExecutionException if an error occurs during getting the class.
+     */
+    // -@cs[ForbidWildcardAsReturnType] Object is received as param, no prediction on type of field
+    public static Class<?> getPropertyClass(String propertyName, Object instance)
+            throws MacroExecutionException {
+        final Class<?> result;
+        try {
+            final PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(instance,
+                    propertyName);
+            result = descriptor.getPropertyType();
+        }
+        catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException exc) {
+            throw new MacroExecutionException(exc.getMessage(), exc);
+        }
+        return result;
+    }
+
+    /**
+     * Get the difference between two lists of tokens.
+     *
+     * @param tokens the list of tokens to remove from.
+     * @param subtractions the tokens to remove.
+     * @return the difference between the two lists.
+     */
+    public static List<Integer> getDifference(int[] tokens, int... subtractions) {
+        final Set<Integer> subtractionsSet = Arrays.stream(subtractions)
+                .boxed()
+                .collect(Collectors.toUnmodifiableSet());
+        return Arrays.stream(tokens)
+                .boxed()
+                .filter(token -> !subtractionsSet.contains(token))
+                .collect(Collectors.toUnmodifiableList());
+    }
+
+    /**
+     * Gets the field with the given name from the given class.
+     *
+     * @param fieldClass the class to get the field from.
+     * @param propertyName the name of the field.
+     * @return the field we are looking for.
+     */
+    public static Field getField(Class<?> fieldClass, String propertyName) {
+        Field result = null;
+        Class<?> currentClass = fieldClass;
+
+        while (!Object.class.equals(currentClass)) {
+            try {
+                result = currentClass.getDeclaredField(propertyName);
+                result.trySetAccessible();
+                break;
+            }
+            catch (NoSuchFieldException ignored) {
+                currentClass = currentClass.getSuperclass();
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Constructs string with relative link to the provided document.
+     *
+     * @param moduleName the name of the module.
+     * @param document the path of the document.
+     * @return relative link to the document.
+     * @throws MacroExecutionException if link to the document cannot be constructed.
+     */
+    public static String getLinkToDocument(String moduleName, String document)
+            throws MacroExecutionException {
+        final Path templatePath = getTemplatePath(moduleName.replace("Check", ""));
+        if (templatePath == null) {
+            throw new MacroExecutionException(
+                    String.format(Locale.ROOT,
+                            "Could not find template for %s", moduleName));
+        }
+        final Path templatePathParent = templatePath.getParent();
+        if (templatePathParent == null) {
+            throw new MacroExecutionException("Failed to get parent path for " + templatePath);
+        }
+        return templatePathParent
+                .relativize(Paths.get(SRC, "xdocs", document))
+                .toString()
+                .replace(".xml", ".html")
+                .replace('\\', '/');
+    }
+
+    /** Utility class for extracting description from a method's Javadoc. */
+    private static final class DescriptionExtractor {
+
+        /**
+         * Extracts the description from the javadoc detail node. Performs a DFS traversal on the
+         * detail node and extracts the text nodes.
+         *
+         * @param javadoc the Javadoc to extract the description from.
+         * @param moduleName the name of the module.
+         * @return the description of the setter.
+         * @throws MacroExecutionException if the description could not be extracted.
+         * @noinspection TooBroadScope
+         * @noinspectionreason TooBroadScope - complex nature of method requires large scope
+         */
+        // -@cs[NPathComplexity] Splitting would not make the code more readable
+        // -@cs[CyclomaticComplexity] Splitting would not make the code more readable.
+        private static String getDescriptionFromJavadoc(DetailNode javadoc, String moduleName)
+                throws MacroExecutionException {
+            boolean isInCodeLiteral = false;
+            boolean isInHtmlElement = false;
+            boolean isInHrefAttribute = false;
+            final StringBuilder description = new StringBuilder(128);
+            final Deque<DetailNode> queue = new ArrayDeque<>();
+            final List<DetailNode> descriptionNodes = getDescriptionNodes(javadoc);
+            Lists.reverse(descriptionNodes).forEach(queue::push);
+
+            // Perform DFS traversal on description nodes
+            while (!queue.isEmpty()) {
+                final DetailNode node = queue.pop();
+                Lists.reverse(Arrays.asList(node.getChildren())).forEach(queue::push);
+
+                if (node.getType() == JavadocTokenTypes.HTML_TAG_NAME
+                        && "href".equals(node.getText())) {
+                    isInHrefAttribute = true;
+                }
+                if (isInHrefAttribute && node.getType() == JavadocTokenTypes.ATTR_VALUE) {
+                    final String href = node.getText();
+                    if (href.contains(CHECKSTYLE_ORG_URL)) {
+                        handleInternalLink(description, moduleName, href);
+                    }
+                    else {
+                        description.append(href);
+                    }
+
+                    isInHrefAttribute = false;
+                    continue;
+                }
+                if (node.getType() == JavadocTokenTypes.HTML_ELEMENT) {
+                    isInHtmlElement = true;
+                }
+                if (node.getType() == JavadocTokenTypes.END
+                        && node.getParent().getType() == JavadocTokenTypes.HTML_ELEMENT_END) {
+                    description.append(node.getText());
+                    isInHtmlElement = false;
+                }
+                if (node.getType() == JavadocTokenTypes.TEXT
+                        // If a node has children, its text is not part of the description
+                        || isInHtmlElement && node.getChildren().length == 0
+                            // Some HTML elements span multiple lines, so we avoid the asterisk
+                            && node.getType() != JavadocTokenTypes.LEADING_ASTERISK) {
+                    description.append(node.getText());
+                }
+                if (node.getType() == JavadocTokenTypes.CODE_LITERAL) {
+                    isInCodeLiteral = true;
+                    description.append("<code>");
+                }
+                if (isInCodeLiteral
+                        && node.getType() == JavadocTokenTypes.JAVADOC_INLINE_TAG_END) {
+                    isInCodeLiteral = false;
+                    description.append("</code>");
+                }
+            }
+            return description.toString().trim();
+        }
+
+        /**
+         * Converts the href value to a relative link to the document and appends it to the
+         * description.
+         *
+         * @param description the description to append the relative link to.
+         * @param moduleName the name of the module.
+         * @param value the href value.
+         * @throws MacroExecutionException if the relative link could not be created.
+         */
+        private static void handleInternalLink(StringBuilder description,
+                                               String moduleName, String value)
+                throws MacroExecutionException {
+            String href = value;
+            href = href.replace(CHECKSTYLE_ORG_URL, "");
+            // Remove first and last characters, they are always double quotes
+            href = href.substring(1, href.length() - 1);
+
+            final String relativeHref = getLinkToDocument(moduleName, href);
+            final char doubleQuote = '\"';
+            description.append(doubleQuote).append(relativeHref).append(doubleQuote);
+        }
+
+        /**
+         * Extracts description nodes from javadoc.
+         *
+         * @param javadoc the Javadoc to extract the description from.
+         * @return the description nodes of the setter.
+         */
+        private static List<DetailNode> getDescriptionNodes(DetailNode javadoc) {
+            final DetailNode[] children = javadoc.getChildren();
+            final List<DetailNode> descriptionNodes = new ArrayList<>();
+            for (final DetailNode child : children) {
+                if (isEndOfDescription(child)) {
+                    break;
+                }
+                descriptionNodes.add(child);
+            }
+            return descriptionNodes;
+        }
+
+        /**
+         * Determines if the given child index is the end of the description. The end of the
+         * description is defined as 4 consecutive nodes of type NEWLINE, LEADING_ASTERISK, NEWLINE,
+         * LEADING_ASTERISK. This is an asterisk that is alone on a line. Just like the one below
+         * this line.
+         *
+         * @param child the child to check.
+         * @return true if the given child index is the end of the description.
+         */
+        private static boolean isEndOfDescription(DetailNode child) {
+            final DetailNode nextSibling = JavadocUtil.getNextSibling(child);
+            final DetailNode secondNextSibling = JavadocUtil.getNextSibling(nextSibling);
+            final DetailNode thirdNextSibling = JavadocUtil.getNextSibling(secondNextSibling);
+
+            return child.getType() == JavadocTokenTypes.NEWLINE
+                        && nextSibling.getType() == JavadocTokenTypes.LEADING_ASTERISK
+                        && secondNextSibling.getType() == JavadocTokenTypes.NEWLINE
+                        && thirdNextSibling.getType() == JavadocTokenTypes.LEADING_ASTERISK;
+        }
+    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.java
index 14f3dcf669d..2f5709eddf3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ViolationMessagesMacro.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java
index a37ba7ee322..73b69a46ab5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateParser.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java
index 798c1046103..da73a86899c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSink.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,9 @@
 
 package com.puppycrawl.tools.checkstyle.site;
 
+import java.io.PrintWriter;
 import java.io.Writer;
+import java.util.regex.Pattern;
 
 import javax.swing.text.MutableAttributeSet;
 
@@ -47,7 +49,7 @@ public class XdocsTemplateSink extends XdocSink {
      * @param encoding encoding of the writer.
      */
     public XdocsTemplateSink(Writer writer, String encoding) {
-        super(writer);
+        super(new CustomPrintWriter(writer));
         this.encoding = encoding;
     }
 
@@ -82,4 +84,70 @@ public void link(String href) {
         attributes.addAttribute(SinkEventAttributes.HREF, href);
         writeStartTag(HtmlMarkup.A, attributes);
     }
+
+    /**
+     * Write a table row tag. We override this method because the default implementation
+     * adds a {@code align="top"} attribute to the row which we don't want.
+     */
+    @Override
+    public void tableRow() {
+        writeStartTag(TR);
+    }
+
+    /**
+     * Write a table tag. We override this method because the default implementation
+     * adds different attributes which we don't want. We ignore the parameters
+     * because we don't need them, but the default implementation will take them
+     * into account once this class is removed.
+     *
+     * @param justification ignored
+     * @param grid ignored
+     */
+    @Override
+    public void tableRows(int[] justification, boolean grid) {
+        writeStartTag(HtmlMarkup.TABLE);
+    }
+
+    /**
+     * A Custom writer that only prints Unix-style newline character.
+     */
+    private static final class CustomPrintWriter extends PrintWriter {
+
+        /** A Regex pattern to represent all kinds of newline character. */
+        private static final Pattern LINE_BREAK_ESCAPE = Pattern.compile("\\R");
+
+        /** Unix-Style newline character. */
+        private static final String NEWLINE = "\n";
+
+        /**
+         * Creates a new instance of this custom writer.
+         *
+         * @param writer not null writer to write the result
+         */
+        private CustomPrintWriter(Writer writer) {
+            super(writer);
+        }
+
+        /**
+         * Enforces Unix-style newline character.
+         */
+        @Override
+        public void println() {
+            write(NEWLINE, 0, NEWLINE.length());
+        }
+
+        /**
+         * Unifies all newline characters to Unix-Style Newline character.
+         *
+         * @param line   text that is to be written in the output file.
+         * @param offset starting offset value for writing data.
+         * @param length total length of string to be written.
+         */
+        @Override
+        public void write(String line, int offset, int length) {
+            final String lineBreakReplacedLine =
+                LINE_BREAK_ESCAPE.matcher(line).replaceAll(NEWLINE);
+            super.write(lineBreakReplacedLine, 0, lineBreakReplacedLine.length());
+        }
+    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.java
index 94189b63578..3d45502b408 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/XdocsTemplateSinkFactory.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/package-info.java
index f0385bbb64e..ba6c22f9b2d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/site/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java
index 6a78bd4084c..873f683d8ad 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java
index e855de3273f..20203834b61 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -154,7 +154,7 @@ public static boolean isOnMember(DetailAST blockComment) {
      * @return true if node is before method
      */
     public static boolean isOnMethod(DetailAST blockComment) {
-        return isOnPlainClassMember(blockComment, TokenTypes.METHOD_DEF)
+        return isOnPlainClassMember(blockComment)
                 || isOnTokenWithModifiers(blockComment, TokenTypes.METHOD_DEF)
                 || isOnTokenWithAnnotation(blockComment, TokenTypes.METHOD_DEF);
     }
@@ -166,7 +166,7 @@ public static boolean isOnMethod(DetailAST blockComment) {
      * @return true if node is before field
      */
     public static boolean isOnField(DetailAST blockComment) {
-        return isOnPlainClassMember(blockComment, TokenTypes.VARIABLE_DEF)
+        return isOnPlainClassMember(blockComment)
                 || isOnTokenWithModifiers(blockComment, TokenTypes.VARIABLE_DEF)
                     && blockComment.getParent().getParent().getParent()
                         .getType() == TokenTypes.OBJBLOCK
@@ -185,7 +185,7 @@ public static boolean isOnConstructor(DetailAST blockComment) {
         return isOnPlainToken(blockComment, TokenTypes.CTOR_DEF, TokenTypes.IDENT)
                 || isOnTokenWithModifiers(blockComment, TokenTypes.CTOR_DEF)
                 || isOnTokenWithAnnotation(blockComment, TokenTypes.CTOR_DEF)
-                || isOnPlainClassMember(blockComment, TokenTypes.CTOR_DEF);
+                || isOnPlainClassMember(blockComment);
     }
 
     /**
@@ -230,7 +230,7 @@ else if (parent.getType() == TokenTypes.ANNOTATION
      * @return true if node is before annotation field
      */
     public static boolean isOnAnnotationField(DetailAST blockComment) {
-        return isOnPlainClassMember(blockComment, TokenTypes.ANNOTATION_FIELD_DEF)
+        return isOnPlainClassMember(blockComment)
                 || isOnTokenWithModifiers(blockComment, TokenTypes.ANNOTATION_FIELD_DEF)
                 || isOnTokenWithAnnotation(blockComment, TokenTypes.ANNOTATION_FIELD_DEF);
     }
@@ -281,10 +281,9 @@ && getPrevSiblingSkipComments(blockComment.getParent()) == null
      * Checks that block comment is on specified class member without any modifiers.
      *
      * @param blockComment block comment start DetailAST
-     * @param memberType parent token type
      * @return true if block comment is on specified token without modifiers
      */
-    private static boolean isOnPlainClassMember(DetailAST blockComment, int memberType) {
+    private static boolean isOnPlainClassMember(DetailAST blockComment) {
         DetailAST parent = blockComment.getParent();
         // type could be in fully qualified form, so we go up to Type token
         while (parent.getType() == TokenTypes.DOT) {
@@ -292,7 +291,6 @@ private static boolean isOnPlainClassMember(DetailAST blockComment, int memberTy
         }
         return (parent.getType() == TokenTypes.TYPE
                     || parent.getType() == TokenTypes.TYPE_PARAMETERS)
-                && parent.getParent().getType() == memberType
                 // previous parent sibling is always TokenTypes.MODIFIERS
                 && !parent.getPreviousSibling().hasChildren()
                 && parent.getParent().getParent().getType() == TokenTypes.OBJBLOCK;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java
index 2ad69b89daf..05a02103c65 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java
index 3e706cd04f7..96a41ce9c7a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -54,21 +54,9 @@ public final class CheckUtil {
     /** Hex radix. */
     private static final int BASE_16 = 16;
 
-    /** Maximum children allowed in setter/getter. */
-    private static final int SETTER_GETTER_MAX_CHILDREN = 7;
-
-    /** Maximum nodes allowed in a body of setter. */
-    private static final int SETTER_BODY_SIZE = 3;
-
     /** Pattern matching underscore characters ('_'). */
     private static final Pattern UNDERSCORE_PATTERN = Pattern.compile("_");
 
-    /** Pattern matching names of setter methods. */
-    private static final Pattern SETTER_PATTERN = Pattern.compile("^set[A-Z].*");
-
-    /** Pattern matching names of getter methods. */
-    private static final Pattern GETTER_PATTERN = Pattern.compile("^(is|get)[A-Z].*");
-
     /** Compiled pattern for all system newlines. */
     private static final Pattern ALL_NEW_LINES = Pattern.compile("\\R");
 
@@ -280,79 +268,6 @@ public static List<DetailAST> getTypeParameters(final DetailAST node) {
         return typeParams;
     }
 
-    /**
-     * Returns whether an AST represents a setter method.
-     *
-     * @param ast the AST to check with
-     * @return whether the AST represents a setter method
-     */
-    public static boolean isSetterMethod(final DetailAST ast) {
-        boolean setterMethod = false;
-
-        // Check have a method with exactly 7 children which are all that
-        // is allowed in a proper setter method which does not throw any
-        // exceptions.
-        if (ast.getType() == TokenTypes.METHOD_DEF
-                && ast.getChildCount() == SETTER_GETTER_MAX_CHILDREN) {
-            final DetailAST type = ast.findFirstToken(TokenTypes.TYPE);
-            final String name = type.getNextSibling().getText();
-            final boolean matchesSetterFormat = SETTER_PATTERN.matcher(name).matches();
-
-            final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS);
-            final boolean singleParam = params.getChildCount(TokenTypes.PARAMETER_DEF) == 1;
-
-            if (matchesSetterFormat && singleParam) {
-                // Now verify that the body consists of:
-                // SLIST -> EXPR -> ASSIGN
-                // SEMI
-                // RCURLY
-                final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST);
-
-                if (slist != null && slist.getChildCount() == SETTER_BODY_SIZE) {
-                    final DetailAST expr = slist.getFirstChild();
-                    setterMethod = expr.getFirstChild().getType() == TokenTypes.ASSIGN;
-                }
-            }
-        }
-        return setterMethod;
-    }
-
-    /**
-     * Returns whether an AST represents a getter method.
-     *
-     * @param ast the AST to check with
-     * @return whether the AST represents a getter method
-     */
-    public static boolean isGetterMethod(final DetailAST ast) {
-        boolean getterMethod = false;
-
-        // Check have a method with exactly 7 children which are all that
-        // is allowed in a proper getter method which does not throw any
-        // exceptions.
-        if (ast.getType() == TokenTypes.METHOD_DEF
-                && ast.getChildCount() == SETTER_GETTER_MAX_CHILDREN) {
-            final DetailAST type = ast.findFirstToken(TokenTypes.TYPE);
-            final String name = type.getNextSibling().getText();
-            final boolean matchesGetterFormat = GETTER_PATTERN.matcher(name).matches();
-
-            final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS);
-            final boolean noParams = params.getChildCount(TokenTypes.PARAMETER_DEF) == 0;
-
-            if (matchesGetterFormat && noParams) {
-                // Now verify that the body consists of:
-                // SLIST -> RETURN
-                // RCURLY
-                final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST);
-
-                if (slist != null) {
-                    final DetailAST expr = slist.getFirstChild();
-                    getterMethod = expr.getType() == TokenTypes.LITERAL_RETURN;
-                }
-            }
-        }
-        return getterMethod;
-    }
-
     /**
      * Checks whether a method is a not void one.
      *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java
index 7600997cc55..c4a8b56c278 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,38 +63,12 @@ public static boolean hasWhitespaceBefore(int index, int... codePoints) {
      */
     public static int[] stripTrailing(int... codePoints) {
         int lastIndex = codePoints.length;
-        while (lastIndex > 0 && CommonUtil.isCodePointWhitespace(codePoints, lastIndex - 1)) {
+        while (CommonUtil.isCodePointWhitespace(codePoints, lastIndex - 1)) {
             lastIndex--;
         }
         return Arrays.copyOfRange(codePoints, 0, lastIndex);
     }
 
-    /**
-     * Removes leading whitespaces.
-     *
-     * @param codePoints array of unicode code points
-     * @return unicode code points array with leading whitespaces removed
-     */
-    public static int[] stripLeading(int... codePoints) {
-        int startIndex = 0;
-        while (startIndex < codePoints.length
-            && CommonUtil.isCodePointWhitespace(codePoints, startIndex)) {
-            startIndex++;
-        }
-        return Arrays.copyOfRange(codePoints, startIndex, codePoints.length);
-    }
-
-    /**
-     * Removes leading and trailing whitespaces.
-     *
-     * @param codePoints array of unicode code points
-     * @return unicode code points array with leading and trailing whitespaces removed
-     */
-    public static int[] trim(int... codePoints) {
-        final int[] strippedCodePoints = stripTrailing(codePoints);
-        return stripLeading(strippedCodePoints);
-    }
-
     /**
      * Tests if the unicode code points array
      * ends with the specified suffix.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java
index a3c8429bb85..57858dc7f20 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -36,6 +36,8 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import org.xml.sax.InputSource;
+
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 
 /**
@@ -241,19 +243,12 @@ public static boolean isPatternValid(String pattern) {
      * @return the base class name from a fully qualified name
      */
     public static String baseClassName(String type) {
-        final String className;
         final int index = type.lastIndexOf('.');
-        if (index == -1) {
-            className = type;
-        }
-        else {
-            className = type.substring(index + 1);
-        }
-        return className;
+        return type.substring(index + 1);
     }
 
     /**
-     * Constructs a normalized relative path between base directory and a given path.
+     * Constructs a relative path between base directory and a given path.
      *
      * @param baseDirectory
      *            the base path to which given path is relativized
@@ -262,14 +257,14 @@ public static String baseClassName(String type) {
      * @return the relative normalized path between base directory and
      *     path or path if base directory is null.
      */
-    public static String relativizeAndNormalizePath(final String baseDirectory, final String path) {
+    public static String relativizePath(final String baseDirectory, final String path) {
         final String resultPath;
         if (baseDirectory == null) {
             resultPath = path;
         }
         else {
-            final Path pathAbsolute = Paths.get(path).normalize();
-            final Path pathBase = Paths.get(baseDirectory).normalize();
+            final Path pathAbsolute = Paths.get(path);
+            final Path pathBase = Paths.get(baseDirectory);
             resultPath = pathBase.relativize(pathAbsolute).toString();
         }
         return resultPath;
@@ -337,6 +332,19 @@ public static void close(Closeable closeable) {
         }
     }
 
+    /**
+     * Creates an input source from a file.
+     *
+     * @param filename name of the file.
+     * @return input source.
+     * @throws CheckstyleException if an error occurs.
+     */
+    public static InputSource sourceFromFilename(String filename) throws CheckstyleException {
+        // figure out if this is a File or a URL
+        final URI uri = getUriByFilename(filename);
+        return new InputSource(uri.toASCIIString());
+    }
+
     /**
      * Resolve the specified filename to a URI.
      *
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/FilterUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/FilterUtil.java
index fc27fae558c..0e6de32d88d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/FilterUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/FilterUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java
index 0ac404a6590..360a0d605a6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java
index 0471bcf0274..11242193e46 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -61,7 +61,7 @@ public static Set<Class<?>> getCheckstyleModules(
                 .flatMap(pkg -> classPath.getTopLevelClasses(pkg).stream())
                 .map(ClassPath.ClassInfo::load)
                 .filter(ModuleReflectionUtil::isCheckstyleModule)
-                .collect(Collectors.toSet());
+                .collect(Collectors.toUnmodifiableSet());
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/OsSpecificUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/OsSpecificUtil.java
new file mode 100644
index 00000000000..9fc636326c1
--- /dev/null
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/OsSpecificUtil.java
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.utils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Class which provides OS related utilities.
+ */
+public final class OsSpecificUtil {
+
+    /**
+     * Hiding public and default constructor.
+     */
+    private OsSpecificUtil() {
+
+    }
+
+    /**
+     * Updates the specified directory by resolving symbolic links, ensuring it exists,
+     * and creating any necessary parent directories. If the provided path is a symbolic
+     * link, it resolves it to the actual directory, throwing an IOException if the
+     * resolved path is not a directory. Creates directories if they do not exist.
+     *
+     * @param directory The path to the directory to be updated.
+     * @throws IOException If an I/O error occurs or if the resolved symbolic link is
+     *                     not a directory.
+     */
+    public static void updateDirectory(Path directory) throws IOException {
+        Path targetDirectory = directory;
+
+        if (Files.isSymbolicLink(directory)) {
+            final Path actualDir = directory.toRealPath();
+
+            if (Files.isDirectory(actualDir)) {
+                targetDirectory = actualDir;
+            }
+            else {
+                throw new IOException("Resolved symbolic link "
+                        + directory + " is not a directory.");
+            }
+        }
+        Files.createDirectories(targetDirectory);
+    }
+}
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java
index ce97e273ebf..4b747480726 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java
index 252fa50d2f2..f2b0cab89ee 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,8 +44,8 @@ private ScopeUtil() {
      */
     public static Scope getDeclaredScopeFromMods(DetailAST aMods) {
         Scope result = null;
-        for (DetailAST token = aMods.getFirstChild(); token != null && result == null;
-                token = token.getNextSibling()) {
+        for (DetailAST token = aMods.getFirstChild(); token != null;
+             token = token.getNextSibling()) {
             switch (token.getType()) {
                 case TokenTypes.LITERAL_PUBLIC:
                     result = Scope.PUBLIC;
@@ -85,7 +85,7 @@ public static Scope getScope(DetailAST ast) {
      */
     public static Scope getScopeFromMods(DetailAST aMods) {
         return Optional.ofNullable(getDeclaredScopeFromMods(aMods))
-                .orElseGet(() -> getDefaultScope(aMods.getParent()));
+                .orElseGet(() -> getDefaultScope(aMods));
     }
 
     /**
@@ -131,7 +131,7 @@ else if (isInInterfaceOrAnnotationBlock(ast)) {
      */
     public static Scope getSurroundingScope(DetailAST node) {
         Scope returnValue = null;
-        for (DetailAST token = node.getParent();
+        for (DetailAST token = node;
              token != null;
              token = token.getParent()) {
             final int type = token.getType();
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java
index b56f2e24bc7..d302e993a18 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -97,7 +97,7 @@ public static Map<String, Integer> nameToValueMapFromPublicIntFields(Class<?> cl
         return Arrays.stream(cls.getDeclaredFields())
             .filter(fld -> Modifier.isPublic(fld.getModifiers()) && fld.getType() == Integer.TYPE)
             .collect(Collectors.toUnmodifiableMap(
-                Field::getName, fld -> getIntFromField(fld, fld.getName()))
+                Field::getName, fld -> getIntFromField(fld, null))
             );
     }
 
@@ -109,7 +109,7 @@ public static Map<String, Integer> nameToValueMapFromPublicIntFields(Class<?> cl
      */
     public static Map<Integer, String> invertMap(Map<String, Integer> map) {
         return map.entrySet().stream()
-            .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+            .collect(Collectors.toUnmodifiableMap(Map.Entry::getValue, Map.Entry::getKey));
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java
index 623afea10a9..0da7f27003d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/UnmodifiableCollectionUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,9 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.utils;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>Note: it simply wraps the existing JDK methods to provide a workaround
@@ -39,17 +43,6 @@ public final class UnmodifiableCollectionUtil {
     private UnmodifiableCollectionUtil() {
     }
 
-    /**
-     * Creates an unmodifiable set based on the provided collection.
-     *
-     * @param collection the collection to create an unmodifiable set from
-     * @param <T> the type of elements in the set
-     * @return an unmodifiable set containing the elements from the provided collection
-     */
-    public static <T> Set<T> unmodifiableSet(Set<T> collection) {
-        return Collections.unmodifiableSet(collection);
-    }
-
     /**
      * Creates an unmodifiable list based on the provided collection.
      *
@@ -60,4 +53,54 @@ public static <T> Set<T> unmodifiableSet(Set<T> collection) {
     public static <T> List<T> unmodifiableList(List<T> collection) {
         return Collections.unmodifiableList(collection);
     }
+
+    /**
+     * Returns an unmodifiable view of a List containing elements of a specific type.
+     *
+     * @param items The List of items to make unmodifiable.
+     * @param elementType The Class object representing the type of elements in the list.
+     * @param <S> The generic type of elements in the input Collection.
+     * @param <T> The type of elements in the resulting unmodifiable List.
+     * @return An unmodifiable List containing elements of the specified type.
+     */
+    public static <S, T> List<T> unmodifiableList(Collection<S> items, Class<T> elementType) {
+        return items.stream()
+                .map(elementType::cast)
+                .collect(Collectors.toUnmodifiableList());
+    }
+
+    /**
+     * Creates a copy of array.
+     *
+     * @param array Array to create a copy of
+     * @param length length of array
+     * @param <T> The type of array
+     * @return copy of array
+     */
+    public static <T> T[] copyOfArray(T[] array, int length) {
+        return Arrays.copyOf(array, length);
+    }
+
+    /**
+     * Creates a copy of Map.
+     *
+     * @param map map to create a copy of
+     * @param <K> the type of keys in the map
+     * @param <V> the type of values in the map
+     * @return an immutable copy of the input map
+     */
+    public static <K, V> Map<K, V> copyOfMap(Map<? extends K, ? extends V> map) {
+        return Map.copyOf(map);
+    }
+
+    /**
+     * Returns an immutable set containing only the specified object.
+     *
+     * @param obj the type of object in the set
+     * @param <T> the type of object
+     * @return immutable set
+     */
+    public static <T> Set<T> singleton(T obj) {
+        return Collections.singleton(obj);
+    }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java
index 34215d0105a..822abc2e4d0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -101,7 +101,7 @@ public final class XpathUtil {
      * </pre>
      * Only these tokens support text attribute because they make our xpath queries more accurate.
      * These token types are listed below.
-     * */
+     */
     private static final BitSet TOKEN_TYPES_WITH_TEXT_ATTRIBUTE = TokenUtil.asBitSet(
             TokenTypes.IDENT, TokenTypes.STRING_LITERAL, TokenTypes.CHAR_LITERAL,
             TokenTypes.NUM_LONG, TokenTypes.NUM_INT, TokenTypes.NUM_DOUBLE, TokenTypes.NUM_FLOAT,
@@ -214,8 +214,6 @@ public static List<NodeInfo> getXpathItems(String xpath, AbstractNode rootNode)
         final XPathDynamicContext xpathDynamicContext = xpathExpression
                 .createDynamicContext(rootNode);
         final List<Item> items = xpathExpression.evaluate(xpathDynamicContext);
-        return items.stream()
-                .map(NodeInfo.class::cast)
-                .collect(Collectors.toUnmodifiableList());
+        return UnmodifiableCollectionUtil.unmodifiableList(items, NodeInfo.class);
     }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/package-info.java
index c1634df62e6..836441d8f5a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java
index ab04232925d..8d6e54f1d70 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.java
index 364e03126d5..511996a8892 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractNode.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.java
index 7767f3d7eee..6341e32df7a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractRootNode.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -126,7 +126,6 @@ public AxisIterator iterateAxis(int axisNumber) {
         final AxisIterator result;
         switch (axisNumber) {
             case AxisInfo.ANCESTOR:
-            case AxisInfo.ATTRIBUTE:
             case AxisInfo.PARENT:
             case AxisInfo.FOLLOWING:
             case AxisInfo.FOLLOWING_SIBLING:
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNode.java
index e0f1b35b307..17f3ba5f1ae 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNode.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/ElementNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/ElementNode.java
index afe19f1aba8..531d1a3a3cc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/ElementNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/ElementNode.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/RootNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/RootNode.java
index 0a7540283f5..67f29e6361f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/RootNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/RootNode.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java
index 7f6bec7980e..b8000520b96 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nullable;
+
 import com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FileText;
@@ -143,7 +145,7 @@ public List<String> generate() {
         return getMatchingAstElements()
             .stream()
             .map(XpathQueryGenerator::generateXpathQuery)
-            .collect(Collectors.toList());
+            .collect(Collectors.toUnmodifiableList());
     }
 
     /**
@@ -152,6 +154,7 @@ public List<String> generate() {
      * @param root {@code DetailAST} root ast
      * @return child {@code DetailAst} element of the given root
      */
+    @Nullable
     private static DetailAST findChildWithTextAttribute(DetailAST root) {
         return TokenUtil.findFirstTokenByPredicate(root,
                 XpathUtil::supportsTextAttribute).orElse(null);
@@ -164,6 +167,7 @@ private static DetailAST findChildWithTextAttribute(DetailAST root) {
      * @param root {@code DetailAST} root ast
      * @return child {@code DetailAst} element of the given root
      */
+    @Nullable
     private static DetailAST findChildWithTextAttributeRecursively(DetailAST root) {
         DetailAST res = findChildWithTextAttribute(root);
         for (DetailAST ast = root.getFirstChild(); ast != null && res == null;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java
index 994d13b52f5..5327fef400c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIterator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java
index 404cdbba74b..48f043e5c9c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIterator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java
index bcc8e5eb1e0..0f37652052d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIterator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.java
index 2bbd0ecf816..9ce580dc9f9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIterator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.java
index 79d3da23ad1..9c8c0418364 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIterator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/package-info.java
index 87408fc8dba..9519c21810c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/iterators/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/package-info.java b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/package-info.java
index 2021c242413..9f8eca53bba 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/package-info.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/package-info.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages.properties
index 14e3d185c8f..17ad4ee81cb 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages.properties
@@ -12,7 +12,7 @@ annotation.trailing.comma.present=Annotation array values cannot contain trailin
 javadoc.duplicateTag=Duplicate {0} tag.
 javadoc.missed.html.close=Javadoc comment at column {0} has parse error. Missed HTML close tag ''{1}''. Sometimes it means that close tag missed for one of previous tags.
 javadoc.parse.rule.error=Javadoc comment at column {0} has parse error. Details: {1} while parsing {2}
+javadoc.unclosedHtml=Unclosed HTML tag found: {0}.
 javadoc.wrong.singleton.html.tag=Javadoc comment at column {0} has parse error. It is forbidden to close singleton HTML tags. Tag: {1}.
 suppressed.warning.not.allowed=The warning ''{0}'' cannot be suppressed at this location.
 tag.not.valid.on=The Javadoc {0} tag is not valid at this location.
-
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_de.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_de.properties
index 63357bdc6e4..2afa7cee112 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_de.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_de.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=Annotation-Array-Werte dürfen nicht mit einem
 javadoc.duplicateTag=Das Javadoc-Tag {0} ist doppelt.
 javadoc.missed.html.close=Der Javadoc-Kommentar an Position {0} führt zu einem Parserfehler. Fehlendes schließendes HTML-Tag ''{1}''. Manchmal bedeutet dies, dass das schließende Tag eines vorherigen Tags fehlt.
 javadoc.parse.rule.error=Der Javadoc-Kommentar an Position {0} führt zu einem Parserfehler. Details: {1} beim Parsen von {2}
+javadoc.unclosedHtml=Nicht geschlossenes HTML-Tag gefunden: {0}
 javadoc.wrong.singleton.html.tag=Der Javadoc-Kommentar an Position {0} führt zu einem Parserfehler. Singleton-HTML-Tags dürfen nicht geschlossen werden. Tag: {1}
 suppressed.warning.not.allowed=Die Warnung ''{0}'' darf an dieser Stelle nicht unterdrückt werden.
 tag.not.valid.on=Das Javadoc-Tag {0} ist an dieser Stelle nicht zulässig.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_es.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_es.properties
index e7103270166..f8165081744 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_es.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_es.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=Valores de la matriz de anotación no pueden c
 javadoc.duplicateTag=La etiqueta Javadoc ''{0}'' no debería ser duplicada.
 javadoc.missed.html.close=Javadoc comentario en la columna {0} tiene parse error. Perdidas HTML cerca etiqueta ''{1}''. A veces esto significa que cerca de la etiqueta se perdió por una de las etiquetas anteriores.
 javadoc.parse.rule.error=Javadoc comentario en la columna {0} tiene parse error. Detalles: {1} al analizar {2}
+javadoc.unclosedHtml=Se encontró una etiqueta HTML sin cerrar: {0}
 javadoc.wrong.singleton.html.tag=El comentario Javadoc en la columna {0} tiene un error sintáctico. Es prohibido cerrar etiquetas HTML autocerrantes. Tag: {1}
 suppressed.warning.not.allowed=La advertencia ''{0}'' no se puede suprimir en este lugar.
 tag.not.valid.on=El Javadoc {0} etiqueta no es válido en este lugar.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fi.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fi.properties
index 502b7d3e50d..27215094ee0 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fi.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fi.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=Annotation array arvot voi sisältää perää
 javadoc.duplicateTag=Monista {0} tunniste.
 javadoc.missed.html.close=Javadoc kommentti sarakkeessa {0} on Jäsennysvirhe. Missed HTML lähellä tag ''{1}''. Joskus se tarkoittaa, että lähellä tag jäi yhden edellisen tunnisteita.
 javadoc.parse.rule.error=Javadoc kommentti sarakkeessa {0} on Jäsennysvirhe. Tiedot: {1} jäsennettäessä {2}
+javadoc.unclosedHtml=Unclosed HTML-koodi löytyy: {0}
 javadoc.wrong.singleton.html.tag=Javadoc kommentti sarakkeessa {0} on Jäsennysvirhe. On kiellettyä sulkea yksittäiseksi HTML tageja. Tag: {1} .
 suppressed.warning.not.allowed=Varoitus ''{0}'' ei voi estää tässä paikassa.
 tag.not.valid.on=Javadoc {0} tunniste ei kelpaa tässä paikassa.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fr.properties
index 090810a8741..2550762d31f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fr.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_fr.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=Les valeurs de tableau d''annotation ne peuven
 javadoc.duplicateTag=La balise Javadoc ''{0}'' ne devrait pas être dupliquée.
 javadoc.missed.html.close=Le commentaire Javadoc à la colonne {0} ne peut être analysé. La balise HTML fermante ''{1}'' n''a pas été trouvée. Parfois, cela signifie qu''une des balises fermantes précédentes est manquante.
 javadoc.parse.rule.error=Le commentaire Javadoc à la colonne {0} ne peut être analysé. Détails : {1} lors de l''analyse {2}
+javadoc.unclosedHtml=Balise HTML trouvée dans la Javadoc : {0}
 javadoc.wrong.singleton.html.tag=Le commentaire Javadoc à la colonne {0} ne peut être analysé. Il est interdit de fermer les balises HTML singleton. Balise : {1}
 suppressed.warning.not.allowed=L''avertissement ''{0}'' ne peut pas être supprimé à cet endroit.
 tag.not.valid.on=La balise Javadoc {0} n''est pas valide à cet endroit.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ja.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ja.properties
index ea1df890b25..286fd371571 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ja.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ja.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=アノテーションの配列値には末尾
 javadoc.duplicateTag={0}タグが重複しています。
 javadoc.missed.html.close={0} 桁目の Javadoc コメントでパースエラーが発生しました。HTML タグ ''{1}'' が閉じていません。どこかもっと前のタグが閉じていない可能性もあります。
 javadoc.parse.rule.error={0} 桁目の Javadoc コメントでパースエラーが発生しました。詳細: {1}、{2} の解析中に発生。
+javadoc.unclosedHtml=閉じていない HTML タグが見つかりました: {0}
 javadoc.wrong.singleton.html.tag={0} 桁目の Javadoc コメントでパースエラーが発生しました。空要素の閉じタグは禁止されています。タグ: {1}。
 suppressed.warning.not.allowed=この場所で、警告 ''{0}'' を抑制することはできません。
 tag.not.valid.on=この場所で、Javadoc の{0}タグは有効ではありません。
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_pt.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_pt.properties
index 8ceba791b34..dc2de0ad98e 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_pt.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_pt.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=A lista de valores de um array de anotações
 javadoc.duplicateTag=A tag {0} não deveria ser duplicada.
 javadoc.missed.html.close=O comentário de Javadoc na coluna {0} tem erro sintático. Faltou uma etiqueta de fechamento HTML ''{1}''. Às vezes, isso significa que uma etiqueta de fechamento foi esquecida em uma das etiquetas HTML anteriores.
 javadoc.parse.rule.error=O comentário Javadoc na coluna {0} tem um erro sintático. Detalhes: {1} ao analisar {2}
+javadoc.unclosedHtml=Encontrada uma etiqueta HTML não fechada: {0}
 javadoc.wrong.singleton.html.tag=O comentário Javadoc na coluna {0} tem um erro sintático. É proibido fechar etiquetas HTML auto-fechantes. Tag: {1}.
 suppressed.warning.not.allowed=A advertência ''{0}'' não pode ser suprimida neste local.
 tag.not.valid.on=A tag Javadoc {0} não pode ser usada neste local.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ru.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ru.properties
index b067438a0bb..320e11a36f9 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ru.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_ru.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=В массиве значений у анно
 javadoc.duplicateTag=Повторяющийся тег {0}.
 javadoc.missed.html.close=Ошибка синтаксического анализа Javadoc в символе {0}. Тег HTML ''{1}'' не закрыт. Также возможно, что какой-то более ранний тег не закрыт.
 javadoc.parse.rule.error=Ошибка синтаксического анализа Javadoc в символе {0}. Подробнее: {1} во время разбора {2}
+javadoc.unclosedHtml=Обнаружен незакрытый HTML тег: {0}
 javadoc.wrong.singleton.html.tag=Ошибка синтаксического анализа Javadoc в символе {0}. HTML теги: {1} не нужно закрывать.
 suppressed.warning.not.allowed=Предупреждение ''{0}'' недопустимо подавлять в этом месте.
 tag.not.valid.on=В этом месте тег Javadoc {0} нельзя использовать.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_tr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_tr.properties
index c770045e2dc..e583b035fa9 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_tr.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_tr.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=Anotasyonun dizi değerlerini takip eden bir v
 javadoc.duplicateTag=Tekrarlanmış {0} etiketi.
 javadoc.missed.html.close=Sütununda Javadoc comment {0} hatası ayrıştırmak vardır. Cevapsız HTML yakın etiketi ''{1}'' Bazen yakın etiketi önceki etiketler biri için kaçırmış demektir.
 javadoc.parse.rule.error=Sütununda Javadoc comment {0} hatası ayrıştırmak vardır. Detaylar: {1} ayrıştırılırken {2}
+javadoc.unclosedHtml=Kapatılmamış bir HTML etiketi bulundu: {0}
 javadoc.wrong.singleton.html.tag=Sütununda Javadoc comment {0} hatası ayrıştırmak vardır. Bu singleton HTML etiketleri kapatmak için yasaktır. Etiket: {1}
 suppressed.warning.not.allowed=''{0}'' uyarısı bu konumda bastırılamaz.
 tag.not.valid.on={0} Javadoc etiketi bu konumda geçersiz.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_zh.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_zh.properties
index d0d1868065a..65b1f2ea6d7 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_zh.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/annotation/messages_zh.properties
@@ -12,6 +12,7 @@ annotation.trailing.comma.present=注解数组最后元素尾部不应附加逗
 javadoc.duplicateTag=重复的 Javadoc 注释： {0} 。
 javadoc.missed.html.close=Javadoc 第 {0} 个字符解析错误。缺少 HTML 闭合标签： ''{1}''。 有时这代表前一标签未闭合。
 javadoc.parse.rule.error=Javadoc 第 {0} 个字符解析错误。解析 {2} ，详情： {1}
+javadoc.unclosedHtml=未关闭的 HTML 标签： {0} 。
 javadoc.wrong.singleton.html.tag=Javadoc 第 {0} 个字符解析错误。HTML 标签： {1} 不需要闭合。
 suppressed.warning.not.allowed=不能忽略  ''{0}''  警告。
 tag.not.valid.on=此处不应有Javadoc注释： {0} 。
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages.properties
index 31019fcee70..6313230da97 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Inner assignments should be avoided.
 avoid.clone.method=Avoid using clone method.
 avoid.double.brace.init=Avoid double brace initialization.
 avoid.finalizer.method=Avoid using finalizer method.
+constructors.declaration.grouping=Constructors should be grouped together. The last grouped constructor is declared at line ''{0}''.
 covariant.equals=covariant equals without overriding equals(java.lang.Object).
 declaration.order.access=Variable access definition in wrong order.
 declaration.order.constructor=Constructor definition in wrong order.
@@ -44,7 +45,7 @@ nested.if.depth=Nested if-else depth is {0,number,integer} (max allowed is {1,nu
 nested.try.depth=Nested try depth is {0,number,integer} (max allowed is {1,number,integer}).
 no.array.trailing.comma=Array should not contain trailing comma.
 no.enum.trailing.comma=Enum should not contain trailing comma.
-overload.methods.declaration=All overloaded methods should be placed next to each other. Placing non-overloaded methods in between overloaded methods with the same type is a violation. Previous overloaded method located at line ''{0}''.
+overload.methods.declaration=All overloaded methods should be placed next to each other. Previous overloaded method located at line ''{0}''.
 parameter.assignment=Assignment of parameter ''{0}'' is not allowed.
 require.this.method=Method call to ''{0}'' needs \"{1}this.\".
 require.this.variable=Reference to instance variable ''{0}'' needs \"{1}this.\".
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_de.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_de.properties
index 2d4f885d8e0..ce08257c59e 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_de.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_de.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Innere Zuweisungen sollten vermieden werden.
 avoid.clone.method=Die Methode clone() sollte vermieden werden.
 avoid.double.brace.init=Vermeiden Sie doppelte geschweifte Klammern.
 avoid.finalizer.method=Die Methode finalize() sollte vermieden werden.
+constructors.declaration.grouping=Alle Konstruktoren sollten zusammengefasst werden. Der vorherige Konstruktor befand sich in der Zeilennummer ''{0}''.
 covariant.equals=Kovariante Definition von equals(), ohne equals(java.lang.Object) zu überschreiben.
 declaration.order.access=Fehlerhafte Deklarationsreihenfolge für diesen Scope.
 declaration.order.constructor=Der Konstruktor steht an der falschen Stelle.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_es.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_es.properties
index c9bcff58460..66f8f94f831 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_es.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_es.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Deben evitarse las asignaciones internas.
 avoid.clone.method=Evite el uso de método clone.
 avoid.double.brace.init=Evite la inicialización de llaves dobles.
 avoid.finalizer.method=Evite el uso de método de finalizador.
+constructors.declaration.grouping=Todos los constructores deben agruparse. El constructor anterior estaba en la línea número ''{0}''.
 covariant.equals=equals covariante sin sobrescribir equals(java.lang.Object).
 declaration.order.access=Definición de acceso a variable en orden incorrecto.
 declaration.order.constructor=Definición de constructor en orden incorrecto.
@@ -44,7 +45,7 @@ nested.if.depth=La profundidad de if-else anidados es {0,number,integer} (máxim
 nested.try.depth=La profundidad de try anidados es {0,number,integer} (máximo permitido es {1,number,integer}).
 no.array.trailing.comma=La matriz no debe contener una coma final.
 no.enum.trailing.comma=Enum no debe contener una coma final.
-overload.methods.declaration=Todos los métodos sobrecargados deben colocarse uno al lado del otro. Colocar métodos no sobrecargados entre métodos sobrecargados con el mismo tipo es una violación. Método sobrecargado anterior ubicado en la línea ''{0} ''.
+overload.methods.declaration=Todos los métodos sobrecargados deben colocarse uno al lado del otro. Método sobrecargado anterior ubicado en la línea ''{0}''.
 parameter.assignment=No esta permitida la asignación del parámetro ''{0}''.
 require.this.method=La llamada al método ''{0}'' necesita "{1}this.".
 require.this.variable=La referencia a la variable de instancia ''{0}'' necesita "{1}this.".
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fi.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fi.properties
index 8011d41b235..0f443585f2d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fi.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fi.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Älä käytä sisäkkäisiä sijoituksia.
 avoid.clone.method=Vältä klooni menetelmää.
 avoid.double.brace.init=Vältä kaksinkertaista ahdintuen alustamista.
 avoid.finalizer.method=Vältä Finalizer menetelmää.
+constructors.declaration.grouping=Rakentajat tulee ryhmitellä yhteen. Viimeinen ryhmitelty rakentaja ilmoitetaan rivillä ''{0}''.
 covariant.equals=covariant vastaa ilman painavaa tasavertaisten (java.lang.Object).
 declaration.order.access=Muuttuja pääsy määritelmä väärässä järjestyksessä.
 declaration.order.constructor=Rakentaja määritelmä väärässä järjestyksessä.
@@ -44,7 +45,7 @@ nested.if.depth=Sisäkkäisten if-else -lausekkeiden syvyys on {0,number,integer
 nested.try.depth=Sisäkkäisten try -lausekkeiden syvyys on {0,number,integer} (suurin sallittu on {1,number,integer}).
 no.array.trailing.comma=Matriisissa ei tulisi olla takaosan pilkkua.
 no.enum.trailing.comma=Enum ei saisi sisältää takaosan pilkkua.
-overload.methods.declaration=Kaikki ylikuormitetut menetelmät tulisi asettaa vierekkäin. Ei-ylikuormitettujen menetelmien sijoittaminen samantyyppisiin ylikuormitettuihin menetelmiin on rikkomus. Aikaisempi ylikuormitettu menetelmä sijaitsee rivillä '' {0} ''.
+overload.methods.declaration=Kaikki ylikuormitetut menetelmät tulee sijoittaa vierekkäin. Edellinen ylikuormitettu menetelmä sijaitsee rivillä ''{0}''.
 parameter.assignment=Tehtävä parametrin ''{0}'' ei ole sallittu.
 require.this.method=Menetelmä kehotus ''{0}'' tarvitsee "{1}this.".
 require.this.variable=Viittaus Esimerkiksi muuttuja ''{0}'' tarvitsee "{1}this.".
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fr.properties
index 30ea96c8b53..3b57ed57e2e 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fr.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_fr.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Évitez d''affecter une valeur à une variable au sein d'
 avoid.clone.method=Évitez d''utiliser la méthode de clonage.
 avoid.double.brace.init=Évitez l''initialisation à double accolade.
 avoid.finalizer.method=Évitez d''utiliser la méthode de finalisation.
+constructors.declaration.grouping=Les constructeurs doivent être regroupés. Le dernier constructeur groupé est déclaré à la ligne ''{0}''.
 covariant.equals=Votre méthode equals compare uniquement les objets de votre classe. N''oubliez pas de surcharger la méthode equals(java.lang.Object).
 declaration.order.access=La définition des variables n''est pas triée suivant leur portée.
 declaration.order.constructor=La définition des constructeurs n''apparaît pas dans le bon ordre.
@@ -44,7 +45,7 @@ nested.if.depth=Le nombre de ''if'' imbriqués est de {0,number,integer}, alors
 nested.try.depth=Le nombre de ''try'' imbriqués est de {0,number,integer}, alors que le maximum autorisé est de {1,number,integer}.
 no.array.trailing.comma=Le tableau ne doit pas contenir de virgule.
 no.enum.trailing.comma=Enum ne doit pas contenir de virgule.
-overload.methods.declaration=Toutes les méthodes surchargées doivent être placées côte à côte. Placer des méthodes non surchargées entre des méthodes surchargées avec le même type est une violation. La méthode surchargée précédente se trouve à la ligne '' {0} ''.
+overload.methods.declaration=Toutes les méthodes surchargées doivent être placées les unes à côté des autres. Méthode surchargée précédente située à la ligne ''{0}''.
 parameter.assignment=Il est interdit d''affecter une valeur au paramètre ''{0}''.
 require.this.method=L''appel à la méthode ''{0}'' nécessite l''utilisation de "{1}this.".
 require.this.variable=La référence à la variable d''instance ''{0}'' doit utiliser "{1}this.".
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ja.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ja.properties
index 9e9254045e6..9ad64032485 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ja.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ja.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=式内部での代入は避けるべきです。
 avoid.clone.method=cloneメソッドを使用しないでください。
 avoid.double.brace.init=二重中括弧を使った初期化は使用しないでください。
 avoid.finalizer.method=ファイナライザメソッドを使用しないでください。
+constructors.declaration.grouping=コンストラクターはグループ化する必要があります。最後にグループ化されたコンストラクターは行 ''{0}'' で宣言されます。
 covariant.equals=equals(java.lang.Object) をオーバーライドせずに共変 な equals を定義しています。
 declaration.order.access=変数アクセスの定義順序が間違っています。
 declaration.order.constructor=コンストラクタの定義順序が間違っています。
@@ -44,7 +45,7 @@ nested.if.depth=ネストした if-else の深さが {0,number,integer} （最
 nested.try.depth=ネストした try の深さが {0,number,integer} （最大 {1,number,integer} まで）です。
 no.array.trailing.comma=配列には末尾のコンマを含めないでください。
 no.enum.trailing.comma=列挙には末尾のコンマを含めないでください。
-overload.methods.declaration=すべてのオーバーロードされたメソッドは、互いに隣接して配置する必要があります。 同じタイプのオーバーロードされたメソッドの間に非オーバーロードされたメソッドを配置することは違反です。 最後のオーバーロードされたメソッドは、行 '' {0} ''にあります。
+overload.methods.declaration=すべてのオーバーロードされたメソッドは隣り合って配置する必要があります。以前のオーバーロードされたメソッドは行 ''{0}'' にあります。
 parameter.assignment=パラメータ ''{0}'' への代入は許可されていません。
 require.this.method=メソッド ''{0}'' への呼び出しは、 "{1}this." が必要です。
 require.this.variable=インスタンス変数 ''{0}'' への参照には "{1}this." が必要です。
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_pt.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_pt.properties
index 6f8b2df64ce..c8b0cabe7c3 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_pt.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_pt.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Atribuições aninhadas devem ser evitadas.
 avoid.clone.method=Evite o uso do método ''clone()''.
 avoid.double.brace.init=Evite a inicialização entre chaves.
 avoid.finalizer.method=Evite o uso do método ''finalize()''.
+constructors.declaration.grouping=Os construtores devem ser agrupados. O último construtor agrupado é declarado na linha ''{0}''.
 covariant.equals="equals" covariante sem sobrescrever ''equals(java.lang.Object)''.
 declaration.order.access=Definição de acesso a variável em ordem errada.
 declaration.order.constructor=Definição de construtor em ordem errada.
@@ -44,7 +45,7 @@ nested.if.depth=A profundidade de aninhamento do "if-else" é {0,number,integer}
 nested.try.depth=A profundidade de aninhamento do "try" é {0,number,integer} (o máximo permitido é {1,number,integer}).
 no.array.trailing.comma=A matriz não deve conter vírgula à direita.
 no.enum.trailing.comma=O enum não deve conter vírgula à direita.
-overload.methods.declaration=Todos os métodos sobrecarregados devem ser colocados juntos. A colocação de métodos não sobrecarregados entre métodos sobrecarregados com o mesmo tipo é uma violação. O método sobrecarregado anterior foi encontrado na linha '' {0} ''.
+overload.methods.declaration=Todos os métodos sobrecarregados devem ser colocados um ao lado do outro. Método sobrecarregado anterior localizado na linha ''{0}''.
 parameter.assignment=A atribuição ao parâmetro ''{0}'' não é permitida.
 require.this.method=A chamada de método no ''{0}'' precisa de "{1}this.".
 require.this.variable=A referência à variável de instância ''{0}'' precisa de "{1}this.".
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ru.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ru.properties
index dd9c2e64217..2032e01713c 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ru.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_ru.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Внутренние присвоения следует
 avoid.clone.method=Избегайте использования метода clone().
 avoid.double.brace.init=Избегайте инициализации в двойных скобках.
 avoid.finalizer.method=Избегайте использования метода finalize().
+constructors.declaration.grouping=Конструкторы должны быть сгруппированы вместе. Последний сгруппированный конструктор объявляется в строке ''{0}''.
 covariant.equals=Ковариантный equals() без переопределения equals(java.lang.Object).
 declaration.order.access=Объявляйте переменные в порядке расширения доступа.
 declaration.order.constructor=Определение конструктора в неправильном порядке.
@@ -44,7 +45,7 @@ nested.if.depth=Глубина if-else {0,number,integer} (максимум {1,n
 nested.try.depth=Глубина try {0,number,integer} (максимум {1,number,integer}).
 no.array.trailing.comma=У последнего элемента массива не должно быть запятой.
 no.enum.trailing.comma=У последней константы перечисления не должно быть запятой.
-overload.methods.declaration=Все перегруженные методы должны быть размещены рядом друг с другом. Размещение не перегруженных методов между перегруженными методами одного и того же типа является нарушением. Предыдущий перегруженный метод расположен в строке ''{0}''.
+overload.methods.declaration=Все перегруженные методы следует размещать рядом друг с другом. Предыдущий перегруженный метод расположен в строке ''{0}''.
 parameter.assignment=Параметр метода ''{0}'' не должен менять значение.
 require.this.method=При вызове метода ''{0}'' нужно использовать \"{1}this.\".
 require.this.variable=При использовании переменной класса ''{0}'' нужно использовать \"{1}this.\".
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_tr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_tr.properties
index c522116dbd8..4d672388712 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_tr.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_tr.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=Dahili atamalar kullanılmamalıdır.
 avoid.clone.method=''clone'' metodu kullanılmamalıdır.
 avoid.double.brace.init=Çift ayraç başlatmadan kaçının.
 avoid.finalizer.method=''finalize'' metodu kullanılmamalıdır.
+constructors.declaration.grouping=Yapıcılar birlikte gruplandırılmalıdır. Gruplandırılan son kurucu ''{0}'' satırında bildirildi.
 covariant.equals=java.lang.Object sınıfının ''equals'' metodundan başka bir ''equals'' metodu tanımlanmış, java.lang.Object sınıfından gelen ''equals'' metodu da ezilmelidir (override).
 declaration.order.access=Değişken, erişim seviyesine göre yanlış sırada tanımlanmış.
 declaration.order.constructor=''constructor'' tanımı yanlış sırada yapılmış.
@@ -44,7 +45,7 @@ nested.if.depth=İç içe kullanılan ''if-else'' sayısı {0,number,integer} (m
 nested.try.depth=İç içe kullanılan ''try'' sayısı {0,number,integer} (maksimum izin verilen değer {1,number,integer}).
 no.array.trailing.comma=Dizi sonda virgül içermemelidir.
 no.enum.trailing.comma=Enum, sonda virgül içermemelidir.
-overload.methods.declaration=Aşırı yüklenmiş tüm yöntemler yan yana yerleştirilmelidir. Aşırı yüklenmemiş yöntemleri aynı tip aşırı yüklenmiş yöntemler arasına yerleştirmek bir ihlaldir. '' {0} '' satırında önceki aşırı yüklenmiş yöntem.
+overload.methods.declaration=Tüm aşırı yüklenmiş yöntemler yan yana yerleştirilmelidir. ''{0}'' satırında bulunan önceki aşırı yüklenmiş yöntem.
 parameter.assignment=''{0}'' parametresine atama yapılamaz.
 require.this.method=''{0}'' metoduna erişim "{1}this." kullanılarak yapılmalıdır.
 require.this.variable=''{0}'' değişkenine erişim "{1}this." kullanılarak yapılmalıdır.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_zh.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_zh.properties
index 2a80006f644..16a9fda6d41 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_zh.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/coding/messages_zh.properties
@@ -3,6 +3,7 @@ assignment.inner.avoid=应避免在子表达式中赋值。
 avoid.clone.method=避免重写 clone 方法。
 avoid.double.brace.init=避免双括号初始化。
 avoid.finalizer.method=避免重写finalize方法。
+constructors.declaration.grouping=构造函数应该组合在一起。最后一个分组构造函数在''{0}''行声明。
 covariant.equals=重写''equals()''方法时，必须确保重写了''equals(java.lang.Object)''方法。
 declaration.order.access=属性访问器定义顺序错误。
 declaration.order.constructor=构造器定义顺序错误。
@@ -44,7 +45,7 @@ nested.if.depth=至多{1,number,integer}层 if，目前{0,number,integer}层。
 nested.try.depth=至多{1,number,integer}层 try，目前{0,number,integer}层。
 no.array.trailing.comma=數組不應包含結尾逗號。
 no.enum.trailing.comma=枚举不应包含结尾逗号。
-overload.methods.declaration=所有重载的方法都应该相邻放置。在相同类型的重载方法之间放置非重载方法是违反的。最后一个重载方法在行 ''{0}'' 上。
+overload.methods.declaration=所有重载方法应彼此相邻放置。上一个重载方法位于 ''{0}'' 行。
 parameter.assignment=不应对方法参数''{0}''赋值。
 require.this.method=对方法 ''{0}'' 的调用需要 "{1}this."。
 require.this.variable=对实例属性 ''{0}'' 的引用需要 "{1}this."。
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/messages_zh.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/messages_zh.properties
index 08c6aa3c126..4b5d1b01b9d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/messages_zh.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/messages_zh.properties
@@ -22,7 +22,7 @@ javadoc.paragraph.misplaced.tag=<p> 标签应在第一个字符之前，紧邻
 javadoc.paragraph.redundant.paragraph=多余的 <p> 标签。
 javadoc.paragraph.tag.after=空行后应有 <p> 标签。
 javadoc.parse.rule.error=Javadoc 第 {0} 个字符解析错误。解析 {2} ，详情： {1}
-javadoc.return.expected=@return標籤應存在並具有說明。
+javadoc.return.expected=@return标签应存在并具有说明。
 javadoc.tag.line.before=Javadoc tag ''{0}'' 前面应有一个空行。
 javadoc.unclosedHtml=未关闭的 HTML 标签： {0} 。
 javadoc.unknownTag=未知标签 ''{0}'' 。
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages_zh.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages_zh.properties
index 03b52d4d92d..a9b280aecbc 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages_zh.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages_zh.properties
@@ -13,7 +13,7 @@ todo.match=TODO块： ''{0}'' 。
 trailing.comments=不要使用行尾注释。
 translation.missingKey=找不到 Key ： ''{0}''。
 translation.missingTranslationFile=找不到配置文件： ''{0}'' 。
-translation.wrongLanguageCode=指定的語言代碼 ''{0}'' 是不正確。
+translation.wrongLanguageCode=指定的语言代码 ''{0}'' 是不正确。
 type.file.mismatch=顶级类名称与源文件名不同。
 unable.open=无法打开： ''{0}'' 。
 unable.open.cause=无法打开： ''{0}'': {1}.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageLexer.g4 b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageLexer.g4
index 945c95db708..11ce6dff5ce 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageLexer.g4
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageLexer.g4
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -110,11 +110,18 @@ tokens {
 
     LITERAL_NON_SEALED, LITERAL_SEALED, LITERAL_PERMITS,
     PERMITS_CLAUSE, PATTERN_DEF, LITERAL_WHEN,
-    RECORD_PATTERN_DEF, RECORD_PATTERN_COMPONENTS
+    RECORD_PATTERN_DEF, RECORD_PATTERN_COMPONENTS,
+
+    STRING_TEMPLATE_BEGIN, STRING_TEMPLATE_MID, STRING_TEMPLATE_END,
+    STRING_TEMPLATE_CONTENT, EMBEDDED_EXPRESSION_BEGIN, EMBEDDED_EXPRESSION,
+    EMBEDDED_EXPRESSION_END,
+
+    LITERAL_UNDERSCORE, UNNAMED_PATTERN_DEF
 }
 
 @header {
 import com.puppycrawl.tools.checkstyle.grammar.CommentListener;
+import com.puppycrawl.tools.checkstyle.grammar.CompositeLexerContextCache;
 import com.puppycrawl.tools.checkstyle.grammar.CrAwareLexerSimulator;
 }
 
@@ -133,21 +140,27 @@ import com.puppycrawl.tools.checkstyle.grammar.CrAwareLexerSimulator;
     }
 
     private CommentListener commentListener = null;
+    private CompositeLexerContextCache contextCache = null;
 
     /**
      * Sets the CommentListener for the lexer.
      *
      * @param commentListener the commentListener to use in this lexer
      */
-    public void setCommentListener(CommentListener commentListener){
+    public void setCommentListener(CommentListener commentListener) {
             this.commentListener = commentListener;
     }
 
+    public void setContextCache(CompositeLexerContextCache contextCache) {
+        this.contextCache = contextCache;
+    }
+
     /** Tracks the starting line of a block comment. */
     int startLine = -1;
 
     /** Tracks the starting column of a block comment. */
     int startCol = -1;
+
 }
 
 // Keywords and restricted identifiers
@@ -160,7 +173,6 @@ LITERAL_CASE:            'case';
 LITERAL_CATCH:           'catch';
 LITERAL_CHAR:            'char';
 LITERAL_CLASS:           'class';
-LITERAL_CONST:           'const';
 LITERAL_CONTINUE:        'continue';
 LITERAL_DEFAULT:         'default';
 LITERAL_DO:              'do';
@@ -173,7 +185,6 @@ LITERAL_FINALLY:         'finally';
 LITERAL_FLOAT:           'float';
 LITERAL_FOR:             'for';
 LITERAL_IF:              'if';
-LITERAL_GOTO:            'goto';
 LITERAL_IMPLEMENTS:      'implements';
 IMPORT:                  'import';
 LITERAL_INSTANCEOF:      'instanceof';
@@ -207,6 +218,7 @@ LITERAL_NON_SEALED:      'non-sealed';
 LITERAL_SEALED:          'sealed';
 LITERAL_PERMITS:         'permits';
 LITERAL_WHEN:            'when';
+LITERAL_UNDERSCORE:      '_';
 
 // Literals
 DECIMAL_LITERAL_LONG:    ('0' | [1-9] (Digits? | '_'+ Digits)) [lL];
@@ -242,7 +254,14 @@ LITERAL_FALSE:           'false';
 
 CHAR_LITERAL:            '\'' (EscapeSequence | ~['\\\r\n]) '\'';
 
-STRING_LITERAL:          '"' (EscapeSequence | ~["\\\r\n])* '"';
+fragment StringFragment: (EscapeSequence | ~["\\\r\n]);
+
+STRING_LITERAL:         '"' StringFragment* '"';
+
+STRING_TEMPLATE_BEGIN:  '"'
+                        { _input.LA(1) != '"' }?
+                        { contextCache.enterTemplateContext(StringTemplate); }
+                        ;
 
 TEXT_BLOCK_LITERAL_BEGIN: '"' '"' '"' -> pushMode(TextBlock);
 
@@ -252,8 +271,12 @@ LITERAL_NULL:            'null';
 
 LPAREN:                  '(';
 RPAREN:                  ')';
-LCURLY:                  '{';
-RCURLY:                  '}';
+LCURLY:                  '{'
+                         { contextCache.updateLeftCurlyBraceContext(); }
+                         ;
+RCURLY:                  '}'
+                         { contextCache.updateRightCurlyBraceContext(); }
+                         ;
 LBRACK:                  '[';
 RBRACK:                  ']';
 SEMI:                    ';';
@@ -311,6 +334,42 @@ DOUBLE_COLON:            '::';
 AT:                      '@';
 ELLIPSIS:                '...';
 
+// String templates
+
+
+// Text block fragments
+
+fragment TextBlockContent
+    : ( TwoDoubleQuotes
+      | OneDoubleQuote
+      | Newline
+      | TextBlockCharacter
+      )+
+    ;
+
+fragment TextBlockCharacter
+    : ~["\\]
+    | TextBlockStandardEscape
+    | EscapeSequence
+    ;
+
+fragment TextBlockStandardEscape
+    : '\\' ( [btnfrs'\\] | Newline | OneDoubleQuote )
+    ;
+
+fragment Newline
+    : '\n'
+    | '\r' ( '\n' )?
+    ;
+
+fragment TwoDoubleQuotes
+    : { _input.LA(3) != '"' }? '"' '"'
+    ;
+
+fragment OneDoubleQuote
+    : { _input.LA(2) != '"' }? '"'
+    ;
+
 // Whitespace and comments
 
 WS:                      [ \t\r\n\u000C]+ -> skip;
@@ -402,32 +461,18 @@ fragment Letter
 
 // Text block lexical mode
 mode TextBlock;
-    TEXT_BLOCK_CONTENT
-        : ( TwoDoubleQuotes
-          | OneDoubleQuote
-          | Newline
-          | ~'"'
-          | TextBlockStandardEscape
-          )+
-        ;
+
+    TEXT_BLOCK_CONTENT: TextBlockContent;
 
     TEXT_BLOCK_LITERAL_END
         : '"' '"' '"' -> popMode
         ;
 
-    // Text block fragment rules
-    fragment TextBlockStandardEscape
-        :   '\\' [btnfrs"'\\]
-        ;
+// String template lexical mode
+mode StringTemplate;
 
-    fragment Newline
-        :  '\n' | '\r' ('\n')?
-        ;
+    STRING_TEMPLATE_CONTENT: StringFragment+;
 
-    fragment TwoDoubleQuotes
-        :   '"''"' ( Newline | ~'"' )
-        ;
+    EMBEDDED_EXPRESSION_BEGIN: '\\' '{' -> pushMode(DEFAULT_MODE);
 
-    fragment OneDoubleQuote
-        :   '"' ( Newline | ~'"' )
-        ;
+    STRING_TEMPLATE_END:  '"' { contextCache.exitTemplateContext(); };
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageParser.g4 b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageParser.g4
index 13452fb5e8a..c9fe0c4fdd0 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageParser.g4
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/java/JavaLanguageParser.g4
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -688,6 +688,7 @@ expression
 
 expr
     : primary                                                              #primaryExp
+    | expr DOT templateArgument                                            #templateExp
     | expr bop=DOT id                                                      #refOp
     | expr bop=DOT id LPAREN expressionList? RPAREN                        #methodCall
     | expr bop=DOT LITERAL_THIS                                            #thisExp
@@ -757,6 +758,41 @@ primary
       DOT LITERAL_CLASS                                                    #primitivePrimary
     ;
 
+templateArgument
+    : template
+    | STRING_LITERAL
+    ;
+
+template
+    : stringTemplate
+    ;
+
+stringTemplate
+    : stringTemplateBegin expr? stringTemplateMiddle* stringTemplateEnd
+    ;
+
+stringTemplateMiddle
+    : stringTemplateMid expr?
+    ;
+
+stringTemplateBegin
+    : STRING_TEMPLATE_BEGIN
+      STRING_TEMPLATE_CONTENT?
+      EMBEDDED_EXPRESSION_BEGIN
+    ;
+
+stringTemplateMid
+    : EMBEDDED_EXPRESSION_END
+      STRING_TEMPLATE_CONTENT?
+      EMBEDDED_EXPRESSION_BEGIN
+    ;
+
+stringTemplateEnd
+    : EMBEDDED_EXPRESSION_END
+      STRING_TEMPLATE_CONTENT?
+      STRING_TEMPLATE_END
+    ;
+
 classType
     : (classOrInterfaceType[false] DOT)? annotations[false] id typeArguments?
     ;
@@ -895,7 +931,8 @@ primaryPattern
     ;
 
 typePattern
-    : mods+=modifier* type=typeType[true] id
+    : mods+=modifier* type=typeType[true] id             #typePatternDef
+    | LITERAL_UNDERSCORE                                 #unnamedPatternDef
     ;
 
 recordPattern
@@ -911,7 +948,8 @@ permittedSubclassesAndInterfaces
     ;
 
 // Handle the 'keyword as identifier' problem
-id  : LITERAL_RECORD
+id:  LITERAL_UNDERSCORE
+    | LITERAL_RECORD
     | LITERAL_YIELD
     | LITERAL_NON_SEALED
     | LITERAL_SEALED
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocLexer.g4 b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocLexer.g4
index fb72ca3993f..b1df3d0b792 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocLexer.g4
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocLexer.g4
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParser.g4 b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParser.g4
index 13e751e9a00..bd92eab5834 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParser.g4
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParser.g4
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages.properties
index f06a4ec2b97..d8062616914 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages.properties
@@ -1,12 +1,14 @@
+Checker.finishLocalSetup=if no custom moduleFactory is set, moduleClassLoader must be specified
+Checker.processFilesException=Exception was thrown while processing {0}
+Checker.setCharset=unsupported charset: ''{0}''
+Checker.setupChildModule=cannot initialize module {0} - {1}
+Checker.setupChildNotAllowed={0} is not allowed as a child in Checker
 DefaultLogger.addException=Error auditing {0}
 DefaultLogger.auditFinished=Audit done.
 DefaultLogger.auditStarted=Starting audit...
 general.exception=Got an exception - {0}
 general.fileNotFound=File not found!
 Main.createListener=Invalid output format. Found ''{0}'' but expected ''{1}'' or ''{2}''.
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle ends with {0} errors.
 Main.loadProperties=Unable to load properties from file ''{0}''.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=In config there is ''{0}'', \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_de.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_de.properties
index 79ccdb51bae..7af9706651f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_de.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_de.properties
@@ -1,12 +1,15 @@
+Checker.finishLocalSetup=wenn kein Brauch moduleFactory eingestellt ist, moduleClassLoader \
+  muss angegeben werden
+Checker.processFilesException=Während der Verarbeitung wurde eine Ausnahme ausgelöst {0}
+Checker.setCharset=Nicht unterstützter Zeichensatz: ''{0}''
+Checker.setupChildModule=Modul kann nicht initialisiert werden {0} - {1}
+Checker.setupChildNotAllowed={0} ist als Kind nicht erlaubt Checker
 DefaultLogger.addException=Fehler beim Prüfen von {0}
 DefaultLogger.auditFinished=Prüfung beendet.
 DefaultLogger.auditStarted=Beginne Prüfung...
 general.exception=Ein Fehler ist aufgetreten - {0}
 general.fileNotFound=Datei nicht gefunden!
 Main.createListener=Ungültiges Ausgabeformat. Gefunden ''{0}'', aber ''{1}'' oder ''{2}'' erwartet.
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle endet mit {0} Fehlern.
 Main.loadProperties=Die Eigenschaften von Datei ''{0}'' können nicht geladen werden.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=In der Konfiguration gibt es ''{0}'', \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_es.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_es.properties
index f2f5f37fb28..20ca8751f73 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_es.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_es.properties
@@ -1,12 +1,15 @@
+Checker.finishLocalSetup=si no hay costumbre moduleFactory Está establecido, \
+  moduleClassLoader debe ser especificado
+Checker.processFilesException=Se lanzó una excepción durante el procesamiento {0}
+Checker.setCharset=juego de caracteres no soportado: ''{0}''
+Checker.setupChildModule=no se puede inicializar el módulo {0} - {1}
+Checker.setupChildNotAllowed={0} No está permitido como niña en Checker
 DefaultLogger.addException=Error auditando {0}
 DefaultLogger.auditFinished=Auditoría concluida.
 DefaultLogger.auditStarted=Comenzando auditoría...
 general.exception=Ocurrió una excepción - {0}
 general.fileNotFound=¡Fichero no encontrado!
 Main.createListener=Formato de salida no válido. Encontrado ''{0}'' pero esperado ''{1}'' o ''{2}''.
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle termina con {0} errores.
 Main.loadProperties=No se pueden cargar las propiedades del archivo ''{0}''.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=En configuración hay ''{0}'', \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fi.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fi.properties
index 19019e8cf17..d5703c1b5a5 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fi.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fi.properties
@@ -1,12 +1,15 @@
+Checker.finishLocalSetup=jos ei ole tapaa moduleFactory on asetettu, moduleClassLoader \
+  on täsmennettävä
+Checker.processFilesException=Poikkeus tehtiin käsittelyn aikana {0}
+Checker.setCharset=ei-tuettu merkkisarja: ''{0}''
+Checker.setupChildModule=moduulia ei voi alustaa {0} - {1}
+Checker.setupChildNotAllowed={0} ei saa lapsena sisään Checker
 DefaultLogger.addException=Virhe {0}:n tarkistuksessa
 DefaultLogger.auditFinished=Tarkistus valmis.
 DefaultLogger.auditStarted=Aloitetaan tarkistus...
 general.exception=Poikkeus - {0}
 general.fileNotFound=Tiedostoa ei löydy!
 Main.createListener=Virheellinen tulostusmuoto. Löytyi ''{0}'' mutta odotti ''{1}'' tai ''{2}''.
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle päättyy {0} virheellä.
 Main.loadProperties=Ominaisuuksia ei voi ladata tiedostosta ''{0}''.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=Konfigissa on ''{0}'', \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fr.properties
index 873052b4bca..e8697ab50ff 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fr.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_fr.properties
@@ -1,12 +1,15 @@
+Checker.finishLocalSetup=si pas de coutume moduleFactory est réglé, \
+  moduleClassLoader il faut préciser
+Checker.processFilesException=Une exception a été levée lors du traitement {0}
+Checker.setCharset=jeu de caractères non pris en charge: ''{0}''
+Checker.setupChildModule=impossible d initialiser le module {0} - {1}
+Checker.setupChildNotAllowed={0} n'est pas autorisé en tant qu'enfant à Checker
 DefaultLogger.addException=Une erreur est survenue {0}
 DefaultLogger.auditFinished=Vérification terminée.
 DefaultLogger.auditStarted=Début de la vérification...
 general.exception=Exception levée : {0}
 general.fileNotFound=Fichier non trouvé !
 Main.createListener=Format de sortie invalide. Trouvé ''{0}'' mais attendu ''{1}'' ou ''{2}''.
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle se termine par {0} erreurs.
 Main.loadProperties=Impossible de charger des propriétés à partir du fichier ''{0}''.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=Dans la configuration il y a ''{0}'', \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ja.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ja.properties
index 10b36a18c2d..b5234f0cf28 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ja.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ja.properties
@@ -1,12 +1,15 @@
+Checker.finishLocalSetup=習慣がなければ moduleFactory 設定されています, \
+  moduleClassLoader 指定する必要があります
+Checker.processFilesException=処理中に例外がスローされました {0}
+Checker.setCharset=サポートされていない文字セット: ''{0}''
+Checker.setupChildModule=モジュールを初期化できません {0} - {1}
+Checker.setupChildNotAllowed={0} では子供として許可されていません Checker
 DefaultLogger.addException={0} を監査中のエラー
 DefaultLogger.auditFinished=監査が完了しました。
 DefaultLogger.auditStarted=監査を開始しています...
 general.exception=例外が発生しました - {0}
 general.fileNotFound=ファイルが見つかりません！
 Main.createListener=無効な出力形式です。''{0}'' 名が見つかりましたが、''{1}'' 名か ''{2}'' 名です。
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyleは {0} 個のエラーで終了します。
 Main.loadProperties=ファイル ''{0}'' からプロパティを読み込めません。
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=設定には ''{0}''がありますが、\
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_pt.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_pt.properties
index dfe032c7a7c..a6aff0aff76 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_pt.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_pt.properties
@@ -1,12 +1,15 @@
+Checker.finishLocalSetup=se não houver costume moduleFactory está definido, \
+  moduleClassLoader deve ser especificado
+Checker.processFilesException=Exceção foi lançada durante o processamento {0}
+Checker.setCharset=conjunto de caracteres não suportado: ''{0}''
+Checker.setupChildModule=não é possível inicializar o módulo {0} - {1}
+Checker.setupChildNotAllowed={0} não é permitido quando criança Checker
 DefaultLogger.addException=Erro ao auditar {0}
 DefaultLogger.auditFinished=Auditoria completa.
 DefaultLogger.auditStarted=Iniciando a auditoria...
 general.exception=Foi capturada uma exceção - {0}
 general.fileNotFound=Arquivo não encontrado!
 Main.createListener=O formato de saída é inválido. Foi encontrado ''{0}'', mas esperava ''{1}'' ou ''{2}''.
-#
-# for Main.java
-#
 Main.errorCounter=O Checkstyle terminou com {0} erros.
 Main.loadProperties=Não foi possível carregar propriedades do arquivo ''{0}''.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=Na configuração há ''{0}'', \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ru.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ru.properties
index 400ecba1d7a..ccbc5486693 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ru.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_ru.properties
@@ -1,12 +1,15 @@
+Checker.finishLocalSetup=если нет обычая moduleFactory установлен, \
+  moduleClassLoader должно быть указано
+Checker.processFilesException=Исключение возникло при обработке {0}
+Checker.setCharset=неподдерживаемая кодировка: ''{0}''
+Checker.setupChildModule=не могу инициализировать модуль {0} - {1}
+Checker.setupChildNotAllowed={0} не разрешен в качестве вложенного модуля в Checker
 DefaultLogger.addException=Ошибка проверки {0}
 DefaultLogger.auditFinished=Проверка завершена.
 DefaultLogger.auditStarted=Начинаем проверку...
 general.exception=Поймано исключение {0}
 general.fileNotFound=Файл не найден!
 Main.createListener=Недопустимый формат вывода. Найдено ''{0}'', но ожидалось ''{1}'' или ''{2}''.
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle заканчивается с количеством ошибок {0}.
 Main.loadProperties=Не удалось загрузить свойства из файла ''{0}''.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=В конфигурации есть ''{0}'', \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_tr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_tr.properties
index 01dde4ed4b9..bdd55fd43fd 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_tr.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_tr.properties
@@ -1,12 +1,14 @@
+Checker.finishLocalSetup=özel değilse moduleFactory ayarlandı, moduleClassLoader belirtilmeli
+Checker.processFilesException=İşlenirken istisna atıldı {0}
+Checker.setCharset=desteklenmeyen karakter kümesi: ''{0}''
+Checker.setupChildModule=modül başlatılamıyor {0} - {1}
+Checker.setupChildNotAllowed={0} çocukken girilmesine izin verilmiyor Checker
 DefaultLogger.addException={0} denetlenirken hata oluştu
 DefaultLogger.auditFinished=Denetleme tamamlandı.
 DefaultLogger.auditStarted=Denetleme başlıyor...
 general.exception=Bir istisna yakalandı - {0}
 general.fileNotFound=Dosya bulunamadı!
 Main.createListener=Geçersiz çıktı biçimi. ''{0}'' ancak beklenen ''{1}'' veya ''{2}'' bulundu.
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle {0} hatayla bitiyor.
 Main.loadProperties=''{0}'' dosyasından özellik yüklenemiyor.
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=Yapılandırmada ''{0}'' var, \
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_zh.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_zh.properties
index 2b24bb6cced..595b04e9de7 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/messages_zh.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/messages_zh.properties
@@ -1,12 +1,14 @@
+Checker.finishLocalSetup=如果没有定制 moduleFactory 已设置, moduleClassLoader 必须指定
+Checker.processFilesException=处理时抛出异常 {0}
+Checker.setCharset=不支持的字符集: ''{0}''
+Checker.setupChildModule=无法初始化模块 {0} - {1}
+Checker.setupChildNotAllowed={0} 不允许作为Checker的子模块
 DefaultLogger.addException=检查错误： {0}
 DefaultLogger.auditFinished=检查完成。
 DefaultLogger.auditStarted=开始检查……
 general.exception=异常 - {0}
 general.fileNotFound=找不到文件！
 Main.createListener=非法的输出格式。预期为 ''{1}'' 或 ''{2}''，但实际为 ''{0}''。
-#
-# for Main.java
-#
 Main.errorCounter=Checkstyle以 {0} 个错误结束。
 Main.loadProperties=无法从文件 ''{0}'' 中加载属性。
 PackageObjectFactory.ambiguousModuleNameExceptionMessage=配置文件中出现 ''{0}''，\
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/AvoidEscapedUnicodeCharactersCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/AvoidEscapedUnicodeCharactersCheck.xml
index 3be5cc38bbc..0a09a1ce4ce 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/AvoidEscapedUnicodeCharactersCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/AvoidEscapedUnicodeCharactersCheck.xml
@@ -16,15 +16,15 @@
  allow using escapes if literal contains only them.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="false" name="allowByTailComment" type="boolean">
+               <description>Allow use escapes if trail comment is present.</description>
+            </property>
             <property default-value="false"
                       name="allowEscapesForControlCharacters"
                       type="boolean">
                <description>Allow use escapes for
  non-printable, control characters.</description>
             </property>
-            <property default-value="false" name="allowByTailComment" type="boolean">
-               <description>Allow use escapes if trail comment is present.</description>
-            </property>
             <property default-value="false"
                       name="allowIfAllCharactersEscaped"
                       type="boolean">
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/DescendantTokenCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/DescendantTokenCheck.xml
index f8dababc64e..9d407039b15 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/DescendantTokenCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/DescendantTokenCheck.xml
@@ -22,29 +22,29 @@
                       validation-type="tokenTypesSet">
                <description>Specify set of tokens with limited occurrences as descendants.</description>
             </property>
-            <property default-value="0" name="minimumDepth" type="int">
-               <description>Specify the minimum depth for descendant counts.</description>
-            </property>
             <property default-value="2147483647" name="maximumDepth" type="int">
                <description>Specify the maximum depth for descendant counts.</description>
             </property>
-            <property default-value="0" name="minimumNumber" type="int">
-               <description>Specify a minimum count for descendants.</description>
+            <property name="maximumMessage" type="java.lang.String">
+               <description>Define the violation message
+ when the maximum count is exceeded.</description>
             </property>
             <property default-value="2147483647" name="maximumNumber" type="int">
                <description>Specify a maximum count for descendants.</description>
             </property>
-            <property default-value="false" name="sumTokenCounts" type="boolean">
-               <description>Control whether the number of tokens found
- should be calculated from the sum of the individual token counts.</description>
+            <property default-value="0" name="minimumDepth" type="int">
+               <description>Specify the minimum depth for descendant counts.</description>
             </property>
             <property name="minimumMessage" type="java.lang.String">
                <description>Define the violation message
  when the minimum count is not reached.</description>
             </property>
-            <property name="maximumMessage" type="java.lang.String">
-               <description>Define the violation message
- when the maximum count is exceeded.</description>
+            <property default-value="0" name="minimumNumber" type="int">
+               <description>Specify a minimum count for descendants.</description>
+            </property>
+            <property default-value="false" name="sumTokenCounts" type="boolean">
+               <description>Control whether the number of tokens found
+ should be calculated from the sum of the individual token counts.</description>
             </property>
             <property default-value="" name="tokens" type="anyTokenTypesSet">
                <description>tokens to check</description>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NewlineAtEndOfFileCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NewlineAtEndOfFileCheck.xml
index d20d8b386a2..7209c3ddb74 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NewlineAtEndOfFileCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NewlineAtEndOfFileCheck.xml
@@ -48,14 +48,14 @@
  platforms, with the {@code lineSeparator} property.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="" name="fileExtensions" type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
+            </property>
             <property default-value="lf_cr_crlf"
                       name="lineSeparator"
                       type="com.puppycrawl.tools.checkstyle.checks.LineSeparatorOption">
                <description>Specify the type of line separator.</description>
             </property>
-            <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify the file type extension of the files to check.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="noNewlineAtEOF"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NoCodeInFileCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NoCodeInFileCheck.xml
index 370e549287f..b00ea38f69f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NoCodeInFileCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/NoCodeInFileCheck.xml
@@ -5,7 +5,9 @@
              name="NoCodeInFile"
              parent="com.puppycrawl.tools.checkstyle.TreeWalker">
          <description>&lt;p&gt;
- Checks whether file contains code. Files which are considered to have no code:
+ Checks whether file contains code.
+ Java compiler is not raising errors on files with no code or all commented out.
+ Files which are considered to have no code:
  &lt;/p&gt;
  &lt;ul&gt;
  &lt;li&gt;
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/OrderedPropertiesCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/OrderedPropertiesCheck.xml
index 4b147cd8917..cbf10ac2bf7 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/OrderedPropertiesCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/OrderedPropertiesCheck.xml
@@ -24,7 +24,7 @@
             <property default-value=".properties"
                       name="fileExtensions"
                       type="java.lang.String[]">
-               <description>Specify file type extension of the files to check.</description>
+               <description>Specify the file extensions of the files to process.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/SuppressWarningsHolder.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/SuppressWarningsHolder.xml
index 4faaae77bf8..2b3d631fccf 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/SuppressWarningsHolder.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/SuppressWarningsHolder.xml
@@ -14,9 +14,10 @@
  You can also define aliases for check names that need to be suppressed.
  &lt;/p&gt;</description>
          <properties>
-            <property name="aliasList" type="java.lang.String[]">
+            <property default-value="" name="aliasList" type="java.lang.String[]">
                <description>Specify aliases for check names that can be used in code
- within {@code SuppressWarnings}.</description>
+ within {@code SuppressWarnings} in a format of comma separated attribute=value entries.
+ The attribute is the fully qualified name of the Check and value is its alias.</description>
             </property>
          </properties>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/TranslationCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/TranslationCheck.xml
index a4481897e08..65f883404e0 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/TranslationCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/TranslationCheck.xml
@@ -44,6 +44,11 @@
  of default translation files in project.
  &lt;/p&gt;
  &lt;p&gt;
+ Note: If your project uses preprocessed translation files and the original files do not have the
+ {@code properties} extension, you can specify additional file extensions
+ via the {@code fileExtensions} property.
+ &lt;/p&gt;
+ &lt;p&gt;
  Attention: the check will perform the validation of ISO codes if the option
  is used. So, if you specify, for example, "mm" for language code,
  TranslationCheck will rise violation that the language code is incorrect.
@@ -55,14 +60,6 @@
  &lt;a href="https://github.com/checkstyle/checkstyle/issues/3539"&gt;issue&lt;/a&gt;.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value=".properties"
-                      name="fileExtensions"
-                      type="java.lang.String[]">
-               <description>Specify file type extension to identify
- translation files. Setting this property is typically only required if your
- translation files are preprocessed and the original files do not have
- the extension {@code .properties}</description>
-            </property>
             <property default-value="^messages.*$"
                       name="baseName"
                       type="java.util.regex.Pattern">
@@ -71,6 +68,11 @@
  Base name&lt;/a&gt; of resource bundles which contain message resources.
  It helps the check to distinguish config and localization resources.</description>
             </property>
+            <property default-value=".properties"
+                      name="fileExtensions"
+                      type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
+            </property>
             <property default-value=""
                       name="requiredTranslations"
                       type="java.lang.String[]">
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/UniquePropertiesCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/UniquePropertiesCheck.xml
index 3f88a3fe806..db59cd2308f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/UniquePropertiesCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/UniquePropertiesCheck.xml
@@ -16,7 +16,7 @@
             <property default-value=".properties"
                       name="fileExtensions"
                       type="java.lang.String[]">
-               <description>Specify file type extension of the files to check.</description>
+               <description>Specify the file extensions of the files to process.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationLocationCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationLocationCheck.xml
index 16ce5ec6cbe..fe6c510b773 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationLocationCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationLocationCheck.xml
@@ -40,17 +40,17 @@
                       type="boolean">
                <description>Allow annotation(s) to be located on
  the same line as target element.</description>
-            </property>
-            <property default-value="true"
-                      name="allowSamelineSingleParameterlessAnnotation"
-                      type="boolean">
-               <description>Allow single parameterless
- annotation to be located on the same line as target element.</description>
             </property>
             <property default-value="false"
                       name="allowSamelineParameterizedAnnotation"
                       type="boolean">
                <description>Allow one and only parameterized
+ annotation to be located on the same line as target element.</description>
+            </property>
+            <property default-value="true"
+                      name="allowSamelineSingleParameterlessAnnotation"
+                      type="boolean">
+               <description>Allow single parameterless
  annotation to be located on the same line as target element.</description>
             </property>
             <property default-value="CLASS_DEF,INTERFACE_DEF,PACKAGE_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,RECORD_DEF,COMPACT_CTOR_DEF"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationUseStyleCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationUseStyleCheck.xml
index d17dcc789a3..b157fed208b 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationUseStyleCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/AnnotationUseStyleCheck.xml
@@ -74,16 +74,16 @@
  Java Language specification, &amp;#167;9.7&lt;/a&gt;.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="compact_no_array"
-                      name="elementStyle"
-                      type="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ElementStyleOption">
-               <description>Define the annotation element styles.</description>
-            </property>
             <property default-value="never"
                       name="closingParens"
                       type="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ClosingParensOption">
                <description>Define the policy for ending parenthesis.</description>
             </property>
+            <property default-value="compact_no_array"
+                      name="elementStyle"
+                      type="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$ElementStyleOption">
+               <description>Define the annotation element styles.</description>
+            </property>
             <property default-value="never"
                       name="trailingArrayComma"
                       type="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck$TrailingArrayCommaOption">
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/MissingDeprecatedCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/MissingDeprecatedCheck.xml
index 057a240c5cd..58f4e5c90a5 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/MissingDeprecatedCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/annotation/MissingDeprecatedCheck.xml
@@ -54,6 +54,7 @@
             <message-key key="javadoc.duplicateTag"/>
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
          </message-keys>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyBlockCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyBlockCheck.xml
index bca8b931f7c..285795a6f2b 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyBlockCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyBlockCheck.xml
@@ -26,7 +26,7 @@
             <property default-value="statement"
                       name="option"
                       type="com.puppycrawl.tools.checkstyle.checks.blocks.BlockOption">
-               <description>specify the policy on block contents.</description>
+               <description>Specify the policy on block contents.</description>
             </property>
             <property default-value="LITERAL_WHILE,LITERAL_TRY,LITERAL_FINALLY,LITERAL_DO,LITERAL_IF,LITERAL_ELSE,LITERAL_FOR,INSTANCE_INIT,STATIC_INIT,LITERAL_SWITCH,LITERAL_SYNCHRONIZED"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyCatchBlockCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyCatchBlockCheck.xml
index a8ddfcbb04e..536fd5d9bf6 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyCatchBlockCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/EmptyCatchBlockCheck.xml
@@ -14,13 +14,6 @@
  If both options are specified - they are applied by &lt;b&gt;any of them is matching&lt;/b&gt;.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^$"
-                      name="exceptionVariableName"
-                      type="java.util.regex.Pattern">
-               <description>Specify the RegExp for the name of the variable
- associated with exception. If check meets variable name matching specified value empty
- block is suppressed.</description>
-            </property>
             <property default-value=".*"
                       name="commentFormat"
                       type="java.util.regex.Pattern">
@@ -28,6 +21,13 @@
  catch block. If check meets comment inside empty catch block matching specified format
  empty block is suppressed. If it is multi-line comment only its first line is analyzed.</description>
             </property>
+            <property default-value="^$"
+                      name="exceptionVariableName"
+                      type="java.util.regex.Pattern">
+               <description>Specify the RegExp for the name of the variable
+ associated with exception. If check meets variable name matching specified value empty
+ block is suppressed.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="catch.block.empty"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/LeftCurlyCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/LeftCurlyCheck.xml
index 5ddd5378dc0..32142353b19 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/LeftCurlyCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/LeftCurlyCheck.xml
@@ -8,15 +8,15 @@
  Checks for the placement of left curly braces (&lt;code&gt;'{'&lt;/code&gt;) for code blocks.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="true" name="ignoreEnums" type="boolean">
+               <description>Allow to ignore enums when left curly brace policy is EOL.</description>
+            </property>
             <property default-value="eol"
                       name="option"
                       type="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyOption">
                <description>Specify the policy on placement of a left curly brace
  (&lt;code&gt;'{'&lt;/code&gt;).</description>
             </property>
-            <property default-value="true" name="ignoreEnums" type="boolean">
-               <description>Allow to ignore enums when left curly brace policy is EOL.</description>
-            </property>
             <property default-value="ANNOTATION_DEF,CLASS_DEF,CTOR_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,INTERFACE_DEF,LAMBDA,LITERAL_CASE,LITERAL_CATCH,LITERAL_DEFAULT,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,METHOD_DEF,OBJBLOCK,STATIC_INIT,RECORD_DEF,COMPACT_CTOR_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/NeedBracesCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/NeedBracesCheck.xml
index 5e81aa0da3b..5b2ddb05bf9 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/NeedBracesCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/NeedBracesCheck.xml
@@ -8,13 +8,13 @@
  Checks for braces around code blocks.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="false" name="allowEmptyLoopBody" type="boolean">
+               <description>Allow loops with empty bodies.</description>
+            </property>
             <property default-value="false"
                       name="allowSingleLineStatement"
                       type="boolean">
-               <description>allow single-line statements without braces.</description>
-            </property>
-            <property default-value="false" name="allowEmptyLoopBody" type="boolean">
-               <description>allow loops with empty bodies.</description>
+               <description>Allow single-line statements without braces.</description>
             </property>
             <property default-value="LITERAL_DO,LITERAL_ELSE,LITERAL_FOR,LITERAL_IF,LITERAL_WHILE"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/RightCurlyCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/RightCurlyCheck.xml
index e28034710f2..274b71e2c50 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/RightCurlyCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/blocks/RightCurlyCheck.xml
@@ -6,8 +6,8 @@
              parent="com.puppycrawl.tools.checkstyle.TreeWalker">
          <description>&lt;p&gt;
  Checks the placement of right curly braces (&lt;code&gt;'}'&lt;/code&gt;) for code blocks. This check
- supports if-else, try-catch-finally blocks, switch statements, while-loops, for-loops,
- method definitions, class definitions, constructor definitions,
+ supports if-else, try-catch-finally blocks, switch statements, switch cases, while-loops,
+  for-loops, method definitions, class definitions, constructor definitions,
  instance, static initialization blocks, annotation definitions and enum definitions.
  For right curly brace of expression blocks of arrays, lambdas and class instances
  please follow issue
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ConstructorsDeclarationGroupingCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ConstructorsDeclarationGroupingCheck.xml
new file mode 100644
index 00000000000..11b912d9cb8
--- /dev/null
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ConstructorsDeclarationGroupingCheck.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle-metadata>
+   <module>
+      <check fully-qualified-name="com.puppycrawl.tools.checkstyle.checks.coding.ConstructorsDeclarationGroupingCheck"
+             name="ConstructorsDeclarationGrouping"
+             parent="com.puppycrawl.tools.checkstyle.TreeWalker">
+         <description>&lt;p&gt;
+ Checks that all constructors are grouped together.
+ If there is any non-constructor code separating constructors,
+ this check identifies and logs a violation for those ungrouped constructors.
+ The violation message will specify the line number of the last grouped constructor.
+ Comments between constructors are allowed.
+ &lt;/p&gt;
+ &lt;p&gt;
+ Rationale: Grouping constructors together in a class improves code readability
+ and maintainability. It allows developers to easily understand
+ the different ways an object can be instantiated
+ and the tasks performed by each constructor.
+ &lt;/p&gt;</description>
+         <message-keys>
+            <message-key key="constructors.declaration.grouping"/>
+         </message-keys>
+      </check>
+   </module>
+</checkstyle-metadata>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/DeclarationOrderCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/DeclarationOrderCheck.xml
index b0f99807d5b..b1355c9e37a 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/DeclarationOrderCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/DeclarationOrderCheck.xml
@@ -45,10 +45,10 @@
  &lt;/pre&gt;</description>
          <properties>
             <property default-value="false" name="ignoreConstructors" type="boolean">
-               <description>control whether to ignore constructors.</description>
+               <description>Control whether to ignore constructors.</description>
             </property>
             <property default-value="false" name="ignoreModifiers" type="boolean">
-               <description>control whether to ignore modifiers (fields, ...).</description>
+               <description>Control whether to ignore modifiers (fields, ...).</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ExplicitInitializationCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ExplicitInitializationCheck.xml
index c09ece8261e..b9faeda14cd 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ExplicitInitializationCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ExplicitInitializationCheck.xml
@@ -20,7 +20,7 @@
  &lt;/p&gt;</description>
          <properties>
             <property default-value="false" name="onlyObjectReferences" type="boolean">
-               <description>control whether only explicit
+               <description>Control whether only explicit
  initializations made to null for objects should be checked.</description>
             </property>
          </properties>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/HiddenFieldCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/HiddenFieldCheck.xml
index 0bfe6cc4dd5..2d78b9cfc51 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/HiddenFieldCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/HiddenFieldCheck.xml
@@ -43,25 +43,25 @@
  &lt;em&gt;ignoreSetter&lt;/em&gt; is set to true.
  &lt;/p&gt;</description>
          <properties>
-            <property name="ignoreFormat" type="java.util.regex.Pattern">
-               <description>Define the RegExp for names of variables
- and parameters to ignore.</description>
+            <property default-value="false" name="ignoreAbstractMethods" type="boolean">
+               <description>Control whether to ignore parameters
+ of abstract methods.</description>
             </property>
             <property default-value="false"
                       name="ignoreConstructorParameter"
                       type="boolean">
                <description>Control whether to ignore constructor parameters.</description>
             </property>
+            <property name="ignoreFormat" type="java.util.regex.Pattern">
+               <description>Define the RegExp for names of variables
+ and parameters to ignore.</description>
+            </property>
             <property default-value="false" name="ignoreSetter" type="boolean">
                <description>Allow to ignore the parameter of a property setter method.</description>
             </property>
             <property default-value="false" name="setterCanReturnItsClass" type="boolean">
                <description>Allow to expand the definition of a setter method
  to include methods that return the class' instance.</description>
-            </property>
-            <property default-value="false" name="ignoreAbstractMethods" type="boolean">
-               <description>Control whether to ignore parameters
- of abstract methods.</description>
             </property>
             <property default-value="VARIABLE_DEF,PARAMETER_DEF,PATTERN_VARIABLE_DEF,LAMBDA,RECORD_COMPONENT_DEF"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalThrowsCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalThrowsCheck.xml
index 883f3098afc..c35d9194f9d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalThrowsCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalThrowsCheck.xml
@@ -10,19 +10,19 @@
  {@code java.lang.RuntimeException} is almost never acceptable.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="Error, RuntimeException, Throwable, java.lang.Error, java.lang.RuntimeException, java.lang.Throwable"
-                      name="illegalClassNames"
-                      type="java.lang.String[]">
-               <description>Specify throw class names to reject.</description>
+            <property default-value="true" name="ignoreOverriddenMethods" type="boolean">
+               <description>Allow to ignore checking overridden methods
+ (marked with {@code Override} or {@code java.lang.Override} annotation).</description>
             </property>
             <property default-value="finalize"
                       name="ignoredMethodNames"
                       type="java.lang.String[]">
                <description>Specify names of methods to ignore.</description>
             </property>
-            <property default-value="true" name="ignoreOverriddenMethods" type="boolean">
-               <description>allow to ignore checking overridden methods
- (marked with {@code Override} or {@code java.lang.Override} annotation).</description>
+            <property default-value="Error, RuntimeException, Throwable, java.lang.Error, java.lang.RuntimeException, java.lang.Throwable"
+                      name="illegalClassNames"
+                      type="java.lang.String[]">
+               <description>Specify throw class names to reject.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalTypeCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalTypeCheck.xml
index d03c78070ea..2dccc7369e5 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalTypeCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/IllegalTypeCheck.xml
@@ -48,10 +48,16 @@
  benefit from checking for them.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="false"
-                      name="validateAbstractClassNames"
-                      type="boolean">
-               <description>Control whether to validate abstract class names.</description>
+            <property default-value="getEnvironment, getInitialContext"
+                      name="ignoredMethodNames"
+                      type="java.lang.String[]">
+               <description>Specify methods that should not be checked.</description>
+            </property>
+            <property default-value="^(.*[.])?Abstract.*$"
+                      name="illegalAbstractClassNameFormat"
+                      type="java.util.regex.Pattern">
+               <description>Specify RegExp for illegal abstract class
+ names.</description>
             </property>
             <property default-value="HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet, java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet"
                       name="illegalClassNames"
@@ -64,17 +70,6 @@
                       type="java.lang.String[]">
                <description>Define abstract classes that may be used as types.</description>
             </property>
-            <property default-value="getEnvironment, getInitialContext"
-                      name="ignoredMethodNames"
-                      type="java.lang.String[]">
-               <description>Specify methods that should not be checked.</description>
-            </property>
-            <property default-value="^(.*[.])?Abstract.*$"
-                      name="illegalAbstractClassNameFormat"
-                      type="java.util.regex.Pattern">
-               <description>Specify RegExp for illegal abstract class
- names.</description>
-            </property>
             <property default-value=""
                       name="memberModifiers"
                       type="java.lang.String[]"
@@ -83,6 +78,11 @@
  of the specified modifiers.
  This property does not affect method calls nor method references nor record components.</description>
             </property>
+            <property default-value="false"
+                      name="validateAbstractClassNames"
+                      type="boolean">
+               <description>Control whether to validate abstract class names.</description>
+            </property>
             <property default-value="ANNOTATION_FIELD_DEF,CLASS_DEF,INTERFACE_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF,PATTERN_VARIABLE_DEF,RECORD_DEF,RECORD_COMPONENT_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MagicNumberCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MagicNumberCheck.xml
index a3e46bed9a7..bdd2f2a822a 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MagicNumberCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MagicNumberCheck.xml
@@ -24,29 +24,29 @@
  static final Integer ANSWER_TO_THE_ULTIMATE_QUESTION_OF_LIFE = new Integer(42);
  &lt;/pre&gt;</description>
          <properties>
-            <property default-value="-1, 0, 1, 2" name="ignoreNumbers" type="double[]">
-               <description>Specify non-magic numbers.</description>
-            </property>
-            <property default-value="false" name="ignoreHashCodeMethod" type="boolean">
-               <description>Ignore magic numbers in hashCode methods.</description>
+            <property default-value="ARRAY_INIT,ASSIGN,DIV,ELIST,EXPR,LITERAL_NEW,METHOD_CALL,MINUS,PLUS,STAR,TYPECAST,UNARY_MINUS,UNARY_PLUS"
+                      name="constantWaiverParentToken"
+                      type="java.lang.String[]"
+                      validation-type="tokenTypesSet">
+               <description>Specify tokens that are allowed in the AST path
+ from the number literal to the enclosing constant definition.</description>
             </property>
             <property default-value="false" name="ignoreAnnotation" type="boolean">
                <description>Ignore magic numbers in annotation declarations.</description>
             </property>
-            <property default-value="false" name="ignoreFieldDeclaration" type="boolean">
-               <description>Ignore magic numbers in field declarations.</description>
-            </property>
             <property default-value="true"
                       name="ignoreAnnotationElementDefaults"
                       type="boolean">
                <description>Ignore magic numbers in annotation elements defaults.</description>
             </property>
-            <property default-value="ARRAY_INIT,ASSIGN,DIV,ELIST,EXPR,LITERAL_NEW,METHOD_CALL,MINUS,PLUS,STAR,TYPECAST,UNARY_MINUS,UNARY_PLUS"
-                      name="constantWaiverParentToken"
-                      type="java.lang.String[]"
-                      validation-type="tokenTypesSet">
-               <description>Specify tokens that are allowed in the AST path
- from the number literal to the enclosing constant definition.</description>
+            <property default-value="false" name="ignoreFieldDeclaration" type="boolean">
+               <description>Ignore magic numbers in field declarations.</description>
+            </property>
+            <property default-value="false" name="ignoreHashCodeMethod" type="boolean">
+               <description>Ignore magic numbers in hashCode methods.</description>
+            </property>
+            <property default-value="-1, 0, 1, 2" name="ignoreNumbers" type="double[]">
+               <description>Specify non-magic numbers.</description>
             </property>
             <property default-value="NUM_DOUBLE,NUM_FLOAT,NUM_INT,NUM_LONG"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MatchXpathCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MatchXpathCheck.xml
index 2ff9162451b..908c8110f57 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MatchXpathCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MatchXpathCheck.xml
@@ -17,9 +17,10 @@
  &lt;/p&gt;
  &lt;p&gt;
  Please read more about Xpath syntax at
- &lt;a href="https://www.saxonica.com/html/documentation10/expressions/"&gt;Xpath Syntax&lt;/a&gt;.
+ &lt;a href="https://www.saxonica.com/html/documentation10/expressions/index.html"&gt;Xpath Syntax&lt;/a&gt;.
  Information regarding Xpath functions can be found at
- &lt;a href="https://www.saxonica.com/html/documentation10/functions/fn/"&gt;XSLT/XPath Reference&lt;/a&gt;.
+ &lt;a href="https://www.saxonica.com/html/documentation10/functions/fn/index.html"&gt;
+     XSLT/XPath Reference&lt;/a&gt;.
  Note, that &lt;b&gt;@text&lt;/b&gt; attribute can be used only with token types that are listed in
  &lt;a href="https://github.com/checkstyle/checkstyle/search?q=%22TOKEN_TYPES_WITH_TEXT_ATTRIBUTE+%3D+Arrays.asList%22"&gt;
      XpathUtil&lt;/a&gt;.
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MultipleStringLiteralsCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MultipleStringLiteralsCheck.xml
index a6d27a6bbb7..d539ae08d23 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MultipleStringLiteralsCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/MultipleStringLiteralsCheck.xml
@@ -16,11 +16,6 @@
                <description>Specify the maximum number of occurrences
  to allow without generating a warning.</description>
             </property>
-            <property default-value="^$"
-                      name="ignoreStringsRegexp"
-                      type="java.util.regex.Pattern">
-               <description>Specify RegExp for ignored strings (with quotation marks).</description>
-            </property>
             <property default-value="ANNOTATION"
                       name="ignoreOccurrenceContext"
                       type="java.lang.String[]"
@@ -29,6 +24,11 @@
  strings are ignored even if they don't match ignoredStringsRegexp. This allows you to
  exclude syntactical contexts like annotations or static initializers from the check.</description>
             </property>
+            <property default-value="^$"
+                      name="ignoreStringsRegexp"
+                      type="java.util.regex.Pattern">
+               <description>Specify RegExp for ignored strings (with quotation marks).</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="multiple.string.literal"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ReturnCountCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ReturnCountCheck.xml
index e07af877fd4..715e534ba43 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ReturnCountCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/ReturnCountCheck.xml
@@ -25,6 +25,11 @@
  attempting to do too much or may be difficult to understand.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="^equals$"
+                      name="format"
+                      type="java.util.regex.Pattern">
+               <description>Specify method names to ignore.</description>
+            </property>
             <property default-value="2" name="max" type="int">
                <description>Specify maximum allowed number of return statements
  in non-void methods/lambdas.</description>
@@ -33,11 +38,6 @@
                <description>Specify maximum allowed number of return statements
  in void methods/constructors/lambdas.</description>
             </property>
-            <property default-value="^equals$"
-                      name="format"
-                      type="java.util.regex.Pattern">
-               <description>Specify method names to ignore.</description>
-            </property>
             <property default-value="CTOR_DEF,METHOD_DEF,LAMBDA"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/SimplifyBooleanReturnCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/SimplifyBooleanReturnCheck.xml
index 30b6861a5c1..c9fcceaf069 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/SimplifyBooleanReturnCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/SimplifyBooleanReturnCheck.xml
@@ -22,7 +22,8 @@
  &lt;/pre&gt;
  &lt;p&gt;
  The idea for this Check has been shamelessly stolen from the equivalent
- &lt;a href="https://pmd.github.io/"&gt;&lt;/a&gt; rule.
+ &lt;a href="https://pmd.github.io/pmd/pmd_rules_java_design.html#simplifybooleanreturns"&gt;
+     PMD&lt;/a&gt; rule.
  &lt;/p&gt;</description>
          <message-keys>
             <message-key key="simplify.boolReturn"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/VariableDeclarationUsageDistanceCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/VariableDeclarationUsageDistanceCheck.xml
index 3f717aafa8f..6222b03d4f4 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/VariableDeclarationUsageDistanceCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/coding/VariableDeclarationUsageDistanceCheck.xml
@@ -13,6 +13,9 @@
                <description>Specify distance between declaration
  of variable and its first usage. Values should be greater than 0.</description>
             </property>
+            <property default-value="true" name="ignoreFinal" type="boolean">
+               <description>Allow to ignore variables with a 'final' modifier.</description>
+            </property>
             <property default-value=""
                       name="ignoreVariablePattern"
                       type="java.util.regex.Pattern">
@@ -23,9 +26,6 @@
                <description>Allow to calculate the distance between
  declaration of variable and its first usage in the different scopes.</description>
             </property>
-            <property default-value="true" name="ignoreFinal" type="boolean">
-               <description>Allow to ignore variables with a 'final' modifier.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="variable.declaration.usage.distance"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/MutableExceptionCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/MutableExceptionCheck.xml
index d20fa3641d8..c4b96d8b151 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/MutableExceptionCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/MutableExceptionCheck.xml
@@ -25,14 +25,14 @@
  &lt;/p&gt;</description>
          <properties>
             <property default-value="^.*Exception$|^.*Error$|^.*Throwable$"
-                      name="format"
+                      name="extendedClassNameFormat"
                       type="java.util.regex.Pattern">
-               <description>Specify pattern for exception class names.</description>
+               <description>Specify pattern for extended class names.</description>
             </property>
             <property default-value="^.*Exception$|^.*Error$|^.*Throwable$"
-                      name="extendedClassNameFormat"
+                      name="format"
                       type="java.util.regex.Pattern">
-               <description>Specify pattern for extended class names.</description>
+               <description>Specify pattern for exception class names.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/ThrowsCountCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/ThrowsCountCheck.xml
index f2094e14425..52947c31059 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/ThrowsCountCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/ThrowsCountCheck.xml
@@ -31,12 +31,12 @@
  not cause problems for other classes.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="4" name="max" type="int">
-               <description>Specify maximum allowed number of throws statements.</description>
-            </property>
             <property default-value="true" name="ignorePrivateMethods" type="boolean">
                <description>Allow private methods to be ignored.</description>
             </property>
+            <property default-value="4" name="max" type="int">
+               <description>Specify maximum allowed number of throws statements.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="throws.count"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/VisibilityModifierCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/VisibilityModifierCheck.xml
index 51e97ff2d3e..366d35689f1 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/VisibilityModifierCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/design/VisibilityModifierCheck.xml
@@ -71,17 +71,6 @@
  won't be Check's violation.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="false" name="packageAllowed" type="boolean">
-               <description>Control whether package visible members are allowed.</description>
-            </property>
-            <property default-value="false" name="protectedAllowed" type="boolean">
-               <description>Control whether protected members are allowed.</description>
-            </property>
-            <property default-value="^serialVersionUID$"
-                      name="publicMemberPattern"
-                      type="java.util.regex.Pattern">
-               <description>Specify pattern for public members that should be ignored.</description>
-            </property>
             <property default-value="false" name="allowPublicFinalFields" type="boolean">
                <description>Allow final fields to be declared as public.</description>
             </property>
@@ -91,17 +80,28 @@
                <description>Allow immutable fields to be
  declared as public if defined in final class.</description>
             </property>
-            <property default-value="java.io.File, java.lang.Boolean, java.lang.Byte, java.lang.Character, java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long, java.lang.Short, java.lang.StackTraceElement, java.lang.String, java.math.BigDecimal, java.math.BigInteger, java.net.Inet4Address, java.net.Inet6Address, java.net.InetSocketAddress, java.net.URI, java.net.URL, java.util.Locale, java.util.UUID"
-                      name="immutableClassCanonicalNames"
-                      type="java.lang.String[]">
-               <description>Specify immutable classes canonical names.</description>
-            </property>
             <property default-value="com.google.common.annotations.VisibleForTesting, org.junit.ClassRule, org.junit.Rule"
                       name="ignoreAnnotationCanonicalNames"
                       type="java.lang.String[]">
                <description>Specify annotations canonical
  names which ignore variables in consideration.</description>
             </property>
+            <property default-value="java.io.File, java.lang.Boolean, java.lang.Byte, java.lang.Character, java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long, java.lang.Short, java.lang.StackTraceElement, java.lang.String, java.math.BigDecimal, java.math.BigInteger, java.net.Inet4Address, java.net.Inet6Address, java.net.InetSocketAddress, java.net.URI, java.net.URL, java.util.Locale, java.util.UUID"
+                      name="immutableClassCanonicalNames"
+                      type="java.lang.String[]">
+               <description>Specify immutable classes canonical names.</description>
+            </property>
+            <property default-value="false" name="packageAllowed" type="boolean">
+               <description>Control whether package visible members are allowed.</description>
+            </property>
+            <property default-value="false" name="protectedAllowed" type="boolean">
+               <description>Control whether protected members are allowed.</description>
+            </property>
+            <property default-value="^serialVersionUID$"
+                      name="publicMemberPattern"
+                      type="java.util.regex.Pattern">
+               <description>Specify pattern for public members that should be ignored.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="variable.notPrivate"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/HeaderCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/HeaderCheck.xml
index d9a348df05a..d8192c723e0 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/HeaderCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/HeaderCheck.xml
@@ -31,23 +31,23 @@
  of header is set to {@code null} and the check does not rise any violations.
  &lt;/p&gt;</description>
          <properties>
-            <property name="headerFile" type="java.net.URI">
-               <description>Specify the name of the file containing the required header.</description>
-            </property>
             <property name="charset" type="java.lang.String">
                <description>Specify the character encoding to use when reading the headerFile.</description>
             </property>
+            <property default-value="" name="fileExtensions" type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
+            </property>
             <property name="header" type="java.lang.String">
                <description>Specify the required header specified inline.
  Individual header lines must be separated by the string {@code "\n"}
- (even on platforms with a different line separator), see examples below.</description>
+ (even on platforms with a different line separator).</description>
+            </property>
+            <property name="headerFile" type="java.net.URI">
+               <description>Specify the name of the file containing the required header.</description>
             </property>
             <property default-value="" name="ignoreLines" type="int[]">
                <description>Specify the line numbers to ignore.</description>
             </property>
-            <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify the file type extension of files to process.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="header.mismatch"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/RegexpHeaderCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/RegexpHeaderCheck.xml
index 02ef4572c45..6eeb181769e 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/RegexpHeaderCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/header/RegexpHeaderCheck.xml
@@ -69,12 +69,12 @@
  of header is set to null and the check does not rise any violations.
  &lt;/p&gt;</description>
          <properties>
-            <property name="headerFile" type="java.net.URI">
-               <description>Specify the name of the file containing the required header.</description>
-            </property>
             <property name="charset" type="java.lang.String">
                <description>Specify the character encoding to use when reading the headerFile.</description>
             </property>
+            <property default-value="" name="fileExtensions" type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
+            </property>
             <property name="header" type="java.lang.String">
                <description>Define the required header specified inline.
  Individual header lines must be separated by the string {@code "\n"}
@@ -83,12 +83,12 @@
  forcefully expect an empty line to exist. See examples below.
  Regular expressions must not span multiple lines.</description>
             </property>
+            <property name="headerFile" type="java.net.URI">
+               <description>Specify the name of the file containing the required header.</description>
+            </property>
             <property default-value="" name="multiLines" type="int[]">
                <description>Specify the line numbers to repeat (zero or more times).</description>
             </property>
-            <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify the file type extension of files to process.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="header.mismatch"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/AvoidStarImportCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/AvoidStarImportCheck.xml
index 55f091254bb..1ed368b606c 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/AvoidStarImportCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/AvoidStarImportCheck.xml
@@ -18,10 +18,6 @@
  packages are not automatically excluded.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="" name="excludes" type="java.lang.String[]">
-               <description>Specify packages where starred class imports are
- allowed and classes where starred static member imports are allowed.</description>
-            </property>
             <property default-value="false" name="allowClassImports" type="boolean">
                <description>Control whether to allow starred class
  imports like {@code import java.util.*;}.</description>
@@ -32,6 +28,10 @@
                <description>Control whether to allow starred
  static member imports like {@code import static org.junit.Assert.*;}.</description>
             </property>
+            <property default-value="" name="excludes" type="java.lang.String[]">
+               <description>Specify packages where starred class imports are
+ allowed and classes where starred static member imports are allowed.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="import.avoidStar"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/CustomImportOrderCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/CustomImportOrderCheck.xml
index 9833b9213d1..808360969f7 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/CustomImportOrderCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/CustomImportOrderCheck.xml
@@ -53,7 +53,11 @@
  &lt;/li&gt;
  &lt;/ol&gt;
  &lt;p&gt;
- Use the separator '###' between rules.
+ Rules are configured as a comma-separated ordered list.
+ &lt;/p&gt;
+ &lt;p&gt;
+ Note: '###' group separator is deprecated (in favor of a comma-separated list),
+ but is currently supported for backward compatibility.
  &lt;/p&gt;
  &lt;p&gt;
  To set RegExps for THIRD_PARTY_PACKAGE and STANDARD_JAVA_PACKAGE groups use
@@ -107,24 +111,8 @@
          <properties>
             <property default-value=""
                       name="customImportOrderRules"
-                      type="java.lang.String">
-               <description>Specify format of order declaration
- customizing by user.</description>
-            </property>
-            <property default-value="^(java|javax)\."
-                      name="standardPackageRegExp"
-                      type="java.util.regex.Pattern">
-               <description>Specify RegExp for STANDARD_JAVA_PACKAGE group imports.</description>
-            </property>
-            <property default-value=".*"
-                      name="thirdPartyPackageRegExp"
-                      type="java.util.regex.Pattern">
-               <description>Specify RegExp for THIRD_PARTY_PACKAGE group imports.</description>
-            </property>
-            <property default-value="^$"
-                      name="specialImportsRegExp"
-                      type="java.util.regex.Pattern">
-               <description>Specify RegExp for SPECIAL_IMPORTS group imports.</description>
+                      type="java.lang.String[]">
+               <description>Specify ordered list of import groups.</description>
             </property>
             <property default-value="true"
                       name="separateLineBetweenGroups"
@@ -138,6 +126,21 @@
                <description>Force grouping alphabetically,
  in &lt;a href="https://en.wikipedia.org/wiki/ASCII#Order"&gt;ASCII sort order&lt;/a&gt;.</description>
             </property>
+            <property default-value="^$"
+                      name="specialImportsRegExp"
+                      type="java.util.regex.Pattern">
+               <description>Specify RegExp for SPECIAL_IMPORTS group imports.</description>
+            </property>
+            <property default-value="^(java|javax)\."
+                      name="standardPackageRegExp"
+                      type="java.util.regex.Pattern">
+               <description>Specify RegExp for STANDARD_JAVA_PACKAGE group imports.</description>
+            </property>
+            <property default-value=".*"
+                      name="thirdPartyPackageRegExp"
+                      type="java.util.regex.Pattern">
+               <description>Specify RegExp for THIRD_PARTY_PACKAGE group imports.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="custom.import.order"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/IllegalImportCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/IllegalImportCheck.xml
index 4b755aba53d..8abcd05aba5 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/IllegalImportCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/IllegalImportCheck.xml
@@ -15,16 +15,16 @@
  packages, set property {@code illegalPkgs} to a list of the illegal packages.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="sun" name="illegalPkgs" type="java.lang.String[]">
-               <description>Specify packages to reject, if &lt;b&gt;regexp&lt;/b&gt;
- property is not set, checks if import is the part of package. If &lt;b&gt;regexp&lt;/b&gt;
- property is set, then list of packages will be interpreted as regular expressions.
- Note, all properties for match will be used.</description>
-            </property>
             <property default-value="" name="illegalClasses" type="java.lang.String[]">
                <description>Specify class names to reject, if &lt;b&gt;regexp&lt;/b&gt;
  property is not set, checks if import equals class name. If &lt;b&gt;regexp&lt;/b&gt;
  property is set, then list of class names will be interpreted as regular expressions.
+ Note, all properties for match will be used.</description>
+            </property>
+            <property default-value="sun" name="illegalPkgs" type="java.lang.String[]">
+               <description>Specify packages to reject, if &lt;b&gt;regexp&lt;/b&gt;
+ property is not set, checks if import is the part of package. If &lt;b&gt;regexp&lt;/b&gt;
+ property is set, then list of packages will be interpreted as regular expressions.
  Note, all properties for match will be used.</description>
             </property>
             <property default-value="false" name="regexp" type="boolean">
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml
index 3789ad9af13..e410951aeb2 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml
@@ -34,61 +34,59 @@
  &lt;/li&gt;
  &lt;/ul&gt;</description>
          <properties>
-            <property default-value="under"
-                      name="option"
-                      type="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderOption">
-               <description>specify policy on the relative order between type imports and static
- imports.</description>
+            <property default-value="true" name="caseSensitive" type="boolean">
+               <description>Control whether string comparison should be
+ case-sensitive or not. Case-sensitive sorting is in
+ &lt;a href="https://en.wikipedia.org/wiki/ASCII#Order"&gt;ASCII sort order&lt;/a&gt;.
+ It affects both type imports and static imports.</description>
             </property>
-            <property default-value="" name="groups" type="java.util.regex.Pattern[]">
-               <description>specify list of &lt;b&gt;type import&lt;/b&gt; groups. Every group identified
+            <property default-value="" name="groups" type="java.lang.String[]">
+               <description>Specify list of &lt;b&gt;type import&lt;/b&gt; groups. Every group identified
  either by a common prefix string, or by a regular expression enclosed in forward slashes
  (e.g. {@code /regexp/}). All type imports, which does not match any group, falls into an
  additional group, located at the end.
  Thus, the empty list of type groups (the default value) means one group for all type imports.</description>
+            </property>
+            <property default-value="under"
+                      name="option"
+                      type="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderOption">
+               <description>Specify policy on the relative order between type imports and static
+ imports.</description>
             </property>
             <property default-value="true" name="ordered" type="boolean">
-               <description>control whether type imports within each group should be
+               <description>Control whether type imports within each group should be
  sorted.
  It doesn't affect sorting for static imports.</description>
             </property>
             <property default-value="false" name="separated" type="boolean">
-               <description>control whether type import groups should be separated
+               <description>Control whether type import groups should be separated
  by, at least, one blank line or comment and aren't separated internally.
  It doesn't affect separations for static imports.</description>
             </property>
             <property default-value="false" name="separatedStaticGroups" type="boolean">
-               <description>control whether static import groups should
+               <description>Control whether static import groups should
  be separated by, at least, one blank line or comment and aren't separated internally.
  This property has effect only when the property {@code option} is set to {@code top}
  or {@code bottom} and when property {@code staticGroups} is enabled.</description>
             </property>
-            <property default-value="true" name="caseSensitive" type="boolean">
-               <description>control whether string comparison should be
- case-sensitive or not. Case-sensitive sorting is in
- &lt;a href="https://en.wikipedia.org/wiki/ASCII#Order"&gt;ASCII sort order&lt;/a&gt;.
- It affects both type imports and static imports.</description>
+            <property default-value="false"
+                      name="sortStaticImportsAlphabetically"
+                      type="boolean">
+               <description>Control whether
+ &lt;b&gt;static imports&lt;/b&gt; located at &lt;b&gt;top&lt;/b&gt; or &lt;b&gt;bottom&lt;/b&gt; are sorted within the group.</description>
             </property>
-            <property default-value=""
-                      name="staticGroups"
-                      type="java.util.regex.Pattern[]">
-               <description>specify list of &lt;b&gt;static&lt;/b&gt; import groups. Every group
+            <property default-value="" name="staticGroups" type="java.lang.String[]">
+               <description>Specify list of &lt;b&gt;static&lt;/b&gt; import groups. Every group
  identified either by a common prefix string, or by a regular expression enclosed in forward
  slashes (e.g. {@code /regexp/}). All static imports, which does not match any group, fall into
  an additional group, located at the end. Thus, the empty list of static groups (the default
  value) means one group for all static imports. This property has effect only when the property
  {@code option} is set to {@code top} or {@code bottom}.</description>
-            </property>
-            <property default-value="false"
-                      name="sortStaticImportsAlphabetically"
-                      type="boolean">
-               <description>control whether
- &lt;b&gt;static imports&lt;/b&gt; located at &lt;b&gt;top&lt;/b&gt; or &lt;b&gt;bottom&lt;/b&gt; are sorted within the group.</description>
             </property>
             <property default-value="false"
                       name="useContainerOrderingForStatic"
                       type="boolean">
-               <description>control whether to use container
+               <description>Control whether to use container
  ordering (Eclipse IDE term) for static imports or not.</description>
             </property>
          </properties>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/UnusedImportsCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/UnusedImportsCheck.xml
index 3b26a4d2a01..3a32a0314d9 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/UnusedImportsCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/UnusedImportsCheck.xml
@@ -22,6 +22,10 @@
  The class imported is from the same package.
  &lt;/li&gt;
  &lt;li&gt;
+ A static method is imported when used as method reference. In that case,
+ only the type needs to be imported and that's enough to resolve the method.
+ &lt;/li&gt;
+ &lt;li&gt;
  &lt;b&gt;Optionally:&lt;/b&gt; it is referenced in Javadoc comments. This check is on by
  default, but it is considered bad practice to introduce a compile-time
  dependency for documentation purposes only. As an example, the import
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/indentation/IndentationCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/indentation/IndentationCheck.xml
index 30776c18161..11f2bd8c199 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/indentation/IndentationCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/indentation/IndentationCheck.xml
@@ -42,6 +42,10 @@
  }
  &lt;/pre&gt;</description>
          <properties>
+            <property default-value="4" name="arrayInitIndent" type="int">
+               <description>Specify how far an array initialization
+ should be indented when on next line.</description>
+            </property>
             <property default-value="4" name="basicOffset" type="int">
                <description>Specify how far new indentation level should be
  indented when on the next line.</description>
@@ -53,18 +57,6 @@
             <property default-value="4" name="caseIndent" type="int">
                <description>Specify how far a case label should be indented
  when on next line.</description>
-            </property>
-            <property default-value="4" name="throwsIndent" type="int">
-               <description>Specify how far a throws clause should be
- indented when on next line.</description>
-            </property>
-            <property default-value="4" name="arrayInitIndent" type="int">
-               <description>Specify how far an array initialisation
- should be indented when on next line.</description>
-            </property>
-            <property default-value="4" name="lineWrappingIndentation" type="int">
-               <description>Specify how far continuation line
- should be indented when line-wrapping is present.</description>
             </property>
             <property default-value="false" name="forceStrictCondition" type="boolean">
                <description>Force strict indent level in line
@@ -72,6 +64,14 @@
  lineWrappingIndentation parameter. If value is false, line wrap indent
  could be bigger on any value user would like.</description>
             </property>
+            <property default-value="4" name="lineWrappingIndentation" type="int">
+               <description>Specify how far continuation line
+ should be indented when line-wrapping is present.</description>
+            </property>
+            <property default-value="4" name="throwsIndent" type="int">
+               <description>Specify how far a throws clause should be
+ indented when on next line.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="indentation.child.error"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/AtclauseOrderCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/AtclauseOrderCheck.xml
index d8398fa6ced..6d8d0450ccc 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/AtclauseOrderCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/AtclauseOrderCheck.xml
@@ -13,12 +13,10 @@
  Note: Google used the term "at-clauses" for block tags in their guide till 2017-02-28.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="false"
-                      name="violateExecutionOnNonTightHtml"
-                      type="boolean">
-               <description>Control when to print violations if the
- Javadoc being examined by this check violates the tight html rules defined at
- &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;Tight-HTML Rules&lt;/a&gt;.</description>
+            <property default-value="@author, @deprecated, @exception, @param, @return, @see, @serial, @serialData, @serialField, @since, @throws, @version"
+                      name="tagOrder"
+                      type="java.lang.String[]">
+               <description>Specify the order by tags.</description>
             </property>
             <property default-value="CLASS_DEF,COMPACT_CTOR_DEF,CTOR_DEF,ENUM_DEF,INTERFACE_DEF,METHOD_DEF,RECORD_DEF,VARIABLE_DEF"
                       name="target"
@@ -26,16 +24,19 @@
                       validation-type="tokenTypesSet">
                <description>Specify block tags targeted.</description>
             </property>
-            <property default-value="@author, @deprecated, @exception, @param, @return, @see, @serial, @serialData, @serialField, @since, @throws, @version"
-                      name="tagOrder"
-                      type="java.lang.String[]">
-               <description>Specify the order by tags.</description>
+            <property default-value="false"
+                      name="violateExecutionOnNonTightHtml"
+                      type="boolean">
+               <description>Control when to print violations if the
+ Javadoc being examined by this check violates the tight html rules defined at
+ &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;Tight-HTML Rules&lt;/a&gt;.</description>
             </property>
          </properties>
          <message-keys>
             <message-key key="at.clause.order"/>
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
          </message-keys>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocBlockTagLocationCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocBlockTagLocationCheck.xml
index 4bcdc99ed20..fa1c03eb3bf 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocBlockTagLocationCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocBlockTagLocationCheck.xml
@@ -48,6 +48,7 @@
             <message-key key="javadoc.blockTagLocation"/>
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
          </message-keys>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMethodCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMethodCheck.xml
index 75c76bef359..0df3192a73d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMethodCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMethodCheck.xml
@@ -61,14 +61,6 @@
                            int aLineNo)
  &lt;/pre&gt;</description>
          <properties>
-            <property default-value="Override"
-                      name="allowedAnnotations"
-                      type="java.lang.String[]">
-               <description>Specify annotations that allow missed documentation.</description>
-            </property>
-            <property default-value="false" name="validateThrows" type="boolean">
-               <description>Control whether to validate {@code throws} tags.</description>
-            </property>
             <property default-value="public, protected, package, private"
                       name="accessModifiers"
                       type="com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]">
@@ -83,6 +75,14 @@
                <description>Control whether to ignore violations
  when a method returns non-void type and does not have a {@code return} tag in the javadoc.</description>
             </property>
+            <property default-value="Override"
+                      name="allowedAnnotations"
+                      type="java.lang.String[]">
+               <description>Specify annotations that allow missed documentation.</description>
+            </property>
+            <property default-value="false" name="validateThrows" type="boolean">
+               <description>Control whether to validate {@code throws} tags.</description>
+            </property>
             <property default-value="METHOD_DEF,CTOR_DEF,ANNOTATION_FIELD_DEF,COMPACT_CTOR_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingLeadingAsteriskCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingLeadingAsteriskCheck.xml
index 051b3fc56aa..c345ea05daf 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingLeadingAsteriskCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingLeadingAsteriskCheck.xml
@@ -26,6 +26,7 @@
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.missing.asterisk"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
          </message-keys>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.xml
index 23bdf278dd2..507910375c7 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.xml
@@ -23,6 +23,7 @@
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.missing.whitespace"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
          </message-keys>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocPackageCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocPackageCheck.xml
index c62e4c658e8..1482e068f3d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocPackageCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocPackageCheck.xml
@@ -19,7 +19,7 @@
             <property default-value=".java"
                       name="fileExtensions"
                       type="java.lang.String[]">
-               <description>Specify the file type extension of files to process.</description>
+               <description>Specify the file extensions of the files to process.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocParagraphCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocParagraphCheck.xml
index 24d7774e952..fef2c2a14e1 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocParagraphCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocParagraphCheck.xml
@@ -16,6 +16,10 @@
  before the first word, with no space after.&lt;/li&gt;
  &lt;/ul&gt;</description>
          <properties>
+            <property default-value="true" name="allowNewlineParagraph" type="boolean">
+               <description>Control whether the &amp;lt;p&amp;gt; tag
+ should be placed immediately before the first word.</description>
+            </property>
             <property default-value="false"
                       name="violateExecutionOnNonTightHtml"
                       type="boolean">
@@ -24,10 +28,6 @@
  &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;
  Tight-HTML Rules&lt;/a&gt;.</description>
             </property>
-            <property default-value="true" name="allowNewlineParagraph" type="boolean">
-               <description>Control whether the &amp;lt;p&amp;gt; tag
- should be placed immediately before the first word.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="javadoc.missed.html.close"/>
@@ -36,6 +36,7 @@
             <message-key key="javadoc.paragraph.redundant.paragraph"/>
             <message-key key="javadoc.paragraph.tag.after"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
          </message-keys>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocStyleCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocStyleCheck.xml
index 7d81da6a289..8e40226944d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocStyleCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocStyleCheck.xml
@@ -14,6 +14,9 @@
  &lt;li&gt;
  Ensures the first sentence ends with proper punctuation
  (That is a period, question mark, or exclamation mark, by default).
+ Note that this check is not applied to inline {@code @return} tags,
+ because the Javadoc tools automatically appends a period to the end of the tag
+ content.
  Javadoc automatically places the first sentence in the method summary
  table and index. Without proper punctuation the Javadoc may be malformed.
  All items eligible for the {@code {@inheritDoc}} tag are exempt from this
@@ -49,31 +52,31 @@
  available from Sun. Note: Original Sun's DocCheck tool does not exist anymore.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="private"
-                      name="scope"
-                      type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where Javadoc comments are checked.</description>
-            </property>
-            <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where
- Javadoc comments are not checked.</description>
+            <property default-value="false" name="checkEmptyJavadoc" type="boolean">
+               <description>Control whether to check if the Javadoc
+ is missing a describing text.</description>
             </property>
             <property default-value="true" name="checkFirstSentence" type="boolean">
                <description>Control whether to check the first
  sentence for proper end of sentence.</description>
             </property>
+            <property default-value="true" name="checkHtml" type="boolean">
+               <description>Control whether to check for incomplete HTML tags.</description>
+            </property>
             <property default-value="([.?!][ \t\n\r\f&amp;lt;])|([.?!]$)"
                       name="endOfSentenceFormat"
                       type="java.util.regex.Pattern">
                <description>Specify the format for matching
  the end of a sentence.</description>
             </property>
-            <property default-value="false" name="checkEmptyJavadoc" type="boolean">
-               <description>Control whether to check if the Javadoc
- is missing a describing text.</description>
+            <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
+               <description>Specify the visibility scope where
+ Javadoc comments are not checked.</description>
             </property>
-            <property default-value="true" name="checkHtml" type="boolean">
-               <description>Control whether to check for incomplete HTML tags.</description>
+            <property default-value="private"
+                      name="scope"
+                      type="com.puppycrawl.tools.checkstyle.api.Scope">
+               <description>Specify the visibility scope where Javadoc comments are checked.</description>
             </property>
             <property default-value="ANNOTATION_DEF,ANNOTATION_FIELD_DEF,CLASS_DEF,CTOR_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,INTERFACE_DEF,METHOD_DEF,PACKAGE_DEF,VARIABLE_DEF,RECORD_DEF,COMPACT_CTOR_DEF"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTagContinuationIndentationCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTagContinuationIndentationCheck.xml
index 708bc3ab96c..c58d3680ded 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTagContinuationIndentationCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTagContinuationIndentationCheck.xml
@@ -12,6 +12,9 @@
  properties below.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="4" name="offset" type="int">
+               <description>Specify how many spaces to use for new indentation level.</description>
+            </property>
             <property default-value="false"
                       name="violateExecutionOnNonTightHtml"
                       type="boolean">
@@ -19,13 +22,11 @@
  if the Javadoc being examined by this check violates the tight html rules defined at
  &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;Tight-HTML Rules&lt;/a&gt;.</description>
             </property>
-            <property default-value="4" name="offset" type="int">
-               <description>Specify how many spaces to use for new indentation level.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
             <message-key key="tag.continuation.indent"/>
          </message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTypeCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTypeCheck.xml
index 3c9c61da3f9..877804f1044 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTypeCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocTypeCheck.xml
@@ -25,21 +25,6 @@
  can be suppressed by defining property {@code allowMissingParamTags}.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="private"
-                      name="scope"
-                      type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where Javadoc comments are checked.</description>
-            </property>
-            <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where Javadoc
- comments are not checked.</description>
-            </property>
-            <property name="authorFormat" type="java.util.regex.Pattern">
-               <description>Specify the pattern for {@code @author} tag.</description>
-            </property>
-            <property name="versionFormat" type="java.util.regex.Pattern">
-               <description>Specify the pattern for {@code @version} tag.</description>
-            </property>
             <property default-value="false" name="allowMissingParamTags" type="boolean">
                <description>Control whether to ignore violations
  when a class has type parameters but does not have matching param tags in the Javadoc.</description>
@@ -54,6 +39,21 @@
                <description>Specify annotations that allow
  skipping validation at all. Only short names are allowed, e.g. {@code Generated}.</description>
             </property>
+            <property name="authorFormat" type="java.util.regex.Pattern">
+               <description>Specify the pattern for {@code @author} tag.</description>
+            </property>
+            <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
+               <description>Specify the visibility scope where Javadoc
+ comments are not checked.</description>
+            </property>
+            <property default-value="private"
+                      name="scope"
+                      type="com.puppycrawl.tools.checkstyle.api.Scope">
+               <description>Specify the visibility scope where Javadoc comments are checked.</description>
+            </property>
+            <property name="versionFormat" type="java.util.regex.Pattern">
+               <description>Specify the pattern for {@code @version} tag.</description>
+            </property>
             <property default-value="INTERFACE_DEF,CLASS_DEF,ENUM_DEF,ANNOTATION_DEF,RECORD_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml
index aea982226cd..1b419a14947 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml
@@ -8,11 +8,6 @@
  Checks that a variable has a Javadoc comment. Ignores {@code serialVersionUID} fields.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="private"
-                      name="scope"
-                      type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where Javadoc comments are checked.</description>
-            </property>
             <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
                <description>Specify the visibility scope where Javadoc
  comments are not checked.</description>
@@ -20,6 +15,11 @@
             <property name="ignoreNamePattern" type="java.util.regex.Pattern">
                <description>Specify the regexp to define variable names to ignore.</description>
             </property>
+            <property default-value="private"
+                      name="scope"
+                      type="com.puppycrawl.tools.checkstyle.api.Scope">
+               <description>Specify the visibility scope where Javadoc comments are checked.</description>
+            </property>
             <property default-value="ENUM_CONSTANT_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocMethodCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocMethodCheck.xml
index 008d3bc840b..a5c3292a989 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocMethodCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocMethodCheck.xml
@@ -37,9 +37,11 @@
  }
  &lt;/pre&gt;</description>
          <properties>
-            <property default-value="-1" name="minLineCount" type="int">
-               <description>Control the minimal amount of lines in method to allow no
- documentation.</description>
+            <property default-value="false"
+                      name="allowMissingPropertyJavadoc"
+                      type="boolean">
+               <description>Control whether to allow missing Javadoc on
+ accessor methods for properties (setters and getters).</description>
             </property>
             <property default-value="Override"
                       name="allowedAnnotations"
@@ -47,25 +49,23 @@
                <description>Configure annotations that allow missed
  documentation.</description>
             </property>
-            <property default-value="public"
-                      name="scope"
-                      type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where Javadoc comments are checked.</description>
-            </property>
             <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
                <description>Specify the visibility scope where Javadoc comments are
  not checked.</description>
-            </property>
-            <property default-value="false"
-                      name="allowMissingPropertyJavadoc"
-                      type="boolean">
-               <description>Control whether to allow missing Javadoc on
- accessor methods for properties (setters and getters).</description>
             </property>
             <property name="ignoreMethodNamesRegex" type="java.util.regex.Pattern">
-               <description>ignore method whose names are matching specified
+               <description>Ignore method whose names are matching specified
  regex.</description>
             </property>
+            <property default-value="-1" name="minLineCount" type="int">
+               <description>Control the minimal amount of lines in method to allow no
+ documentation.</description>
+            </property>
+            <property default-value="public"
+                      name="scope"
+                      type="com.puppycrawl.tools.checkstyle.api.Scope">
+               <description>Specify the visibility scope where Javadoc comments are checked.</description>
+            </property>
             <property default-value="METHOD_DEF,CTOR_DEF,ANNOTATION_FIELD_DEF,COMPACT_CTOR_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocTypeCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocTypeCheck.xml
index c4bf3a56757..5890976e8e7 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocTypeCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/MissingJavadocTypeCheck.xml
@@ -11,19 +11,19 @@
  {@code Scope} constants.
  &lt;/p&gt;</description>
          <properties>
+            <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
+               <description>Specify the visibility scope where Javadoc comments are not
+ checked.</description>
+            </property>
             <property default-value="public"
                       name="scope"
                       type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>specify the visibility scope where Javadoc comments are checked.</description>
-            </property>
-            <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>specify the visibility scope where Javadoc comments are not
- checked.</description>
+               <description>Specify the visibility scope where Javadoc comments are checked.</description>
             </property>
             <property default-value="Generated"
                       name="skipAnnotations"
                       type="java.lang.String[]">
-               <description>specify annotations that allow missed
+               <description>Specify annotations that allow missed
  documentation. If annotation is present in target sources in multiple forms of qualified
  name, all forms should be listed in this property.</description>
             </property>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/NonEmptyAtclauseDescriptionCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/NonEmptyAtclauseDescriptionCheck.xml
index 1f24a0c1360..0d762eda897 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/NonEmptyAtclauseDescriptionCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/NonEmptyAtclauseDescriptionCheck.xml
@@ -25,6 +25,7 @@
          <message-keys>
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
             <message-key key="non.empty.atclause"/>
          </message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.xml
index fb97c0a89c1..b2c34e43430 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.xml
@@ -21,6 +21,7 @@
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
             <message-key key="javadoc.tag.line.before"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
          </message-keys>
       </check>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SingleLineJavadocCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SingleLineJavadocCheck.xml
index 1d00e60bb46..ba411ac7f1e 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SingleLineJavadocCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SingleLineJavadocCheck.xml
@@ -9,27 +9,28 @@
  Javadoc comment that contains at least one block tag should be formatted in a few lines.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="false"
-                      name="violateExecutionOnNonTightHtml"
-                      type="boolean">
-               <description>Control when to print violations
- if the Javadoc being examined by this check violates the tight html rules defined at
- &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;Tight-HTML Rules&lt;/a&gt;.</description>
+            <property default-value="true" name="ignoreInlineTags" type="boolean">
+               <description>Control whether
+ &lt;a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF"&gt;
+ inline tags&lt;/a&gt; must be ignored.</description>
             </property>
             <property default-value="" name="ignoredTags" type="java.lang.String[]">
                <description>Specify
  &lt;a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF"&gt;
  block tags&lt;/a&gt; which are ignored by the check.</description>
             </property>
-            <property default-value="true" name="ignoreInlineTags" type="boolean">
-               <description>Control whether
- &lt;a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF"&gt;
- inline tags&lt;/a&gt; must be ignored.</description>
+            <property default-value="false"
+                      name="violateExecutionOnNonTightHtml"
+                      type="boolean">
+               <description>Control when to print violations
+ if the Javadoc being examined by this check violates the tight html rules defined at
+ &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;Tight-HTML Rules&lt;/a&gt;.</description>
             </property>
          </properties>
          <message-keys>
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
             <message-key key="singleline.javadoc"/>
          </message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SummaryJavadocCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SummaryJavadocCheck.xml
index e31717393e3..5b36ccb993f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SummaryJavadocCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/SummaryJavadocCheck.xml
@@ -14,13 +14,6 @@
  period is not required as the Javadoc tool adds it.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="false"
-                      name="violateExecutionOnNonTightHtml"
-                      type="boolean">
-               <description>Control when to print violations
- if the Javadoc being examined by this check violates the tight html rules defined at
- &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;Tight-HTML Rules&lt;/a&gt;.</description>
-            </property>
             <property default-value="^$"
                       name="forbiddenSummaryFragments"
                       type="java.util.regex.Pattern">
@@ -29,10 +22,18 @@
             <property default-value="." name="period" type="java.lang.String">
                <description>Specify the period symbol at the end of first javadoc sentence.</description>
             </property>
+            <property default-value="false"
+                      name="violateExecutionOnNonTightHtml"
+                      type="boolean">
+               <description>Control when to print violations
+ if the Javadoc being examined by this check violates the tight html rules defined at
+ &lt;a href="https://checkstyle.org/writingjavadocchecks.html#Tight-HTML_rules"&gt;Tight-HTML Rules&lt;/a&gt;.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="javadoc.missed.html.close"/>
             <message-key key="javadoc.parse.rule.error"/>
+            <message-key key="javadoc.unclosedHtml"/>
             <message-key key="javadoc.wrong.singleton.html.tag"/>
             <message-key key="summary.first.sentence"/>
             <message-key key="summary.javaDoc"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassDataAbstractionCouplingCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassDataAbstractionCouplingCheck.xml
index dc618c74d0d..b2d9c4fadbd 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassDataAbstractionCouplingCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassDataAbstractionCouplingCheck.xml
@@ -61,23 +61,23 @@
  &lt;/li&gt;
  &lt;/ol&gt;</description>
          <properties>
-            <property default-value="7" name="max" type="int">
-               <description>Specify the maximum threshold allowed.</description>
-            </property>
-            <property default-value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, float, int, long, short, var, void"
-                      name="excludedClasses"
-                      type="java.lang.String[]">
-               <description>Specify user-configured class names to ignore.</description>
-            </property>
             <property default-value="^$"
                       name="excludeClassesRegexps"
                       type="java.util.regex.Pattern[]">
                <description>Specify user-configured regular
  expressions to ignore classes.</description>
             </property>
+            <property default-value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, float, int, long, short, var, void"
+                      name="excludedClasses"
+                      type="java.lang.String[]">
+               <description>Specify user-configured class names to ignore.</description>
+            </property>
             <property default-value="" name="excludedPackages" type="java.lang.String[]">
                <description>Specify user-configured packages to ignore.</description>
             </property>
+            <property default-value="7" name="max" type="int">
+               <description>Specify the maximum threshold allowed.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="classDataAbstractionCoupling"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassFanOutComplexityCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassFanOutComplexityCheck.xml
index 9b652d73bc2..f5f70fab42c 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassFanOutComplexityCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/ClassFanOutComplexityCheck.xml
@@ -28,23 +28,22 @@
  &lt;/li&gt;
  &lt;/ol&gt;</description>
          <properties>
-            <property default-value="20" name="max" type="int">
-               <description>Specify the maximum threshold allowed.</description>
-            </property>
-            <property default-value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, float, int, long, short, var, void"
-                      name="excludedClasses"
-                      type="java.lang.String[]">
-               <description>Specify user-configured class names to ignore.</description>
-            </property>
             <property default-value="^$"
                       name="excludeClassesRegexps"
                       type="java.util.regex.Pattern[]">
                <description>Specify user-configured regular
  expressions to ignore classes.</description>
             </property>
+            <property default-value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, float, int, long, short, var, void"
+                      name="excludedClasses"
+                      type="java.lang.String[]">
+               <description>Specify user-configured class names to ignore.</description>
+            </property>
             <property default-value="" name="excludedPackages" type="java.lang.String[]">
-               <description>Specify user-configured packages to ignore.
- All excluded packages should end with a period, so it also appends a dot to a package name.</description>
+               <description>Specify user-configured packages to ignore.</description>
+            </property>
+            <property default-value="20" name="max" type="int">
+               <description>Specify the maximum threshold allowed.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/JavaNCSSCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/JavaNCSSCheck.xml
index b6f95bbf036..ca82bd2e8e2 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/JavaNCSSCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/metrics/JavaNCSSCheck.xml
@@ -29,10 +29,6 @@
  and/or functionalities which should be decomposed into smaller units.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="50" name="methodMaximum" type="int">
-               <description>Specify the maximum allowed number of
- non commenting lines in a method.</description>
-            </property>
             <property default-value="1500" name="classMaximum" type="int">
                <description>Specify the maximum allowed number of
  non commenting lines in a class.</description>
@@ -40,6 +36,10 @@
             <property default-value="2000" name="fileMaximum" type="int">
                <description>Specify the maximum allowed number of
  non commenting lines in a file including all top level and nested classes.</description>
+            </property>
+            <property default-value="50" name="methodMaximum" type="int">
+               <description>Specify the maximum allowed number of
+ non commenting lines in a method.</description>
             </property>
             <property default-value="150" name="recordMaximum" type="int">
                <description>Specify the maximum allowed number of
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/modifier/InterfaceMemberImpliedModifierCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/modifier/InterfaceMemberImpliedModifierCheck.xml
index 79b9ba983f3..269bbc046cb 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/modifier/InterfaceMemberImpliedModifierCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/modifier/InterfaceMemberImpliedModifierCheck.xml
@@ -73,31 +73,25 @@
  &lt;/p&gt;</description>
          <properties>
             <property default-value="true"
-                      name="violateImpliedPublicField"
-                      type="boolean">
-               <description>Control whether to enforce that {@code public}
- is explicitly coded on interface fields.</description>
-            </property>
-            <property default-value="true"
-                      name="violateImpliedStaticField"
+                      name="violateImpliedAbstractMethod"
                       type="boolean">
-               <description>Control whether to enforce that {@code static}
- is explicitly coded on interface fields.</description>
+               <description>Control whether to enforce that {@code abstract}
+ is explicitly coded on interface methods.</description>
             </property>
             <property default-value="true" name="violateImpliedFinalField" type="boolean">
                <description>Control whether to enforce that {@code final}
  is explicitly coded on interface fields.</description>
             </property>
             <property default-value="true"
-                      name="violateImpliedPublicMethod"
+                      name="violateImpliedPublicField"
                       type="boolean">
                <description>Control whether to enforce that {@code public}
- is explicitly coded on interface methods.</description>
+ is explicitly coded on interface fields.</description>
             </property>
             <property default-value="true"
-                      name="violateImpliedAbstractMethod"
+                      name="violateImpliedPublicMethod"
                       type="boolean">
-               <description>Control whether to enforce that {@code abstract}
+               <description>Control whether to enforce that {@code public}
  is explicitly coded on interface methods.</description>
             </property>
             <property default-value="true"
@@ -105,6 +99,12 @@
                       type="boolean">
                <description>Control whether to enforce that {@code public}
  is explicitly coded on interface nested types.</description>
+            </property>
+            <property default-value="true"
+                      name="violateImpliedStaticField"
+                      type="boolean">
+               <description>Control whether to enforce that {@code static}
+ is explicitly coded on interface fields.</description>
             </property>
             <property default-value="true"
                       name="violateImpliedStaticNested"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/AbbreviationAsWordInNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/AbbreviationAsWordInNameCheck.xml
index 3c6d3783ef6..db101deb46b 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/AbbreviationAsWordInNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/AbbreviationAsWordInNameCheck.xml
@@ -43,16 +43,16 @@
             <property default-value="true" name="ignoreFinal" type="boolean">
                <description>Allow to skip variables with {@code final} modifier.</description>
             </property>
+            <property default-value="true" name="ignoreOverriddenMethods" type="boolean">
+               <description>Allow to ignore methods tagged with {@code @Override}
+ annotation (that usually mean inherited name).</description>
+            </property>
             <property default-value="true" name="ignoreStatic" type="boolean">
                <description>Allow to skip variables with {@code static} modifier.</description>
             </property>
             <property default-value="true" name="ignoreStaticFinal" type="boolean">
                <description>Allow to skip variables with both {@code static} and
  {@code final} modifiers.</description>
-            </property>
-            <property default-value="true" name="ignoreOverriddenMethods" type="boolean">
-               <description>Allow to ignore methods tagged with {@code @Override}
- annotation (that usually mean inherited name).</description>
             </property>
             <property default-value="CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,PATTERN_VARIABLE_DEF,RECORD_DEF,RECORD_COMPONENT_DEF"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/CatchParameterNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/CatchParameterNameCheck.xml
index be6c7e21536..5f6429ebb90 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/CatchParameterNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/CatchParameterNameCheck.xml
@@ -25,7 +25,7 @@
             <property default-value="^(e|t|ex|[a-z][a-z][a-zA-Z]+)$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ClassTypeParameterNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ClassTypeParameterNameCheck.xml
index cdc67ecf191..ba7133266c3 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ClassTypeParameterNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ClassTypeParameterNameCheck.xml
@@ -11,7 +11,7 @@
             <property default-value="^[A-Z]$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ConstantNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ConstantNameCheck.xml
index d6cf642eda4..ce788900ac4 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ConstantNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ConstantNameCheck.xml
@@ -12,22 +12,22 @@
  &lt;/strong&gt;.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"
-                      name="format"
-                      type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+            <property default-value="true" name="applyToPackage" type="boolean">
+               <description>Control if check should apply to package-private members.</description>
             </property>
-            <property default-value="true" name="applyToPublic" type="boolean">
-               <description>Controls whether to apply the check to public member.</description>
+            <property default-value="true" name="applyToPrivate" type="boolean">
+               <description>Control if check should apply to private members.</description>
             </property>
             <property default-value="true" name="applyToProtected" type="boolean">
-               <description>Controls whether to apply the check to protected member.</description>
+               <description>Control if check should apply to protected members.</description>
             </property>
-            <property default-value="true" name="applyToPackage" type="boolean">
-               <description>Controls whether to apply the check to package-private member.</description>
+            <property default-value="true" name="applyToPublic" type="boolean">
+               <description>Control if check should apply to public members.</description>
             </property>
-            <property default-value="true" name="applyToPrivate" type="boolean">
-               <description>Controls whether to apply the check to private member.</description>
+            <property default-value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"
+                      name="format"
+                      type="java.util.regex.Pattern">
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/IllegalIdentifierNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/IllegalIdentifierNameCheck.xml
index 9e17fb9ccc4..80abaef2458 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/IllegalIdentifierNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/IllegalIdentifierNameCheck.xml
@@ -17,7 +17,7 @@
             <property default-value="(?i)^(?!(record|yield|var|permits|sealed|_)$).+$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
             <property default-value="CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_CONSTANT_DEF,PATTERN_VARIABLE_DEF,RECORD_DEF,RECORD_COMPONENT_DEF,LAMBDA"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/InterfaceTypeParameterNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/InterfaceTypeParameterNameCheck.xml
index 0a031d234a0..0b34c3e31e5 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/InterfaceTypeParameterNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/InterfaceTypeParameterNameCheck.xml
@@ -11,7 +11,7 @@
             <property default-value="^[A-Z]$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LambdaParameterNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LambdaParameterNameCheck.xml
index a876b88de0c..7c519aafa81 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LambdaParameterNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LambdaParameterNameCheck.xml
@@ -11,7 +11,7 @@
             <property default-value="^[a-z][a-zA-Z0-9]*$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalFinalVariableNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalFinalVariableNameCheck.xml
index 614e509c74c..2b8b4a645a9 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalFinalVariableNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalFinalVariableNameCheck.xml
@@ -13,7 +13,7 @@
             <property default-value="^[a-z][a-zA-Z0-9]*$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
             <property default-value="VARIABLE_DEF,PARAMETER_DEF,RESOURCE"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalVariableNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalVariableNameCheck.xml
index f18acdb5041..7b46855bad3 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalVariableNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/LocalVariableNameCheck.xml
@@ -10,11 +10,6 @@
  a local variable.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^[a-z][a-zA-Z0-9]*$"
-                      name="format"
-                      type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
-            </property>
             <property default-value="false"
                       name="allowOneCharVarInForLoop"
                       type="boolean">
@@ -23,6 +18,11 @@
  initialization expressions&lt;/a&gt;
  in FOR loop if one char variable name is prohibited by {@code format} regexp.</description>
             </property>
+            <property default-value="^[a-z][a-zA-Z0-9]*$"
+                      name="format"
+                      type="java.util.regex.Pattern">
+               <description>Sets the pattern to match valid identifiers.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="name.invalidPattern"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MemberNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MemberNameCheck.xml
index d1811306a00..88aa5d7a234 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MemberNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MemberNameCheck.xml
@@ -8,22 +8,22 @@
  Checks that instance variable names conform to a specified pattern.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^[a-z][a-zA-Z0-9]*$"
-                      name="format"
-                      type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+            <property default-value="true" name="applyToPackage" type="boolean">
+               <description>Control if check should apply to package-private members.</description>
             </property>
-            <property default-value="true" name="applyToPublic" type="boolean">
-               <description>Controls whether to apply the check to public member.</description>
+            <property default-value="true" name="applyToPrivate" type="boolean">
+               <description>Control if check should apply to private members.</description>
             </property>
             <property default-value="true" name="applyToProtected" type="boolean">
-               <description>Controls whether to apply the check to protected member.</description>
+               <description>Control if check should apply to protected members.</description>
             </property>
-            <property default-value="true" name="applyToPackage" type="boolean">
-               <description>Controls whether to apply the check to package-private member.</description>
+            <property default-value="true" name="applyToPublic" type="boolean">
+               <description>Control if check should apply to public members.</description>
             </property>
-            <property default-value="true" name="applyToPrivate" type="boolean">
-               <description>Controls whether to apply the check to private member.</description>
+            <property default-value="^[a-z][a-zA-Z0-9]*$"
+                      name="format"
+                      type="java.util.regex.Pattern">
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodNameCheck.xml
index 0477dac78be..917ec4ebc2d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodNameCheck.xml
@@ -16,33 +16,27 @@
  have a choice in renaming such methods.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^[a-z][a-zA-Z0-9]*$"
-                      name="format"
-                      type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
-            </property>
             <property default-value="false" name="allowClassName" type="boolean">
-               <description>Controls whether to allow a method name to have the same name
- as the residing class name. This is not to be confused with a constructor. An easy mistake is
- to place a return type on a constructor declaration which turns it into a method. For example:
- &lt;pre&gt;
- class MyClass {
-     public void MyClass() {} //this is a method
-     public MyClass() {} //this is a constructor
- }
- &lt;/pre&gt;</description>
+               <description>Control whether to allow a method name to have the same name
+ as the enclosing class name. Setting this property {@code false} helps to avoid
+ confusion between constructors and methods.</description>
             </property>
-            <property default-value="true" name="applyToPublic" type="boolean">
-               <description>Controls whether to apply the check to public member.</description>
+            <property default-value="true" name="applyToPackage" type="boolean">
+               <description>Control if check should apply to package-private members.</description>
+            </property>
+            <property default-value="true" name="applyToPrivate" type="boolean">
+               <description>Control if check should apply to private members.</description>
             </property>
             <property default-value="true" name="applyToProtected" type="boolean">
-               <description>Controls whether to apply the check to protected member.</description>
+               <description>Control if check should apply to protected members.</description>
             </property>
-            <property default-value="true" name="applyToPackage" type="boolean">
-               <description>Controls whether to apply the check to package-private member.</description>
+            <property default-value="true" name="applyToPublic" type="boolean">
+               <description>Control if check should apply to public members.</description>
             </property>
-            <property default-value="true" name="applyToPrivate" type="boolean">
-               <description>Controls whether to apply the check to private member.</description>
+            <property default-value="^[a-z][a-zA-Z0-9]*$"
+                      name="format"
+                      type="java.util.regex.Pattern">
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodTypeParameterNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodTypeParameterNameCheck.xml
index 1fb475c81ab..8860416506b 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodTypeParameterNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/MethodTypeParameterNameCheck.xml
@@ -11,7 +11,7 @@
             <property default-value="^[A-Z]$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PackageNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PackageNameCheck.xml
index e5f29d16709..e5bfd02567c 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PackageNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PackageNameCheck.xml
@@ -20,7 +20,7 @@
             <property default-value="^[a-z]+(\.[a-zA-Z_]\w*)*$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Control the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ParameterNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ParameterNameCheck.xml
index 7de80c7eb09..5db3844876a 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ParameterNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/ParameterNameCheck.xml
@@ -20,21 +20,21 @@
  LambdaParameterName&lt;/a&gt;.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="public, protected, package, private"
+                      name="accessModifiers"
+                      type="com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]">
+               <description>Access modifiers of methods where parameters are
+ checked.</description>
+            </property>
             <property default-value="^[a-z][a-zA-Z0-9]*$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
             <property default-value="false" name="ignoreOverridden" type="boolean">
                <description>Allows to skip methods with Override annotation from
  validation.</description>
             </property>
-            <property default-value="public, protected, package, private"
-                      name="accessModifiers"
-                      type="com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]">
-               <description>Access modifiers of methods where parameters are
- checked.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="name.invalidPattern"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PatternVariableNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PatternVariableNameCheck.xml
index 81e042223f1..44e35ac0cd2 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PatternVariableNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/PatternVariableNameCheck.xml
@@ -11,7 +11,7 @@
             <property default-value="^[a-z][a-zA-Z0-9]*$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordComponentNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordComponentNameCheck.xml
index f0d90866d15..4eefa6ce8bf 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordComponentNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordComponentNameCheck.xml
@@ -11,7 +11,7 @@
             <property default-value="^[a-z][a-zA-Z0-9]*$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordTypeParameterNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordTypeParameterNameCheck.xml
index 067259ab6df..90600f8bfbf 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordTypeParameterNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/RecordTypeParameterNameCheck.xml
@@ -11,7 +11,7 @@
             <property default-value="^[A-Z]$"
                       name="format"
                       type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/StaticVariableNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/StaticVariableNameCheck.xml
index 2ff957cdc3a..170e82e52cf 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/StaticVariableNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/StaticVariableNameCheck.xml
@@ -8,22 +8,24 @@
  Checks that {@code static}, non-{@code final} variable names conform to a specified pattern.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^[a-z][a-zA-Z0-9]*$"
-                      name="format"
-                      type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+            <property default-value="true" name="applyToPackage" type="boolean">
+               <description>Control if check should apply to package-private
+   members.</description>
             </property>
-            <property default-value="true" name="applyToPublic" type="boolean">
-               <description>Controls whether to apply the check to public member.</description>
+            <property default-value="true" name="applyToPrivate" type="boolean">
+               <description>Control if check should apply to private members.</description>
             </property>
             <property default-value="true" name="applyToProtected" type="boolean">
-               <description>Controls whether to apply the check to protected member.</description>
+               <description>Control if check should apply to protected
+   members.</description>
             </property>
-            <property default-value="true" name="applyToPackage" type="boolean">
-               <description>Controls whether to apply the check to package-private member.</description>
+            <property default-value="true" name="applyToPublic" type="boolean">
+               <description>Control if check should apply to public members.</description>
             </property>
-            <property default-value="true" name="applyToPrivate" type="boolean">
-               <description>Controls whether to apply the check to private member.</description>
+            <property default-value="^[a-z][a-zA-Z0-9]*$"
+                      name="format"
+                      type="java.util.regex.Pattern">
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/TypeNameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/TypeNameCheck.xml
index 264dc7f74b2..676285d98a1 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/TypeNameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/naming/TypeNameCheck.xml
@@ -8,22 +8,24 @@
  Checks that type names conform to a specified pattern.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^[A-Z][a-zA-Z0-9]*$"
-                      name="format"
-                      type="java.util.regex.Pattern">
-               <description>Specifies valid identifiers.</description>
+            <property default-value="true" name="applyToPackage" type="boolean">
+               <description>Control if check should apply to package-private
+   members.</description>
             </property>
-            <property default-value="true" name="applyToPublic" type="boolean">
-               <description>Controls whether to apply the check to public member.</description>
+            <property default-value="true" name="applyToPrivate" type="boolean">
+               <description>Control if check should apply to private members.</description>
             </property>
             <property default-value="true" name="applyToProtected" type="boolean">
-               <description>Controls whether to apply the check to protected member.</description>
+               <description>Control if check should apply to protected
+   members.</description>
             </property>
-            <property default-value="true" name="applyToPackage" type="boolean">
-               <description>Controls whether to apply the check to package-private member.</description>
+            <property default-value="true" name="applyToPublic" type="boolean">
+               <description>Control if check should apply to public members.</description>
             </property>
-            <property default-value="true" name="applyToPrivate" type="boolean">
-               <description>Controls whether to apply the check to private member.</description>
+            <property default-value="^[A-Z][a-zA-Z0-9]*$"
+                      name="format"
+                      type="java.util.regex.Pattern">
+               <description>Sets the pattern to match valid identifiers.</description>
             </property>
             <property default-value="CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,RECORD_DEF"
                       name="tokens"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpCheck.xml
index fe34ff9ee3d..4edb099b2d5 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpCheck.xml
@@ -58,16 +58,6 @@
  The regular expression should be entered on one line.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="^$" name="format" type="java.util.regex.Pattern">
-               <description>Specify the pattern to match against.</description>
-            </property>
-            <property name="message" type="java.lang.String">
-               <description>Specify message which is used to notify about
- violations, if empty then the default (hard-coded) message is used.</description>
-            </property>
-            <property default-value="false" name="illegalPattern" type="boolean">
-               <description>Control whether the pattern is required or illegal.</description>
-            </property>
             <property default-value="0" name="duplicateLimit" type="int">
                <description>Control whether to check for duplicates
  of a required pattern, any negative value means no checking for duplicates,
@@ -78,9 +68,19 @@
                <description>Specify the maximum number of violations before
  the check will abort.</description>
             </property>
+            <property default-value="^$" name="format" type="java.util.regex.Pattern">
+               <description>Specify the pattern to match against.</description>
+            </property>
             <property default-value="false" name="ignoreComments" type="boolean">
                <description>Control whether to ignore matches found within comments.</description>
             </property>
+            <property default-value="false" name="illegalPattern" type="boolean">
+               <description>Control whether the pattern is required or illegal.</description>
+            </property>
+            <property name="message" type="java.lang.String">
+               <description>Specify message which is used to notify about
+ violations, if empty then the default (hard-coded) message is used.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="duplicate.regexp"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpMultilineCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpMultilineCheck.xml
index 125d61a9b69..f9c70c16c87 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpMultilineCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpMultilineCheck.xml
@@ -11,28 +11,28 @@
  Rationale: This check can be used to when the regular expression can be span multiple lines.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="" name="fileExtensions" type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
+            </property>
             <property default-value="$." name="format" type="java.util.regex.Pattern">
                <description>Specify the format of the regular expression to match.</description>
             </property>
-            <property name="message" type="java.lang.String">
-               <description>Specify the message which is used to notify about
- violations, if empty then default (hard-coded) message is used.</description>
-            </property>
             <property default-value="false" name="ignoreCase" type="boolean">
                <description>Control whether to ignore case when searching.</description>
             </property>
-            <property default-value="0" name="minimum" type="int">
-               <description>Specify the minimum number of matches required in each file.</description>
+            <property default-value="false" name="matchAcrossLines" type="boolean">
+               <description>Control whether to match expressions
+ across multiple lines.</description>
             </property>
             <property default-value="0" name="maximum" type="int">
                <description>Specify the maximum number of matches required in each file.</description>
             </property>
-            <property default-value="false" name="matchAcrossLines" type="boolean">
-               <description>Control whether to match expressions
- across multiple lines.</description>
+            <property name="message" type="java.lang.String">
+               <description>Specify the message which is used to notify about
+ violations, if empty then default (hard-coded) message is used.</description>
             </property>
-            <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify the file type extension of files to process.</description>
+            <property default-value="0" name="minimum" type="int">
+               <description>Specify the minimum number of matches required in each file.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpOnFilenameCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpOnFilenameCheck.xml
index 441cb1e96f5..3c9b2af061f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpOnFilenameCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpOnFilenameCheck.xml
@@ -45,15 +45,14 @@
  messages.
  &lt;/p&gt;</description>
          <properties>
-            <property name="folderPattern" type="java.util.regex.Pattern">
-               <description>Specify the regular expression to match the folder path against.</description>
+            <property default-value="" name="fileExtensions" type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
             </property>
             <property name="fileNamePattern" type="java.util.regex.Pattern">
                <description>Specify the regular expression to match the file name against.</description>
             </property>
-            <property default-value="true" name="match" type="boolean">
-               <description>Control whether to look for a match or mismatch on the file name, if
- the fileNamePattern is supplied, otherwise it is applied on the folderPattern.</description>
+            <property name="folderPattern" type="java.util.regex.Pattern">
+               <description>Specify the regular expression to match the folder path against.</description>
             </property>
             <property default-value="false"
                       name="ignoreFileNameExtensions"
@@ -61,10 +60,9 @@
                <description>Control whether to ignore the file extension for
  the file name match.</description>
             </property>
-            <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify the file type extension of files to process. If this is
- specified, then only files that match these types are examined with the other
- patterns.</description>
+            <property default-value="true" name="match" type="boolean">
+               <description>Control whether to look for a match or mismatch on the file name, if
+ the fileNamePattern is supplied, otherwise it is applied on the folderPattern.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineCheck.xml
index 8617a808295..1aef3b92af1 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineCheck.xml
@@ -13,24 +13,24 @@
  {@code System.out.println()}, {@code System.exit()}, etc.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="" name="fileExtensions" type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
+            </property>
             <property default-value="$." name="format" type="java.util.regex.Pattern">
                <description>Specify the format of the regular expression to match.</description>
             </property>
-            <property name="message" type="java.lang.String">
-               <description>Specify the message which is used to notify about
- violations, if empty then default (hard-coded) message is used.</description>
-            </property>
             <property default-value="false" name="ignoreCase" type="boolean">
                <description>Control whether to ignore case when searching.</description>
             </property>
-            <property default-value="0" name="minimum" type="int">
-               <description>Specify the minimum number of matches required in each file.</description>
-            </property>
             <property default-value="0" name="maximum" type="int">
                <description>Specify the maximum number of matches required in each file.</description>
             </property>
-            <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify the file type extension of files to process.</description>
+            <property name="message" type="java.lang.String">
+               <description>Specify the message which is used to notify about
+ violations, if empty then default (hard-coded) message is used.</description>
+            </property>
+            <property default-value="0" name="minimum" type="int">
+               <description>Specify the minimum number of matches required in each file.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineJavaCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineJavaCheck.xml
index 201d645ba32..cd6756e9740 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineJavaCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/regexp/RegexpSinglelineJavaCheck.xml
@@ -18,21 +18,21 @@
             <property default-value="$." name="format" type="java.util.regex.Pattern">
                <description>Specify the format of the regular expression to match.</description>
             </property>
-            <property name="message" type="java.lang.String">
-               <description>Specify the message which is used to notify about
- violations, if empty then default (hard-coded) message is used.</description>
-            </property>
             <property default-value="false" name="ignoreCase" type="boolean">
                <description>Control whether to ignore case when searching.</description>
             </property>
-            <property default-value="0" name="minimum" type="int">
-               <description>Specify the minimum number of matches required in each file.</description>
+            <property default-value="false" name="ignoreComments" type="boolean">
+               <description>Control whether to ignore text in comments when searching.</description>
             </property>
             <property default-value="0" name="maximum" type="int">
                <description>Specify the maximum number of matches required in each file.</description>
             </property>
-            <property default-value="false" name="ignoreComments" type="boolean">
-               <description>Control whether to ignore text in comments when searching.</description>
+            <property name="message" type="java.lang.String">
+               <description>Specify the message which is used to notify about
+ violations, if empty then default (hard-coded) message is used.</description>
+            </property>
+            <property default-value="0" name="minimum" type="int">
+               <description>Specify the minimum number of matches required in each file.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/FileLengthCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/FileLengthCheck.xml
index 25cd0cdc272..d1ff0109e29 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/FileLengthCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/FileLengthCheck.xml
@@ -13,12 +13,12 @@
  individual classes that focus on a specific task.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="" name="fileExtensions" type="java.lang.String[]">
+               <description>Specify the file extensions of the files to process.</description>
+            </property>
             <property default-value="2000" name="max" type="int">
                <description>Specify the maximum number of lines allowed.</description>
             </property>
-            <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify the file type extension of files to process.</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="maxLen.file"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/LineLengthCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/LineLengthCheck.xml
index 310b22162bd..cb988d06e84 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/LineLengthCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/LineLengthCheck.xml
@@ -36,7 +36,7 @@
  &lt;/ul&gt;</description>
          <properties>
             <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify file extensions that are accepted.</description>
+               <description>Specify the file extensions of the files to process.</description>
             </property>
             <property default-value="^(package|import) .*"
                       name="ignorePattern"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodCountCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodCountCheck.xml
index 7acf23a3575..6c9385e2909 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodCountCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodCountCheck.xml
@@ -45,21 +45,21 @@
  }
  &lt;/pre&gt;</description>
          <properties>
-            <property default-value="100" name="maxTotal" type="int">
-               <description>Specify the maximum number of methods allowed at all scope levels.</description>
+            <property default-value="100" name="maxPackage" type="int">
+               <description>Specify the maximum number of {@code package} methods allowed.</description>
             </property>
             <property default-value="100" name="maxPrivate" type="int">
                <description>Specify the maximum number of {@code private} methods allowed.</description>
             </property>
-            <property default-value="100" name="maxPackage" type="int">
-               <description>Specify the maximum number of {@code package} methods allowed.</description>
-            </property>
             <property default-value="100" name="maxProtected" type="int">
                <description>Specify the maximum number of {@code protected} methods allowed.</description>
             </property>
             <property default-value="100" name="maxPublic" type="int">
                <description>Specify the maximum number of {@code public} methods allowed.</description>
             </property>
+            <property default-value="100" name="maxTotal" type="int">
+               <description>Specify the maximum number of methods allowed at all scope levels.</description>
+            </property>
             <property default-value="CLASS_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,INTERFACE_DEF,ANNOTATION_DEF,RECORD_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodLengthCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodLengthCheck.xml
index dc4d11ce59d..68fae374e82 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodLengthCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/MethodLengthCheck.xml
@@ -13,12 +13,12 @@
  individual methods that focus on a specific task.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="150" name="max" type="int">
-               <description>Specify the maximum number of lines allowed.</description>
-            </property>
             <property default-value="true" name="countEmpty" type="boolean">
                <description>Control whether to count empty lines and comments.</description>
             </property>
+            <property default-value="150" name="max" type="int">
+               <description>Specify the maximum number of lines allowed.</description>
+            </property>
             <property default-value="METHOD_DEF,CTOR_DEF,COMPACT_CTOR_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/ParameterNumberCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/ParameterNumberCheck.xml
index 69bf51bd1b3..b07bfce241a 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/ParameterNumberCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/ParameterNumberCheck.xml
@@ -8,13 +8,17 @@
  Checks the number of parameters of a method or constructor.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="7" name="max" type="int">
-               <description>Specify the maximum number of parameters allowed.</description>
+            <property default-value="" name="ignoreAnnotatedBy" type="java.lang.String[]">
+               <description>Ignore methods and constructors
+ annotated with the specified annotation(s).</description>
             </property>
             <property default-value="false" name="ignoreOverriddenMethods" type="boolean">
                <description>Ignore number of parameters for
  methods with {@code @Override} annotation.</description>
             </property>
+            <property default-value="7" name="max" type="int">
+               <description>Specify the maximum number of parameters allowed.</description>
+            </property>
             <property default-value="METHOD_DEF,CTOR_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/RecordComponentNumberCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/RecordComponentNumberCheck.xml
index 59a3ad1ee98..2784befe886 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/RecordComponentNumberCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/sizes/RecordComponentNumberCheck.xml
@@ -10,16 +10,16 @@
  header&lt;/a&gt; of a record definition.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="8" name="max" type="int">
-               <description>Specify the maximum number of components allowed in the header of a
- record definition.</description>
-            </property>
             <property default-value="public, protected, package, private"
                       name="accessModifiers"
                       type="com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]">
                <description>Access modifiers of record definitions where
  the number of record components should be checked.</description>
             </property>
+            <property default-value="8" name="max" type="int">
+               <description>Specify the maximum number of components allowed in the header of a
+ record definition.</description>
+            </property>
          </properties>
          <message-keys>
             <message-key key="too.many.components"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/EmptyLineSeparatorCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/EmptyLineSeparatorCheck.xml
index ec14373975b..9c817c8a42a 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/EmptyLineSeparatorCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/EmptyLineSeparatorCheck.xml
@@ -21,11 +21,6 @@
  Also, trailing comments are skipped.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="false"
-                      name="allowNoEmptyLineBetweenFields"
-                      type="boolean">
-               <description>Allow no empty line between fields.</description>
-            </property>
             <property default-value="true" name="allowMultipleEmptyLines" type="boolean">
                <description>Allow multiple empty lines between class members.</description>
             </property>
@@ -35,7 +30,12 @@
                <description>Allow multiple
  empty lines inside class members.</description>
             </property>
-            <property default-value="PACKAGE_DEF,IMPORT,STATIC_IMPORT,CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,STATIC_INIT,INSTANCE_INIT,CTOR_DEF,VARIABLE_DEF,RECORD_DEF,COMPACT_CTOR_DEF"
+            <property default-value="false"
+                      name="allowNoEmptyLineBetweenFields"
+                      type="boolean">
+               <description>Allow no empty line between fields.</description>
+            </property>
+            <property default-value="PACKAGE_DEF,IMPORT,STATIC_IMPORT,CLASS_DEF,INTERFACE_DEF,ENUM_DEF,STATIC_INIT,INSTANCE_INIT,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,RECORD_DEF,COMPACT_CTOR_DEF"
                       name="tokens"
                       type="java.lang.String[]"
                       validation-type="tokenSet">
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/FileTabCharacterCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/FileTabCharacterCheck.xml
index 1ff57555a8f..ca93a4f74cb 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/FileTabCharacterCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/FileTabCharacterCheck.xml
@@ -27,7 +27,7 @@
  or just the first instance.</description>
             </property>
             <property default-value="" name="fileExtensions" type="java.lang.String[]">
-               <description>Specify file type extension of files to process.</description>
+               <description>Specify the file extensions of the files to process.</description>
             </property>
          </properties>
          <message-keys>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/GenericWhitespaceCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/GenericWhitespaceCheck.xml
index f81ed03645f..80366fce72d 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/GenericWhitespaceCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/GenericWhitespaceCheck.xml
@@ -26,7 +26,8 @@
  &lt;ul&gt;
  &lt;li&gt; should not be preceded with whitespace in all cases.&lt;/li&gt;
  &lt;li&gt; should be followed with whitespace in almost all cases,
-   except diamond operators and when preceding method name or constructor.&lt;/li&gt;&lt;/ul&gt;</description>
+   except diamond operators and when preceding a method name, constructor, or record header.&lt;/li&gt;
+ &lt;/ul&gt;</description>
          <message-keys>
             <message-key key="ws.followed"/>
             <message-key key="ws.illegalFollow"/>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/WhitespaceAroundCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/WhitespaceAroundCheck.xml
index d16830df4f0..3f1ed5dffc6 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/WhitespaceAroundCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/WhitespaceAroundCheck.xml
@@ -48,25 +48,29 @@
  With this property turned off, this raises violation because the beginning
  of the catch block (left curly bracket) is not separated from the end
  of the catch block (right curly bracket).
+ &lt;/p&gt;
+ &lt;p&gt;
+ Note: &lt;a href="https://openjdk.org/jeps/361"&gt;
+ Switch expressions&lt;/a&gt; are ignored by this check.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value="false" name="allowEmptyCatches" type="boolean">
+               <description>Allow empty catch bodies.</description>
+            </property>
             <property default-value="false" name="allowEmptyConstructors" type="boolean">
                <description>Allow empty constructor bodies.</description>
             </property>
-            <property default-value="false" name="allowEmptyMethods" type="boolean">
-               <description>Allow empty method bodies.</description>
-            </property>
-            <property default-value="false" name="allowEmptyTypes" type="boolean">
-               <description>Allow empty class, interface and enum bodies.</description>
+            <property default-value="false" name="allowEmptyLambdas" type="boolean">
+               <description>Allow empty lambda bodies.</description>
             </property>
             <property default-value="false" name="allowEmptyLoops" type="boolean">
                <description>Allow empty loop bodies.</description>
             </property>
-            <property default-value="false" name="allowEmptyLambdas" type="boolean">
-               <description>Allow empty lambda bodies.</description>
+            <property default-value="false" name="allowEmptyMethods" type="boolean">
+               <description>Allow empty method bodies.</description>
             </property>
-            <property default-value="false" name="allowEmptyCatches" type="boolean">
-               <description>Allow empty catch bodies.</description>
+            <property default-value="false" name="allowEmptyTypes" type="boolean">
+               <description>Allow empty class, interface and enum bodies.</description>
             </property>
             <property default-value="true" name="ignoreEnhancedForColon" type="boolean">
                <description>Ignore whitespace around colon in
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SeverityMatchFilter.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SeverityMatchFilter.xml
index 22f2e3cb8a7..9038c3af543 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SeverityMatchFilter.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SeverityMatchFilter.xml
@@ -12,11 +12,6 @@
  SeverityMatchFilter can suppress Checks that have Treewalker or Checker as parent module.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="error"
-                      name="severity"
-                      type="com.puppycrawl.tools.checkstyle.api.SeverityLevel">
-               <description>Specify the severity level of this filter.</description>
-            </property>
             <property default-value="true" name="acceptOnMatch" type="boolean">
                <description>Control whether the filter accepts an audit
  event if and only if there is a match between the event's severity level and
@@ -24,6 +19,11 @@
  an audit event if and only if there is not a match between the event's severity
  level and property severity.</description>
             </property>
+            <property default-value="error"
+                      name="severity"
+                      type="com.puppycrawl.tools.checkstyle.api.SeverityLevel">
+               <description>Specify the severity level of this filter.</description>
+            </property>
          </properties>
       </filter>
    </module>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyCommentFilter.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyCommentFilter.xml
index 33b30b5baae..74838e3eb72 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyCommentFilter.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyCommentFilter.xml
@@ -26,18 +26,21 @@
  Treewalker as parent module.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="SUPPRESS CHECKSTYLE (\w+)"
-                      name="commentFormat"
-                      type="java.util.regex.Pattern">
-               <description>Specify comment pattern to trigger filter to begin suppression.</description>
+            <property default-value="true" name="checkC" type="boolean">
+               <description>Control whether to check C style comments ({@code &amp;#47;* ... *&amp;#47;}).</description>
+            </property>
+            <property default-value="true" name="checkCPP" type="boolean">
+               <description>Control whether to check C++ style comments ({@code //}).</description>
             </property>
             <property default-value=".*"
                       name="checkFormat"
                       type="java.util.regex.Pattern">
                <description>Specify check pattern to suppress.</description>
             </property>
-            <property name="messageFormat" type="java.util.regex.Pattern">
-               <description>Define message pattern to suppress.</description>
+            <property default-value="SUPPRESS CHECKSTYLE (\w+)"
+                      name="commentFormat"
+                      type="java.util.regex.Pattern">
+               <description>Specify comment pattern to trigger filter to begin suppression.</description>
             </property>
             <property name="idFormat" type="java.util.regex.Pattern">
                <description>Specify check ID pattern to suppress.</description>
@@ -46,11 +49,8 @@
                <description>Specify negative/zero/positive value that
  defines the number of lines preceding/at/following the suppression comment.</description>
             </property>
-            <property default-value="true" name="checkCPP" type="boolean">
-               <description>Control whether to check C++ style comments ({@code //}).</description>
-            </property>
-            <property default-value="true" name="checkC" type="boolean">
-               <description>Control whether to check C style comments ({@code &amp;#47;* ... *&amp;#47;}).</description>
+            <property name="messageFormat" type="java.util.regex.Pattern">
+               <description>Define message pattern to suppress.</description>
             </property>
          </properties>
       </filter>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyTextFilter.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyTextFilter.xml
index 93a1b513805..7bdf2434d5f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyTextFilter.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithNearbyTextFilter.xml
@@ -15,12 +15,6 @@
  out of the rest of the file as a suppression. See the default value as an example.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="SUPPRESS CHECKSTYLE (\w+)"
-                      name="nearbyTextPattern"
-                      type="java.util.regex.Pattern">
-               <description>Specify nearby text
- pattern to trigger filter to begin suppression.</description>
-            </property>
             <property default-value=".*"
                       name="checkPattern"
                       type="java.util.regex.Pattern">
@@ -28,9 +22,6 @@
  Property can also be a RegExp group index at {@code nearbyTextPattern} in
  format of {@code $x} and be picked from line that matches {@code nearbyTextPattern}.</description>
             </property>
-            <property name="messagePattern" type="java.util.regex.Pattern">
-               <description>Specify check violation message pattern to suppress.</description>
-            </property>
             <property name="idPattern" type="java.util.regex.Pattern">
                <description>Specify check ID pattern to suppress.</description>
             </property>
@@ -40,6 +31,15 @@
  Property can also be a RegExp group index at {@code nearbyTextPattern} in
  format of {@code $x} and be picked from line that matches {@code nearbyTextPattern}.</description>
             </property>
+            <property name="messagePattern" type="java.util.regex.Pattern">
+               <description>Specify check violation message pattern to suppress.</description>
+            </property>
+            <property default-value="SUPPRESS CHECKSTYLE (\w+)"
+                      name="nearbyTextPattern"
+                      type="java.util.regex.Pattern">
+               <description>Specify nearby text
+ pattern to trigger filter to begin suppression.</description>
+            </property>
          </properties>
       </filter>
    </module>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithPlainTextCommentFilter.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithPlainTextCommentFilter.xml
index 5cd295c24c9..0eb9f49625e 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithPlainTextCommentFilter.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressWithPlainTextCommentFilter.xml
@@ -40,6 +40,17 @@
  Checker as parent module.
  &lt;/p&gt;</description>
          <properties>
+            <property default-value=".*"
+                      name="checkFormat"
+                      type="java.util.regex.Pattern">
+               <description>Specify check pattern to suppress.</description>
+            </property>
+            <property name="idFormat" type="java.util.regex.Pattern">
+               <description>Specify check ID pattern to suppress.</description>
+            </property>
+            <property name="messageFormat" type="java.util.regex.Pattern">
+               <description>Specify message pattern to suppress.</description>
+            </property>
             <property default-value="// CHECKSTYLE:OFF"
                       name="offCommentFormat"
                       type="java.util.regex.Pattern">
@@ -52,17 +63,6 @@
                <description>Specify comment pattern to trigger filter
  to end suppression.</description>
             </property>
-            <property default-value=".*"
-                      name="checkFormat"
-                      type="java.util.regex.Pattern">
-               <description>Specify check pattern to suppress.</description>
-            </property>
-            <property name="messageFormat" type="java.util.regex.Pattern">
-               <description>Specify message pattern to suppress.</description>
-            </property>
-            <property name="idFormat" type="java.util.regex.Pattern">
-               <description>Specify check ID pattern to suppress.</description>
-            </property>
          </properties>
       </filter>
    </module>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionCommentFilter.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionCommentFilter.xml
index 616c52b16df..7a7e9659228 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionCommentFilter.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionCommentFilter.xml
@@ -36,33 +36,33 @@
  SuppressionCommentFilter can suppress Checks that have Treewalker as parent module.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="CHECKSTYLE:OFF"
-                      name="offCommentFormat"
-                      type="java.util.regex.Pattern">
-               <description>Specify comment pattern to
- trigger filter to begin suppression.</description>
+            <property default-value="true" name="checkC" type="boolean">
+               <description>Control whether to check C style comments ({@code &amp;#47;* ... *&amp;#47;}).</description>
             </property>
-            <property default-value="CHECKSTYLE:ON"
-                      name="onCommentFormat"
-                      type="java.util.regex.Pattern">
-               <description>Specify comment pattern to trigger filter to end suppression.</description>
+            <property default-value="true" name="checkCPP" type="boolean">
+               <description>Control whether to check C++ style comments ({@code //}).</description>
             </property>
             <property default-value=".*"
                       name="checkFormat"
                       type="java.util.regex.Pattern">
                <description>Specify check pattern to suppress.</description>
             </property>
-            <property name="messageFormat" type="java.util.regex.Pattern">
-               <description>Specify message pattern to suppress.</description>
-            </property>
             <property name="idFormat" type="java.util.regex.Pattern">
                <description>Specify check ID pattern to suppress.</description>
             </property>
-            <property default-value="true" name="checkCPP" type="boolean">
-               <description>Control whether to check C++ style comments ({@code //}).</description>
+            <property name="messageFormat" type="java.util.regex.Pattern">
+               <description>Specify message pattern to suppress.</description>
             </property>
-            <property default-value="true" name="checkC" type="boolean">
-               <description>Control whether to check C style comments ({@code &amp;#47;* ... *&amp;#47;}).</description>
+            <property default-value="CHECKSTYLE:OFF"
+                      name="offCommentFormat"
+                      type="java.util.regex.Pattern">
+               <description>Specify comment pattern to
+ trigger filter to begin suppression.</description>
+            </property>
+            <property default-value="CHECKSTYLE:ON"
+                      name="onCommentFormat"
+                      type="java.util.regex.Pattern">
+               <description>Specify comment pattern to trigger filter to end suppression.</description>
             </property>
          </properties>
       </filter>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionSingleFilter.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionSingleFilter.xml
index 6e7a6e4cab6..7b761a15e44 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionSingleFilter.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionSingleFilter.xml
@@ -26,17 +26,17 @@
  Checker as parent module.
  &lt;/p&gt;</description>
          <properties>
-            <property name="files" type="java.util.regex.Pattern">
-               <description>Define the RegExp for matching against the file name associated with
- an audit event.</description>
-            </property>
             <property name="checks" type="java.util.regex.Pattern">
                <description>Define the RegExp for matching against the name of the check
  associated with an audit event.</description>
             </property>
-            <property name="message" type="java.util.regex.Pattern">
-               <description>Define the RegExp for matching against the message of the check
- associated with an audit event.</description>
+            <property name="columns" type="java.lang.String">
+               <description>Specify a comma-separated list of values, where each value is an
+ integer or a range of integers denoted by integer-integer.</description>
+            </property>
+            <property name="files" type="java.util.regex.Pattern">
+               <description>Define the RegExp for matching against the file name associated with
+ an audit event.</description>
             </property>
             <property name="id" type="java.lang.String">
                <description>Specify a string matched against the ID of the check associated with
@@ -46,9 +46,9 @@
                <description>Specify a comma-separated list of values, where each value is an
  integer or a range of integers denoted by integer-integer.</description>
             </property>
-            <property name="columns" type="java.lang.String">
-               <description>Specify a comma-separated list of values, where each value is an
- integer or a range of integers denoted by integer-integer.</description>
+            <property name="message" type="java.util.regex.Pattern">
+               <description>Define the RegExp for matching against the message of the check
+ associated with an audit event.</description>
             </property>
          </properties>
       </filter>
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionXpathSingleFilter.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionXpathSingleFilter.xml
index 2f2dcef7f23..33d3be0c3ec 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionXpathSingleFilter.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/filters/SuppressionXpathSingleFilter.xml
@@ -26,21 +26,21 @@
  SuppressionXpathSingleFilter can suppress Checks that have Treewalker as parent module.
  &lt;/p&gt;</description>
          <properties>
-            <property name="files" type="java.util.regex.Pattern">
-               <description>Define a Regular Expression matched against the file
- name associated with an audit event.</description>
-            </property>
             <property name="checks" type="java.util.regex.Pattern">
                <description>Define a Regular Expression matched against the name
  of the check associated with an audit event.</description>
             </property>
-            <property name="message" type="java.util.regex.Pattern">
-               <description>Define a Regular Expression matched against the message
- of the check associated with an audit event.</description>
+            <property name="files" type="java.util.regex.Pattern">
+               <description>Define a Regular Expression matched against the file
+ name associated with an audit event.</description>
             </property>
             <property name="id" type="java.lang.String">
                <description>Define a string matched against the ID of the check
  associated with an audit event.</description>
+            </property>
+            <property name="message" type="java.util.regex.Pattern">
+               <description>Define a Regular Expression matched against the message
+ of the check associated with an audit event.</description>
             </property>
             <property name="query" type="java.lang.String">
                <description>Define a string xpath query.</description>
diff --git a/src/main/resources/google_checks.xml b/src/main/resources/google_checks.xml
index bc47e7e7767..afdbfe5d56b 100644
--- a/src/main/resources/google_checks.xml
+++ b/src/main/resources/google_checks.xml
@@ -96,7 +96,7 @@
       <property name="tokens"
                value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
                     INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
-                    COMPACT_CTOR_DEF, LITERAL_SWITCH"/>
+                    COMPACT_CTOR_DEF, LITERAL_SWITCH, LITERAL_CASE"/>
     </module>
     <module name="SuppressionXpathSingleFilter">
       <!-- suppresion is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
diff --git a/src/site/resources/images/gui_screenshot_inspections_idea.png b/src/site/resources/images/gui_screenshot_inspections_idea.png
index 8b77c4d2dd6..1ad2a5e730a 100644
Binary files a/src/site/resources/images/gui_screenshot_inspections_idea.png and b/src/site/resources/images/gui_screenshot_inspections_idea.png differ
diff --git a/src/site/resources/images/gui_screenshot_organize_imports_idea.jpg b/src/site/resources/images/gui_screenshot_organize_imports_idea.jpg
index a191a857f10..bc84ed3ecca 100644
Binary files a/src/site/resources/images/gui_screenshot_organize_imports_idea.jpg and b/src/site/resources/images/gui_screenshot_organize_imports_idea.jpg differ
diff --git a/src/site/site.xml b/src/site/site.xml
index 5181f54f6b6..0e21799ec3f 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -114,6 +114,8 @@
           <item name="AvoidInlineConditionals" href="checks/coding/avoidinlineconditionals.html"/>
           <item name="AvoidNoArgumentSuperConstructorCall"
                 href="checks/coding/avoidnoargumentsuperconstructorcall.html"/>
+          <item name="ConstructorsDeclarationGrouping"
+                href="checks/coding/constructorsdeclarationgrouping.html"/>
           <item name="CovariantEquals" href="checks/coding/covariantequals.html"/>
           <item name="DeclarationOrder" href="checks/coding/declarationorder.html"/>
           <item name="DefaultComesLast" href="checks/coding/defaultcomeslast.html"/>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBeanTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBeanTest.java
index 85d6696c453..7a18b8acbaa 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBeanTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractAutomaticBeanTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,9 @@
 
 import java.net.URI;
 import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.beanutils.ConvertUtilsBean;
@@ -278,6 +280,60 @@ public void testBeanConvertersUri3() {
         }
     }
 
+    @Test
+    public void testBeanConverterPatternArray() throws Exception {
+        final ConverterBean bean = new ConverterBean();
+        final DefaultConfiguration config = new DefaultConfiguration("bean");
+        final String patternString = "^a*$  , ^b*$ , ^c*$ ";
+        final List<String> expectedPatternStrings = Arrays.asList("^a*$", "^b*$", "^c*$");
+        config.addProperty("patterns", patternString);
+        bean.configure(config);
+
+        final List<String> actualPatternStrings = Arrays.stream(bean.patterns)
+                .map(Pattern::pattern)
+                .collect(Collectors.toUnmodifiableList());
+
+        assertWithMessage("invalid size of result")
+                .that(bean.patterns)
+                .hasLength(3);
+        assertWithMessage("invalid result")
+                .that(actualPatternStrings)
+                .containsExactlyElementsIn(expectedPatternStrings);
+    }
+
+    @Test
+    public void testBeanConverterPatternArraySingleElement() throws Exception {
+        final ConverterBean bean = new ConverterBean();
+        final DefaultConfiguration config = new DefaultConfiguration("bean");
+        final String patternString = "^a*$";
+        final List<String> expectedPatternStrings = List.of("^a*$");
+        config.addProperty("patterns", patternString);
+        bean.configure(config);
+
+        final List<String> actualPatternStrings = Arrays.stream(bean.patterns)
+                .map(Pattern::pattern)
+                .collect(Collectors.toUnmodifiableList());
+
+        assertWithMessage("invalid size of result")
+                .that(bean.patterns)
+                .hasLength(1);
+        assertWithMessage("invalid result")
+                .that(actualPatternStrings)
+                .containsExactlyElementsIn(expectedPatternStrings);
+    }
+
+    @Test
+    public void testBeanConverterPatternArrayEmptyString() throws Exception {
+        final ConverterBean bean = new ConverterBean();
+        final DefaultConfiguration config = new DefaultConfiguration("bean");
+        config.addProperty("patterns", "");
+        bean.configure(config);
+
+        assertWithMessage("invalid size of result")
+                .that(bean.patterns)
+                .hasLength(0);
+    }
+
     private static final class ConvertUtilsBeanStub extends ConvertUtilsBean {
 
         private int registerCount;
@@ -338,6 +394,7 @@ public static class ConverterBean extends AbstractAutomaticBean {
         private Scope scope;
         private URI uri;
         private AccessModifierOption[] accessModifiers;
+        private Pattern[] patterns;
 
         /**
          * Setter for strings.
@@ -394,6 +451,15 @@ public void setAccessModifiers(AccessModifierOption... accessModifiers) {
                     accessModifiers.length);
         }
 
+        /**
+         * Setter for patterns.
+         *
+         * @param patterns patterns
+         */
+        public void setPatterns(Pattern... patterns) {
+            this.patterns = Arrays.copyOf(patterns, patterns.length);
+        }
+
         @Override
         protected void finishLocalSetup() {
             // no code
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java
index 780e64be95f..b400f1c4176 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java
index 9d15de20f84..0cfe7d70930 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -220,6 +220,25 @@ protected final void verifyFilterWithInlineConfigParser(String filePath,
         verify(configWithFilters, filePath, expectedFiltered);
     }
 
+    /**
+     * Performs verification of the file with given file path using configurations parsed from
+     * xml header of the file and the array expected messages. Also performs verification of
+     * the config specified in input file.
+     *
+     * @param filePath file path to verify
+     * @param expected an array of expected messages
+     * @throws Exception if exception occurs
+     */
+    protected final void verifyWithInlineXmlConfig(String filePath, String... expected)
+            throws Exception {
+        final TestInputConfiguration testInputConfiguration =
+                InlineConfigParser.parseWithXmlHeader(filePath);
+        final Configuration xmlConfig =
+                testInputConfiguration.getXmlConfiguration();
+        verifyViolations(xmlConfig, filePath, testInputConfiguration.getViolations());
+        verify(xmlConfig, filePath, expected);
+    }
+
     /**
      * Performs verification of the file with the given file path using specified configuration
      * and the array expected messages. Also performs verification of the config specified in
@@ -235,8 +254,11 @@ protected final void verifyWithInlineConfigParser(String filePath, String... exp
                 InlineConfigParser.parse(filePath);
         final DefaultConfiguration parsedConfig =
                 testInputConfiguration.createConfiguration();
-        verifyViolations(parsedConfig, filePath, testInputConfiguration.getViolations());
-        verify(parsedConfig, filePath, expected);
+        final List<String> actualViolations = getActualViolationsForFile(parsedConfig, filePath);
+        verifyViolations(filePath, testInputConfiguration.getViolations(), actualViolations);
+        assertWithMessage("Violations for %s differ.", filePath)
+            .that(actualViolations)
+            .containsExactlyElementsIn(expected);
     }
 
     /**
@@ -254,12 +276,14 @@ protected final void verifyWithInlineConfigParser(String filePath1,
                                                       String filePath2,
                                                       String... expected)
             throws Exception {
-        final TestInputConfiguration testInputConfiguration =
+        final TestInputConfiguration testInputConfiguration1 =
                 InlineConfigParser.parse(filePath1);
         final DefaultConfiguration parsedConfig =
-                testInputConfiguration.createConfiguration();
-        verifyViolations(parsedConfig, filePath1, testInputConfiguration.getViolations());
-        verifyViolations(parsedConfig, filePath2, testInputConfiguration.getViolations());
+                testInputConfiguration1.createConfiguration();
+        final TestInputConfiguration testInputConfiguration2 =
+                InlineConfigParser.parse(filePath2);
+        verifyViolations(parsedConfig, filePath1, testInputConfiguration1.getViolations());
+        verifyViolations(parsedConfig, filePath2, testInputConfiguration2.getViolations());
         verify(createChecker(parsedConfig),
                 new File[] {new File(filePath1), new File(filePath2)},
                 filePath1,
@@ -296,6 +320,25 @@ protected final void verifyWithInlineConfigParser(String filePath1,
             filePath2, expectedFromFile2));
     }
 
+    /**
+     * Performs verification of the file with the given file path using specified configuration
+     * and the array expected messages. Also performs verification of the config specified in
+     * input file
+     *
+     * @param filePath file path to verify.
+     * @param expected an array of expected messages.
+     * @throws Exception if exception occurs during verification process.
+     */
+    protected void verifyWithInlineConfigParserTwice(String filePath, String... expected)
+            throws Exception {
+        final TestInputConfiguration testInputConfiguration =
+                InlineConfigParser.parse(filePath);
+        final DefaultConfiguration parsedConfig =
+                testInputConfiguration.createConfiguration();
+        verifyViolations(parsedConfig, filePath, testInputConfiguration.getViolations());
+        verify(parsedConfig, filePath, expected);
+    }
+
     /**
      * Performs verification of the file with the given file name. Uses specified configuration.
      * Expected messages are represented by the array of strings.
@@ -438,7 +481,22 @@ protected final void execute(Configuration config, String... filenames) throws E
         final Checker checker = createChecker(config);
         final List<File> files = Arrays.stream(filenames)
                 .map(File::new)
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
+        checker.process(files);
+        checker.destroy();
+    }
+
+    /**
+     * Executes given config on a list of files only. Does not verify violations.
+     *
+     * @param checker check configuration
+     * @param filenames names of files to process
+     * @throws Exception if there is a problem during checker configuration
+     */
+    protected static void execute(Checker checker, String... filenames) throws Exception {
+        final List<File> files = Arrays.stream(filenames)
+                .map(File::new)
+                .collect(Collectors.toUnmodifiableList());
         checker.process(files);
         checker.destroy();
     }
@@ -459,10 +517,37 @@ private void verifyViolations(Configuration config,
         final List<Integer> actualViolationLines = actualViolations.stream()
                 .map(violation -> violation.substring(0, violation.indexOf(':')))
                 .map(Integer::valueOf)
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
+        final List<Integer> expectedViolationLines = testInputViolations.stream()
+                .map(TestInputViolation::getLineNo)
+                .collect(Collectors.toUnmodifiableList());
+        assertWithMessage("Violation lines for %s differ.", file)
+                .that(actualViolationLines)
+                .isEqualTo(expectedViolationLines);
+        for (int index = 0; index < actualViolations.size(); index++) {
+            assertWithMessage("Actual and expected violations differ.")
+                    .that(actualViolations.get(index))
+                    .matches(testInputViolations.get(index).toRegex());
+        }
+    }
+
+    /**
+     * Performs verification of violation lines.
+     *
+     * @param file file path.
+     * @param testInputViolations List of TestInputViolation objects.
+     * @param actualViolations for a file
+     */
+    private static void verifyViolations(String file,
+                                  List<TestInputViolation> testInputViolations,
+                                  List<String> actualViolations) {
+        final List<Integer> actualViolationLines = actualViolations.stream()
+                .map(violation -> violation.substring(0, violation.indexOf(':')))
+                .map(Integer::valueOf)
+                .collect(Collectors.toUnmodifiableList());
         final List<Integer> expectedViolationLines = testInputViolations.stream()
                 .map(TestInputViolation::getLineNo)
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
         assertWithMessage("Violation lines for %s differ.", file)
                 .that(actualViolationLines)
                 .isEqualTo(expectedViolationLines);
@@ -565,7 +650,7 @@ private static String internalGetCheckMessage(
             String messageBundle, String messageKey, Object... arguments) {
         final ResourceBundle resourceBundle = ResourceBundle.getBundle(
                 messageBundle,
-                Locale.getDefault(),
+                Locale.ROOT,
                 Thread.currentThread().getContextClassLoader(),
                 new Utf8Control());
         final String pattern = resourceBundle.getString(messageKey);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractPathTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractPathTestSupport.java
index 2ce75dad3f3..91195759497 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractPathTestSupport.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractPathTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,9 +23,12 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Locale;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.BeforeEach;
+
 public abstract class AbstractPathTestSupport {
 
     // we are using positive lookahead here, to convert \r\n to \n
@@ -42,6 +45,15 @@ public abstract class AbstractPathTestSupport {
      */
     protected abstract String getPackageLocation();
 
+    /**
+     * Sets the English locale for all tests.
+     * Otherwise, some tests failed in other locales.
+     */
+    @BeforeEach
+    public void setEnglishLocale() {
+        Locale.setDefault(Locale.ENGLISH);
+    }
+
     /**
      * Retrieves the name of the folder location for resources.
      *
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractTreeTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractTreeTestSupport.java
index f334b9d7bf2..80c91141c89 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractTreeTestSupport.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractTreeTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java
index f76dc7b7ae8..54f20ef9f9c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java
index 39c3df4ad27..1c35ba54fa1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatterTest.java
index 1c7a58b94ec..c5344f4e85d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -80,12 +80,12 @@ public void testCalculateBufferLength() throws Exception {
                 "messages.properties", "key", null, SeverityLevel.ERROR, null,
                 getClass(), null);
         final AuditEvent auditEvent = new AuditEvent(new Object(), "fileName", violation);
-        final int result = TestUtil.invokeStaticMethod(AuditEventDefaultFormatter.class,
-                "calculateBufferLength", auditEvent, SeverityLevel.ERROR.ordinal());
+        final StringBuilder result = TestUtil.invokeStaticMethod(AuditEventDefaultFormatter.class,
+                "initStringBuilderWithOptimalBuffer", auditEvent, SeverityLevel.ERROR.toString());
 
         assertWithMessage("Buffer length is not expected")
-                .that(result)
-                .isEqualTo(54);
+                .that(result.capacity())
+                .isEqualTo(56);
     }
 
     private static final class TestModuleCheck {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
index a680aedc053..00c5bad8c07 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,7 @@
 import static com.puppycrawl.tools.checkstyle.DefaultLogger.AUDIT_FINISHED_MESSAGE;
 import static com.puppycrawl.tools.checkstyle.DefaultLogger.AUDIT_STARTED_MESSAGE;
 import static com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck.MSG_KEY_NO_NEWLINE_EOF;
+import static com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck.MSG_KEY;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -74,6 +75,7 @@
 import com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck;
 import com.puppycrawl.tools.checkstyle.checks.TranslationCheck;
 import com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck;
+import com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck;
 import com.puppycrawl.tools.checkstyle.filters.SuppressionFilter;
 import com.puppycrawl.tools.checkstyle.internal.testmodules.DebugAuditAdapter;
 import com.puppycrawl.tools.checkstyle.internal.testmodules.DebugFilter;
@@ -82,6 +84,7 @@
 import com.puppycrawl.tools.checkstyle.internal.utils.CloseAndFlushTestByteArrayOutputStream;
 import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 
 /**
  * CheckerTest.
@@ -436,6 +439,13 @@ public void testSetters() {
         }
     }
 
+    @Test
+    public void testSetSeverity() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        verifyWithInlineXmlConfig(getPath("InputCheckerTestSeverity.java"), expected);
+    }
+
     @Test
     public void testNoClassLoaderNoModuleFactory() {
         final Checker checker = new Checker();
@@ -596,16 +606,15 @@ public void testCacheAndCheckWhichDoesNotImplementExternalResourceHolderInterfac
         checkerConfig.addProperty("cacheFile", cacheFile.getPath());
 
         final File tmpFile = File.createTempFile("file", ".java", temporaryFolder);
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        verify(checkerConfig, tmpFile.getPath(), expected);
+        execute(checkerConfig, tmpFile.getPath());
         final Properties cacheAfterFirstRun = new Properties();
         try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath())) {
             cacheAfterFirstRun.load(reader);
         }
 
         // one more time to reuse cache
-        verify(checkerConfig, tmpFile.getPath(), expected);
+        execute(checkerConfig, tmpFile.getPath());
         final Properties cacheAfterSecondRun = new Properties();
         try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath())) {
             cacheAfterSecondRun.load(reader);
@@ -687,10 +696,9 @@ public void testClearExistingCache() throws Exception {
 
         final String pathToEmptyFile =
                 File.createTempFile("file", ".java", temporaryFolder).getPath();
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
         // file that should be audited is not in cache
-        verify(checker, pathToEmptyFile, pathToEmptyFile, expected);
+        execute(checkerConfig, pathToEmptyFile);
         final Properties cacheAfterSecondRun = new Properties();
         try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath())) {
             cacheAfterSecondRun.load(reader);
@@ -892,18 +900,17 @@ public void testCacheAndFilterWhichDoesNotImplementExternalResourceHolderInterfa
         final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
         checkerConfig.addProperty("cacheFile", cacheFile.getPath());
 
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
         final String pathToEmptyFile =
                 File.createTempFile("file", ".java", temporaryFolder).getPath();
 
-        verify(checkerConfig, pathToEmptyFile, expected);
+        execute(checkerConfig, pathToEmptyFile);
         final Properties cacheAfterFirstRun = new Properties();
         try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath())) {
             cacheAfterFirstRun.load(reader);
         }
 
         // One more time to use cache.
-        verify(checkerConfig, pathToEmptyFile, expected);
+        execute(checkerConfig, pathToEmptyFile);
         final Properties cacheAfterSecondRun = new Properties();
         try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath())) {
             cacheAfterSecondRun.load(reader);
@@ -958,9 +965,8 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst
 
         final String pathToEmptyFile =
                 File.createTempFile("file", ".java", temporaryFolder).getPath();
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        verify(checker, pathToEmptyFile, expected);
+        execute(checker, pathToEmptyFile);
         final Properties cacheAfterFirstRun = new Properties();
         try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath())) {
             cacheAfterFirstRun.load(reader);
@@ -980,7 +986,7 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst
         checker.addFileSetCheck(check);
         checker.configure(checkerConfig);
 
-        verify(checker, pathToEmptyFile, expected);
+        execute(checker, pathToEmptyFile);
         final Properties cacheAfterSecondRun = new Properties();
         try (BufferedReader reader = Files.newBufferedReader(cacheFile.toPath())) {
             cacheAfterSecondRun.load(reader);
@@ -1015,21 +1021,11 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst
 
     @Test
     public void testClearLazyLoadCacheInDetailAST() throws Exception {
-        final DefaultConfiguration checkConfig1 =
-            createModuleConfig(CheckWhichDoesNotRequireCommentNodes.class);
-        final DefaultConfiguration checkConfig2 =
-            createModuleConfig(CheckWhichRequiresCommentNodes.class);
-
-        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
-        treeWalkerConfig.addChild(checkConfig1);
-        treeWalkerConfig.addChild(checkConfig2);
-
-        final DefaultConfiguration checkerConfig = createRootConfig(treeWalkerConfig);
 
         final String filePath = getPath("InputCheckerClearDetailAstLazyLoadCache.java");
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        verify(checkerConfig, filePath, expected);
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(filePath, expected);
     }
 
     @Test
@@ -1047,9 +1043,8 @@ public void testCacheOnViolationSuppression() throws Exception {
 
         final String fileViolationPath =
                 File.createTempFile("ViolationFile", ".java", temporaryFolder).getPath();
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        verify(checkerConfig, fileViolationPath, expected);
+        execute(checkerConfig, fileViolationPath);
 
         try (InputStream input = Files.newInputStream(cacheFile.toPath())) {
             final Properties details = new Properties();
@@ -1067,7 +1062,7 @@ public void testHaltOnException() throws Exception {
             createModuleConfig(CheckWhichThrowsError.class);
         final String filePath = getPath("InputChecker.java");
         try {
-            verify(checkConfig, filePath);
+            execute(checkConfig, filePath);
             assertWithMessage("Exception is expected").fail();
         }
         catch (CheckstyleException ex) {
@@ -1410,13 +1405,11 @@ public void testHaltOnExceptionOff() throws Exception {
 
     @Test
     public void testTabViolationDefault() throws Exception {
-        final DefaultConfiguration checkConfig =
-            createModuleConfig(VerifyPositionAfterTabFileSet.class);
         final String[] expected = {
-            "2:9: violation",
-            "3:17: violation",
+            "10:17: violation",
+            "13:33: violation",
         };
-        verify(checkConfig, getPath("InputCheckerTabCharacter.txt"),
+        verifyWithInlineConfigParser(getPath("InputCheckerTabCharacter.txt"),
             expected);
     }
 
@@ -1427,8 +1420,8 @@ public void testTabViolation() throws Exception {
         final DefaultConfiguration checkerConfig = createRootConfig(checkConfig);
         checkerConfig.addProperty("tabWidth", "4");
         final String[] expected = {
-            "2:5: violation",
-            "3:9: violation",
+            "10:13: violation",
+            "13:33: violation",
         };
         verify(checkerConfig, getPath("InputCheckerTabCharacter.txt"),
             expected);
@@ -1540,9 +1533,8 @@ public void testDefaultLoggerClosesItStreams() throws Exception {
                 OutputStreamOptions.CLOSE, testErrorOutputStream, OutputStreamOptions.CLOSE));
 
             final File tmpFile = File.createTempFile("file", ".java", temporaryFolder);
-            final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-            verify(checker, tmpFile.getPath(), expected);
+            execute(checker, tmpFile.getPath());
 
             assertWithMessage("Output stream close count")
                     .that(testInfoOutputStream.getCloseCount())
@@ -1569,9 +1561,8 @@ public void testXmlLoggerClosesItStreams() throws Exception {
             checker.addListener(new XMLLogger(testInfoOutputStream, OutputStreamOptions.CLOSE));
 
             final File tmpFile = File.createTempFile("file", ".java", temporaryFolder);
-            final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-            verify(checker, tmpFile.getPath(), tmpFile.getPath(), expected);
+            execute(checker, tmpFile.getPath(), tmpFile.getPath());
 
             assertWithMessage("Output stream close count")
                     .that(testInfoOutputStream.getCloseCount())
@@ -1624,7 +1615,7 @@ public void testDuplicatedModule() throws Exception {
                     .filter(line -> !getCheckMessage(AUDIT_FINISHED_MESSAGE).equals(line))
                     .limit(expected.length)
                     .sorted()
-                    .collect(Collectors.toList());
+                    .collect(Collectors.toUnmodifiableList());
             Arrays.sort(expected);
 
             for (int i = 0; i < expected.length; i++) {
@@ -1665,6 +1656,44 @@ public void testCachedFile() throws Exception {
         checker.destroy();
     }
 
+    @SuppressForbidden
+    @Test
+    public void testUnmappableCharacters() throws Exception {
+        final String[] expected = {
+            "4: " + getCheckMessage(LineLengthCheck.class, MSG_KEY, 75, 238),
+        };
+
+        final DefaultConfiguration checkConfig = createModuleConfig(LineLengthCheck.class);
+        checkConfig.addProperty("max", "75");
+
+        final DefaultConfiguration checkerConfig = createRootConfig(checkConfig);
+        checkerConfig.addProperty("charset", "IBM1098");
+
+        verify(checkerConfig, getPath("InputCheckerTestCharset.java"), expected);
+    }
+
+    @Test
+    public void testViolationMessageOnIoException() throws Exception {
+        final DefaultConfiguration checkConfig =
+                createModuleConfig(CheckWhichThrowsError.class);
+
+        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
+        treeWalkerConfig.addChild(checkConfig);
+
+        final DefaultConfiguration checkerConfig = createRootConfig(treeWalkerConfig);
+        checkerConfig.addChild(treeWalkerConfig);
+
+        checkerConfig.addProperty("haltOnException", "false");
+        final File file = new File("InputNonChecker.java");
+        final String filePath = file.getAbsolutePath();
+        final String[] expected = {
+            "1: " + getCheckMessage(EXCEPTION_MSG, filePath
+                        + " (No such file or directory)"),
+        };
+
+        verify(checkerConfig, filePath, expected);
+    }
+
     public static class DefaultLoggerWithCounter extends DefaultLogger {
 
         private int fileStartedCount;
@@ -1781,7 +1810,7 @@ public void visitToken(DetailAST ast) {
             }
             final int childCount = ast.getChildCount();
             if (childCount != METHOD_DEF_CHILD_COUNT) {
-                final String msg = String.format(Locale.getDefault(),
+                final String msg = String.format(Locale.ENGLISH,
                     "AST node in no comment tree has wrong number of children. "
                             + "Expected is %d but was %d",
                     METHOD_DEF_CHILD_COUNT, childCount);
@@ -1795,7 +1824,7 @@ public void visitToken(DetailAST ast) {
             }
             final int cacheChildCount = ast.getFirstChild().getChildCount();
             if (cacheChildCount != actualChildCount) {
-                final String msg = String.format(Locale.getDefault(),
+                final String msg = String.format(Locale.ENGLISH,
                         "AST node with no comment has wrong number of children. "
                                 + "Expected is %d but was %d",
                         cacheChildCount, actualChildCount);
@@ -1830,6 +1859,7 @@ public int[] getRequiredTokens() {
             return new int[] {TokenTypes.METHOD_DEF};
         }
 
+        // Locale.ENGLISH until #12104
         @Override
         public void visitToken(DetailAST ast) {
             if (ast.findFirstToken(TokenTypes.MODIFIERS).findFirstToken(
@@ -1838,7 +1868,7 @@ public void visitToken(DetailAST ast) {
             }
             final int childCount = ast.getChildCount();
             if (childCount != METHOD_DEF_CHILD_COUNT) {
-                final String msg = String.format(Locale.getDefault(),
+                final String msg = String.format(Locale.ENGLISH,
                     "AST node in comment tree has wrong number of children. "
                             + "Expected is %d but was %d",
                     METHOD_DEF_CHILD_COUNT, childCount);
@@ -1852,7 +1882,7 @@ public void visitToken(DetailAST ast) {
             }
             final int cacheChildCount = ast.getFirstChild().getChildCount();
             if (cacheChildCount != actualChildCount) {
-                final String msg = String.format(Locale.getDefault(),
+                final String msg = String.format(Locale.ENGLISH,
                         "AST node with comment has wrong number of children. "
                                 + "Expected is %d but was %d",
                         cacheChildCount, actualChildCount);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java
index 6d5c398d967..c6662289e60 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -30,6 +30,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
@@ -312,11 +313,16 @@ public void testCustomMessages() throws Exception {
 
         final Configuration[] children = config.getChildren();
         final Configuration[] grandchildren = children[0].getChildren();
-
+        final List<String> messages = new ArrayList<>(grandchildren[0].getMessages().values());
         final String expectedKey = "name.invalidPattern";
+        final List<String> expectedMessages = Collections
+                .singletonList("Member ''{0}'' must start with ''m'' (checked pattern ''{1}'').");
         assertWithMessage("Messages should contain key: " + expectedKey)
                 .that(grandchildren[0].getMessages())
                 .containsKey(expectedKey);
+        assertWithMessage("Message is not expected")
+                .that(messages)
+                .isEqualTo(expectedMessages);
     }
 
     private static void verifyConfigNode(
@@ -423,6 +429,21 @@ private static Properties initProperties() {
         return props;
     }
 
+    @Test
+    public void testSystemEntity() throws Exception {
+        final Properties props = new Properties();
+        props.setProperty("checkstyle.basedir", "basedir");
+
+        final DefaultConfiguration config =
+            (DefaultConfiguration) loadConfiguration(
+                "InputConfigurationLoaderSystemDoctype.xml", props);
+
+        final Properties atts = new Properties();
+        atts.setProperty("tabWidth", "4");
+
+        verifyConfigNode(config, "Checker", 0, atts);
+    }
+
     @Test
     public void testExternalEntity() throws Exception {
         final Properties props = new Properties();
@@ -633,6 +654,21 @@ public void testLoadConfigurationFromClassPath() throws Exception {
             .isEqualTo(0);
     }
 
+    @Test
+    public void testLoadConfigurationFromClassPathWithNonAsciiSymbolsInPath() throws Exception {
+        final DefaultConfiguration config =
+                (DefaultConfiguration) ConfigurationLoader.loadConfiguration(
+                    getResourcePath("棵¥/InputConfigurationLoaderDefaultProperty.xml"),
+                        new PropertiesExpander(new Properties()));
+
+        final Properties expectedPropertyValues = new Properties();
+        expectedPropertyValues.setProperty("tabWidth", "2");
+        expectedPropertyValues.setProperty("basedir", ".");
+        // charset property uses 2 variables, one is not defined, so default becomes a result value
+        expectedPropertyValues.setProperty("charset", "ASCII");
+        verifyConfigNode(config, "Checker", 0, expectedPropertyValues);
+    }
+
     @Test
     public void testParsePropertyString() throws Exception {
         final List<String> propertyRefs = new ArrayList<>();
@@ -748,4 +784,24 @@ public void testLoadConfiguration3() throws Exception {
                     .contains("query");
         }
     }
+
+    @Test
+    public void testDefaultValuesForNonDefinedProperties() throws Exception {
+        final Properties props = new Properties();
+        props.setProperty("checkstyle.charset.base", "UTF");
+
+        final File file = new File(
+                getPath("InputConfigurationLoaderDefaultProperty.xml"));
+        final DefaultConfiguration config =
+            (DefaultConfiguration) ConfigurationLoader.loadConfiguration(
+                    file.toURI().toString(), new PropertiesExpander(props));
+
+        final Properties expectedPropertyValues = new Properties();
+        expectedPropertyValues.setProperty("tabWidth", "2");
+        expectedPropertyValues.setProperty("basedir", ".");
+        // charset property uses 2 variables, one is not defined, so default becomes a result value
+        expectedPropertyValues.setProperty("charset", "ASCII");
+        verifyConfigNode(config, "Checker", 0, expectedPropertyValues);
+    }
+
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java
index ffa5ecece38..09004a9c838 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultConfigurationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java
index 306aba042c3..06c68456add 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,7 @@
 
 public class DefaultLoggerTest {
 
-    private static final Locale DEFAULT_LOCALE = Locale.getDefault();
+    private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
 
     @AfterEach
     public void tearDown() {
@@ -280,11 +280,12 @@ public void testCountryIsValid() {
     @Test
     public void testNewCtor() throws Exception {
         final ResourceBundle bundle = ResourceBundle.getBundle(
-                Definitions.CHECKSTYLE_BUNDLE, Locale.ROOT);
+                Definitions.CHECKSTYLE_BUNDLE, Locale.ENGLISH);
         final String auditStartedMessage = bundle.getString(DefaultLogger.AUDIT_STARTED_MESSAGE);
         final String auditFinishedMessage = bundle.getString(DefaultLogger.AUDIT_FINISHED_MESSAGE);
         final String addExceptionMessage = new MessageFormat(bundle.getString(
-                DefaultLogger.ADD_EXCEPTION_MESSAGE), Locale.ROOT).format(new String[] {"myfile"});
+                DefaultLogger.ADD_EXCEPTION_MESSAGE), Locale.ENGLISH).format(new String[] {"myfile"}
+        );
         final String infoOutput;
         final String errorOutput;
         try (MockByteArrayOutputStream infoStream = new MockByteArrayOutputStream()) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java
index 610fa9c33e1..1e39904e34d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DefinitionsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java
index b4e4245c3aa..de5d50728c7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,6 @@
 
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck;
 import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
@@ -477,22 +476,93 @@ public void testAddNextSibling() {
         final DetailAstImpl parent = new DetailAstImpl();
         final DetailAstImpl child = new DetailAstImpl();
         final DetailAstImpl sibling = new DetailAstImpl();
-        final DetailAST newSibling = new DetailAstImpl();
+        final DetailAstImpl newSibling = new DetailAstImpl();
+        final DetailAST newNextSibling = new DetailAstImpl();
+
         parent.setFirstChild(child);
         child.setNextSibling(sibling);
         child.addNextSibling(newSibling);
+        newSibling.addNextSibling(newNextSibling);
 
+        assertWithMessage("Invalid previous sibling")
+            .that(newNextSibling.getPreviousSibling())
+            .isEqualTo(newSibling);
+        assertWithMessage("Invalid next sibling")
+            .that(newNextSibling.getNextSibling())
+            .isEqualTo(sibling);
+        assertWithMessage("Invalid next sibling")
+            .that(sibling.getNextSibling())
+            .isNull();
+        assertWithMessage("Invalid node")
+            .that(sibling.getPreviousSibling().getPreviousSibling())
+            .isEqualTo(newSibling);
+        assertWithMessage("Invalid node")
+            .that(newNextSibling.getPreviousSibling().getPreviousSibling())
+            .isEqualTo(child);
         assertWithMessage("Invalid parent")
             .that(newSibling.getParent())
             .isEqualTo(parent);
         assertWithMessage("Invalid next sibling")
             .that(newSibling.getNextSibling())
-            .isEqualTo(sibling);
+            .isEqualTo(newNextSibling);
         assertWithMessage("Invalid child")
             .that(child.getNextSibling())
             .isEqualTo(newSibling);
     }
 
+    @Test
+    public void testAddNextSibling2() {
+        final DetailAstImpl parent = new DetailAstImpl();
+        final DetailAstImpl child = new DetailAstImpl();
+        parent.setFirstChild(child);
+        final DetailAstImpl siblingOfChild = new DetailAstImpl();
+        child.addNextSibling(siblingOfChild);
+
+        assertWithMessage("Previous Sibling should be child")
+            .that(siblingOfChild.getPreviousSibling())
+            .isEqualTo(child);
+
+        final DetailAST nullChild = null;
+        siblingOfChild.addNextSibling(nullChild);
+        assertWithMessage("Expected to be null")
+            .that(siblingOfChild.getNextSibling())
+            .isNull();
+        assertWithMessage("Child count should be 2")
+            .that(parent.getChildCount())
+            .isEqualTo(2);
+    }
+
+    @Test
+    public void testAddNextSibling3() {
+        final DetailAstImpl parent = new DetailAstImpl();
+        final DetailAstImpl child = new DetailAstImpl();
+        final DetailAstImpl sibling = new DetailAstImpl();
+
+        parent.setFirstChild(child);
+        child.setNextSibling(sibling);
+        child.addNextSibling(null);
+
+        assertWithMessage("Invalid next sibling")
+                .that(child.getNextSibling())
+                .isEqualTo(sibling);
+    }
+
+    @Test
+    public void testAddNextSibling4() {
+        final DetailAstImpl parent = new DetailAstImpl();
+        parent.setText("Parent");
+        final DetailAstImpl child = new DetailAstImpl();
+        child.setText("Child");
+        final DetailAstImpl sibling = new DetailAstImpl();
+        sibling.setText("Sibling");
+        parent.setFirstChild(child);
+        child.addNextSibling(sibling);
+
+        assertWithMessage("Invalid next sibling")
+                .that(child.getNextSibling())
+                .isEqualTo(sibling);
+    }
+
     @Test
     public void testAddNextSiblingNullParent() {
         final DetailAstImpl child = new DetailAstImpl();
@@ -615,6 +685,7 @@ public void testManyComments() throws Exception {
         final File file = new File(temporaryFolder, "InputDetailASTManyComments.java");
 
         try (Writer bw = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
+            bw.write("/*\ncom.puppycrawl.tools.checkstyle.checks.TodoCommentCheck\n\n\n\n*/\n");
             bw.write("class C {\n");
             for (int i = 0; i <= 30000; i++) {
                 bw.write("// " + i + "\n");
@@ -622,10 +693,8 @@ public void testManyComments() throws Exception {
             bw.write("}\n");
         }
 
-        final DefaultConfiguration checkConfig = createModuleConfig(TodoCommentCheck.class);
-
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, file.getAbsolutePath(), expected);
+        verifyWithInlineConfigParser(file.getAbsolutePath(), expected);
     }
 
     @Test
@@ -652,11 +721,47 @@ public void testTreeStructure() throws Exception {
     public void testToString() {
         final DetailAstImpl ast = new DetailAstImpl();
         ast.setText("text");
-        ast.setColumnNo(0);
-        ast.setLineNo(0);
+        ast.setColumnNo(1);
+        ast.setLineNo(1);
         assertWithMessage("Invalid text")
             .that(ast.toString())
-            .isEqualTo("text[0x0]");
+            .isEqualTo("text[1x1]");
+    }
+
+    @Test
+    public void testRemoveChildren() {
+        final DetailAstImpl parent = new DetailAstImpl();
+        final DetailAstImpl child1 = new DetailAstImpl();
+        parent.setFirstChild(child1);
+        final DetailAstImpl child2 = new DetailAstImpl();
+        child1.setNextSibling(child2);
+
+        parent.removeChildren();
+
+        assertWithMessage("")
+                .that(parent.getChildCount())
+                .isEqualTo(0);
+    }
+
+    @Test
+    public void testAddChild() {
+        final DetailAstImpl grandParent = new DetailAstImpl();
+        grandParent.setText("grandparent");
+        final DetailAstImpl parent = new DetailAstImpl();
+        parent.setText("parent");
+        grandParent.setFirstChild(parent);
+
+        final DetailAstImpl child = new DetailAstImpl();
+        child.setText("child");
+        parent.setFirstChild(child);
+
+        final DetailAstImpl secondChild = new DetailAstImpl();
+        secondChild.setText("SecondChild");
+        parent.addChild(secondChild);
+
+        assertWithMessage("Invalid previous sibling")
+                .that(secondChild.getPreviousSibling())
+                .isEqualTo(child);
     }
 
     private static List<File> getAllFiles(File dir) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java
index e59de75f65e..6c3067edd2c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java
index 9ff639b4c6d..b816b6b8986 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,6 @@
 
 package com.puppycrawl.tools.checkstyle;
 
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import java.io.File;
@@ -37,16 +36,17 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.collect.ImmutableSet;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FileContents;
 import com.puppycrawl.tools.checkstyle.api.FileText;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.grammar.CompositeLexerContextCache;
 import com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageLexer;
 import com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParser;
 import com.puppycrawl.tools.checkstyle.grammar.java.JavaLanguageParserBaseVisitor;
 import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 
+// -@cs[ClassDataAbstractionCoupling] No way to split up class usage.
 public class JavaAstVisitorTest extends AbstractModuleTestSupport {
 
     /**
@@ -88,7 +88,12 @@ public class JavaAstVisitorTest extends AbstractModuleTestSupport {
             "visitClassType",
             "visitClassOrInterfaceTypeExtended",
             "visitQualifiedNameExtended",
-            "visitGuard"
+            "visitGuard",
+
+            // until removal in https://github.com/checkstyle/checkstyle/issues/14805
+            "visitTemplate",
+            // handled as a list in the parent rule
+            "visitStringTemplateMiddle"
     );
 
     @Override
@@ -107,16 +112,16 @@ public void testAllVisitMethodsAreOverridden() {
                 .filter(method -> method.getName().contains("visit"))
                 .filter(method -> method.getModifiers() == Modifier.PUBLIC)
                 .map(Method::getName)
-                .collect(Collectors.toSet());
+                .collect(Collectors.toUnmodifiableSet());
 
-        final ImmutableSet<String> filteredVisitMethodNames = Arrays.stream(visitMethods)
+        final Set<String> filteredVisitMethodNames = Arrays.stream(visitMethods)
                 .filter(method -> method.getName().contains("visit"))
                 // remove overridden 'visit' method from ParseTreeVisitor interface in
                 // JavaAstVisitor
                 .filter(method -> !"visit".equals(method.getName()))
                 .filter(method -> method.getModifiers() == Modifier.PUBLIC)
                 .map(Method::getName)
-                .collect(toImmutableSet());
+                .collect(Collectors.toUnmodifiableSet());
 
         final String message = "Visit methods in 'JavaLanguageParserBaseVisitor' generated from "
                 + "production rules and labeled alternatives in 'JavaLanguageParser.g4' should "
@@ -237,7 +242,9 @@ public void testNoStackOverflowOnDeepStringConcat() throws Exception {
         final String fullText = contents.getText().getFullText().toString();
         final CharStream codePointCharStream = CharStreams.fromString(fullText);
         final JavaLanguageLexer lexer = new JavaLanguageLexer(codePointCharStream, true);
+        final CompositeLexerContextCache contextCache = new CompositeLexerContextCache(lexer);
         lexer.setCommentListener(contents);
+        lexer.setContextCache(contextCache);
 
         final CommonTokenStream tokenStream = new CommonTokenStream(lexer);
         final JavaLanguageParser parser = new JavaLanguageParser(tokenStream);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java
index dbbd9da862e..c2737717fd6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavaParserTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,7 @@
 package com.puppycrawl.tools.checkstyle;
 
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.MSG_JAVADOC_CONTENT_SECOND_LINE;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,6 +33,7 @@
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck;
 import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 
 public class JavaParserTest extends AbstractModuleTestSupport {
@@ -68,7 +70,7 @@ public void testAppendHiddenBlockCommentNodes() throws Exception {
                 .that(blockComment.isPresent())
                 .isTrue();
 
-        final DetailAST comment = blockComment.get();
+        final DetailAST comment = blockComment.orElseThrow();
 
         assertWithMessage("Unexpected line number")
             .that(comment.getLineNo())
@@ -106,10 +108,10 @@ public void testAppendHiddenSingleLineCommentNodes() throws Exception {
         final Optional<DetailAST> singleLineComment = TestUtil.findTokenInAstByPredicate(root,
             ast -> ast.getType() == TokenTypes.SINGLE_LINE_COMMENT);
         assertWithMessage("Single line comment should be present")
-                .that(singleLineComment.isPresent())
-                .isTrue();
+            .that(singleLineComment.isPresent())
+            .isTrue();
 
-        final DetailAST comment = singleLineComment.get();
+        final DetailAST comment = singleLineComment.orElseThrow();
 
         assertWithMessage("Unexpected line number")
             .that(comment.getLineNo())
@@ -149,7 +151,7 @@ public void testAppendHiddenSingleLineCommentNodes2() throws Exception {
                 .that(singleLineComment.isPresent())
                 .isTrue();
 
-        final DetailAST comment = singleLineComment.get();
+        final DetailAST comment = singleLineComment.orElseThrow();
 
         assertWithMessage("Unexpected line number")
             .that(comment.getLineNo())
@@ -242,7 +244,7 @@ public void testJava14TextBlocks() throws Exception {
                 .that(textBlockContent.isPresent())
                 .isTrue();
 
-        final DetailAST content = textBlockContent.get();
+        final DetailAST content = textBlockContent.orElseThrow();
         final String expectedContents = "\n                 string";
 
         assertWithMessage("Unexpected line number")
@@ -274,6 +276,17 @@ public void testFullJavaIdentifierSupport() throws Exception {
                 .isNotNull();
     }
 
+    @Test
+    public void testReturnValueOfAppendHiddenCommentNodes()
+            throws Exception {
+        final String[] expected = {
+            "9:1: " + getCheckMessage(JavadocContentLocationCheck.class,
+                    MSG_JAVADOC_CONTENT_SECOND_LINE),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputJavaParserHiddenComments4.java"), expected);
+    }
+
     private static final class CountComments {
         private final List<String> lineComments = new ArrayList<>();
         private final List<String> blockComments = new ArrayList<>();
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParserTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParserTest.java
index 632640322ea..c1cfcefc4ca 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParserTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParserTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java
index 8deadebe2b4..7ec0b58df81 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -355,4 +355,23 @@ public void testParseError() throws Exception {
         }
     }
 
+    @Test
+    public void testGetFirstJavadocSentence(@SysErr Capturable systemErr,
+                                            @SysOut Capturable systemOut) throws Exception {
+        final String expectedContent = "EOF1=First Javadoc Sentence.";
+
+        JavadocPropertiesGenerator.main(
+                getPath("InputJavadocPropertiesGeneratorGetFirstJavadocSentence.java"),
+            "--destfile", DESTFILE_ABSOLUTE_PATH);
+        assertWithMessage("Unexpected error log")
+            .that(systemErr.getCapturedData())
+            .isEqualTo("");
+        assertWithMessage("Unexpected output log")
+            .that(systemOut.getCapturedData())
+            .isEqualTo("");
+        final String fileContent = FileUtils.readFileToString(DESTFILE, StandardCharsets.UTF_8);
+        assertWithMessage("File content is not expected")
+            .that(fileContent.trim())
+            .isEqualTo(expectedContent.trim());
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java
index a72be096169..0e6d5378876 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -48,8 +48,9 @@
  */
 public class LocalizedMessageTest {
 
-    private static final Locale DEFAULT_LOCALE = Locale.getDefault();
+    private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
 
+    @DefaultLocale("en")
     @Test
     public void testNullArgs() {
         final LocalizedMessage messageClass = new LocalizedMessage(Definitions.CHECKSTYLE_BUNDLE,
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
index b66cfed7ed4..ded5dbd81d0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -119,24 +119,20 @@ public class MainTest {
                   + " location can be%n"
                   + "                              specified with -o option.%n"
                   + "  -h, --help                Show this help message and exit.%n"
-                  + "  -j, --javadocTree         Prints Parse Tree of the Javadoc comment. The"
-                  + " file have to contain only%n"
-                  + "                              Javadoc comment content without including"
-                  + " '/**' and '*/' at the%n"
-                  + "                              beginning and at the end respectively. The"
-                  + " option cannot be used%n"
-                  + "                              other options and requires exactly one file"
-                  + " to run on to be specified.%n"
-                  + "  -J, --treeWithJavadoc     Prints Abstract Syntax Tree(AST) with Javadoc"
-                  + " nodes and comment nodes%n"
-                  + "                              of the checked file. Attention that line number"
-                  + " and columns will not%n"
-                  + "                              be the same as it is a file due to the fact"
-                  + " that each javadoc comment%n"
-                  + "                              is parsed separately from java file. The"
-                  + " option cannot be used with%n"
-                  + "                              other options and requires exactly one file to"
-                  + " run on to be specified.%n"
+                  + "  -j, --javadocTree         This option is used to print the Parse Tree of"
+                  + " the Javadoc comment. The%n"
+                  + "                              file has to contain only Javadoc comment"
+                  + " content excluding '/**' and%n"
+                  + "                              '*/' at the beginning and at the end"
+                  + " respectively. It can only be%n"
+                  + "                              used on a single file and cannot be"
+                  + " combined with other options.%n"
+                  + "  -J, --treeWithJavadoc     This option is used to display the Abstract"
+                  + " Syntax Tree (AST) with%n"
+                  + "                              Javadoc nodes of the specified file. It can"
+                  + " only be used on a single%n"
+                  + "                              file and cannot be combined"
+                  + " with other options.%n"
                   + "  -o=<outputPath>           Sets the output file. Defaults to stdout.%n"
                   + "  -p=<propertiesFile>       Sets the property files to load.%n"
                   + "  -s=<suppressionLineColumnNumber>%n"
@@ -148,8 +144,8 @@ public class MainTest {
                   + " for. The option cannot%n"
                   + "                              be used with other options and requires exactly"
                   + " one file to run on to%n"
-                  + "                              be specified. ATTENTION: generated result will"
-                  + " have few queries,%n"
+                  + "                              be specified. Note that the generated result"
+                  + " will have few queries,%n"
                   + "                              joined by pipe(|). Together they will match all"
                   + " AST nodes on%n"
                   + "                              specified line and column. You need to choose"
@@ -158,16 +154,18 @@ public class MainTest {
                   + " but might result in%n"
                   + "                              undesirable matching and suppress other"
                   + " issues.%n"
-                  + "  -t, --tree                Prints Abstract Syntax Tree(AST) of the checked"
-                  + " file. The option cannot%n"
-                  + "                              be used other options and requires exactly one"
-                  + " file to run on to be%n"
-                  + "                              specified.%n"
-                  + "  -T, --treeWithComments    Prints Abstract Syntax Tree(AST) with comment"
-                  + " nodes of the checked%n"
-                  + "                              file. The option cannot be used with other"
-                  + " options and requires%n"
-                  + "                              exactly one file to run on to be specified.%n"
+                  + "  -t, --tree                This option is used to display the Abstract"
+                  + " Syntax Tree (AST) without%n"
+                  + "                              any comments of the specified file. It can"
+                  + " only be used on a single%n"
+                  + "                              file and cannot be combined with"
+                  + " other options.%n"
+                  + "  -T, --treeWithComments    This option is used to display the Abstract"
+                  + " Syntax Tree (AST) with%n"
+                  + "                              comment nodes excluding Javadoc of the"
+                  + " specified file. It can only be%n"
+                  + "                              used on a single file and cannot be combined"
+                  + " with other options.%n"
                   + "  -V, --version             Print version information and exit.%n"
                   + "  -w, --tabWidth=<tabWidth> Sets the length of the tab character. Used only"
                   + " with -s option. Default%n"
@@ -1866,7 +1864,7 @@ public void testPlainOutputFormatCreateListener() throws IOException {
      *                     mock getRuntime to avoid VM termination.
      */
     private static void assertMainReturnCode(int expectedExitCode, String... arguments) {
-        final Runtime mock = mock(Runtime.class);
+        final Runtime mock = mock();
         try (MockedStatic<Runtime> runtime = mockStatic(Runtime.class)) {
             runtime.when(Runtime::getRuntime)
                     .thenReturn(mock);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLoggerTest.java
index 994fd914a8d..6bff480c316 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLoggerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/MetadataGeneratorLoggerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java
index e175345213a..125947fcdbc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 import java.io.IOException;
@@ -234,9 +234,12 @@ public void testUnmodifiableCollection() throws Exception {
         final Set<String> actualPackageNames = PackageNamesLoader
                 .getPackageNames(new TestUrlsClassLoader(Collections.emptyEnumeration()));
 
-        assertThrows(UnsupportedOperationException.class,
+        final Exception ex = getExpectedThrowable(UnsupportedOperationException.class,
                 () -> actualPackageNames.add("com.puppycrawl.tools.checkstyle.checks.modifier"));
 
+        assertWithMessage("Exception class is not expected")
+                .that(ex.getClass())
+                .isEqualTo(UnsupportedOperationException.class);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java
index fa4594073ae..3a4bf9994b4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/PackageObjectFactoryTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -493,6 +493,35 @@ public void testCreateObjectWithNameContainingPackageSeparator() throws Exceptio
             .isInstanceOf(MockClass.class);
     }
 
+    /**
+     * This test case is designed to verify the behavior of the PackageObjectFactory's
+     * createModule method when it is provided with a fully qualified class name
+     * (containing a package separator).
+     * It ensures that ModuleReflectionUtil.getCheckstyleModules is not executed in this case.
+     */
+    @Test
+    public void testCreateObjectWithNameContainingPackageSeparatorWithoutSearch() throws Exception {
+        final ClassLoader classLoader = ClassLoader.getSystemClassLoader();
+        final Set<String> packages = Collections.singleton(BASE_PACKAGE);
+        final PackageObjectFactory objectFactory =
+            new PackageObjectFactory(packages, classLoader, TRY_IN_ALL_REGISTERED_PACKAGES);
+
+        try (MockedStatic<ModuleReflectionUtil> utilities =
+                     mockStatic(ModuleReflectionUtil.class)) {
+            utilities.when(() -> ModuleReflectionUtil.getCheckstyleModules(packages, classLoader))
+                    .thenThrow(new IllegalStateException("creation of objects by fully qualified"
+                            + " class names should not result in search of modules in classpath"));
+
+            final String fullyQualifiedName = MockClass.class.getName();
+            assertWithMessage("class name is not in expected format")
+                    .that(fullyQualifiedName).contains(".");
+            final Object object = objectFactory.createModule(fullyQualifiedName);
+            assertWithMessage("Object should be an instance of MockClass")
+                    .that(object)
+                    .isInstanceOf(MockClass.class);
+        }
+    }
+
     @Test
     public void testCreateModuleWithTryInAllRegisteredPackages() {
         final ClassLoader classLoader = ClassLoader.getSystemClassLoader();
@@ -515,6 +544,35 @@ public void testCreateModuleWithTryInAllRegisteredPackages() {
 
     }
 
+    @Test
+    public void testExceptionMessage() {
+        final String barPackage = BASE_PACKAGE + ".packageobjectfactory.bar";
+        final String fooPackage = BASE_PACKAGE + ".packageobjectfactory.foo";
+        final String zooPackage = BASE_PACKAGE + ".packageobjectfactory.zoo";
+        final String abcPackage = BASE_PACKAGE + ".packageobjectfactory.abc";
+        final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        final PackageObjectFactory objectFactory = new PackageObjectFactory(
+                new HashSet<>(Arrays.asList(abcPackage, barPackage,
+                        fooPackage, zooPackage)), classLoader);
+        final String name = "FooCheck";
+        try {
+            objectFactory.createModule(name);
+            assertWithMessage("Exception is expected").fail();
+        }
+        catch (CheckstyleException ex) {
+            final String optionalNames = abcPackage + PACKAGE_SEPARATOR + name
+                    + STRING_SEPARATOR + barPackage + PACKAGE_SEPARATOR + name
+                    + STRING_SEPARATOR + fooPackage + PACKAGE_SEPARATOR + name
+                    + STRING_SEPARATOR + zooPackage + PACKAGE_SEPARATOR + name;
+            final LocalizedMessage exceptionMessage = new LocalizedMessage(
+                    Definitions.CHECKSTYLE_BUNDLE, getClass(),
+                    AMBIGUOUS_MODULE_NAME_EXCEPTION_MESSAGE, name, optionalNames);
+            assertWithMessage("Invalid exception message")
+                .that(ex.getMessage())
+                .isEqualTo(exceptionMessage.getMessage());
+        }
+    }
+
     private static final class FailConstructorFileSet extends AbstractFileSetCheck {
 
         private FailConstructorFileSet() {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java
index 4b921a455f8..ff63bf2c17d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/PropertiesExpanderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java
index 6969a29b3aa..7aadb04fa60 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mockStatic;
 
@@ -40,8 +40,11 @@
 import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -88,10 +91,11 @@ public void testCtor() {
     }
 
     @Test
-    public void testInCache() throws IOException {
+    public void testInCache() {
         final Configuration config = new DefaultConfiguration("myName");
-        final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
-        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName);
+        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath.toString());
         cache.put("myFile", 1);
         assertWithMessage("Should return true when file is in cache")
                 .that(cache.isInCache("myFile", 1))
@@ -147,8 +151,9 @@ public void testPopulateDetails() throws IOException {
     @Test
     public void testConfigHashOnReset() throws IOException {
         final Configuration config = new DefaultConfiguration("myName");
-        final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
-        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName);
+        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath.toString());
 
         cache.load();
 
@@ -167,8 +172,9 @@ public void testConfigHashOnReset() throws IOException {
     @Test
     public void testConfigHashRemainsOnResetExternalResources() throws IOException {
         final Configuration config = new DefaultConfiguration("myName");
-        final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
-        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
+        final String uniqueFileName = "file_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName);
+        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath.toString());
 
         // create cache with one file
         cache.load();
@@ -195,17 +201,20 @@ public void testConfigHashRemainsOnResetExternalResources() throws IOException {
     @Test
     public void testCacheRemainsWhenExternalResourceTheSame() throws IOException {
         final Configuration config = new DefaultConfiguration("myName");
-        final String externalResourcePath =
-                File.createTempFile("junit", null, temporaryFolder).getPath();
-        final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
-        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
+        final String externalFile = "junit_" + UUID.randomUUID() + ".java";
+        final File externalResourcePath = new File(temporaryFolder, externalFile);
+        externalResourcePath.createNewFile();
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName);
+        filePath.createNewFile();
+        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath.toString());
 
         // pre-populate with cache with resources
 
         cache.load();
 
         final Set<String> resources = new HashSet<>();
-        resources.add(externalResourcePath);
+        resources.add(externalResourcePath.toString());
         cache.putExternalResources(resources);
 
         cache.persist();
@@ -224,8 +233,9 @@ public void testCacheRemainsWhenExternalResourceTheSame() throws IOException {
     @Test
     public void testExternalResourceIsSavedInCache() throws Exception {
         final Configuration config = new DefaultConfiguration("myName");
-        final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
-        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName);
+        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath.toString());
 
         cache.load();
 
@@ -253,7 +263,7 @@ public void testExternalResourceIsSavedInCache() throws Exception {
     @Test
     public void testCacheDirectoryDoesNotExistAndShouldBeCreated() throws IOException {
         final Configuration config = new DefaultConfiguration("myName");
-        final String filePath = String.format(Locale.getDefault(), "%s%2$stemp%2$scache.temp",
+        final String filePath = String.format(Locale.ENGLISH, "%s%2$stemp%2$scache.temp",
             temporaryFolder, File.separator);
         final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
 
@@ -274,18 +284,109 @@ public void testPathToCacheContainsOnlyFileName() throws IOException {
 
         // no exception expected
         cache.persist();
+
         assertWithMessage("Cache file does not exist")
                 .that(Files.exists(filePath))
                 .isTrue();
         Files.delete(filePath);
     }
 
+    @Test
+    @DisabledOnOs(OS.WINDOWS)
+    public void testPersistWithSymbolicLinkToDirectory() throws IOException {
+        final Path tempDirectory = temporaryFolder.toPath();
+        final Path symbolicLinkDirectory = temporaryFolder.toPath()
+                .resolve("symbolicLink");
+        Files.createSymbolicLink(symbolicLinkDirectory, tempDirectory);
+
+        final Configuration config = new DefaultConfiguration("myName");
+        final String cacheFilePath = symbolicLinkDirectory.resolve("cache.temp").toString();
+        final PropertyCacheFile cache = new PropertyCacheFile(config, cacheFilePath);
+
+        cache.persist();
+
+        final Path expectedFilePath = tempDirectory.resolve("cache.temp");
+        assertWithMessage("Cache file should be created in the actual directory")
+                .that(Files.exists(expectedFilePath))
+                .isTrue();
+    }
+
+    @Test
+    @DisabledOnOs(OS.WINDOWS)
+    public void testSymbolicLinkResolution() throws IOException {
+        final Path tempDirectory = temporaryFolder.toPath();
+        final Path symbolicLinkDirectory = temporaryFolder.toPath()
+                .resolve("symbolicLink");
+        Files.createSymbolicLink(symbolicLinkDirectory, tempDirectory);
+
+        final Configuration config = new DefaultConfiguration("myName");
+        final String cacheFilePath = symbolicLinkDirectory.resolve("cache.temp").toString();
+        final PropertyCacheFile cache = new PropertyCacheFile(config, cacheFilePath);
+
+        cache.persist();
+
+        final Path expectedFilePath = tempDirectory.resolve("cache.temp");
+        assertWithMessage(
+                "Cache file should be created in the actual directory.")
+                .that(Files.exists(expectedFilePath))
+                .isTrue();
+    }
+
+    @Test
+    @DisabledOnOs(OS.WINDOWS)
+    public void testSymbolicLinkToNonDirectory() throws IOException {
+        final String uniqueFileName = "tempFile_" + UUID.randomUUID() + ".java";
+        final File tempFile = new File(temporaryFolder, uniqueFileName);
+        tempFile.createNewFile();
+        final Path symbolicLinkDirectory = temporaryFolder.toPath();
+        final Path symbolicLink = symbolicLinkDirectory.resolve("symbolicLink");
+        Files.createSymbolicLink(symbolicLink, tempFile.toPath());
+
+        final Configuration config = new DefaultConfiguration("myName");
+        final String cacheFilePath = symbolicLink.resolve("cache.temp").toString();
+        final PropertyCacheFile cache = new PropertyCacheFile(config, cacheFilePath);
+
+        final IOException thrown = getExpectedThrowable(IOException.class, cache::persist);
+
+        final String expectedMessage = "Resolved symbolic link " + symbolicLink
+                + " is not a directory.";
+
+        assertWithMessage(
+                "Expected IOException when symbolicLink is not a directory")
+                .that(thrown.getMessage())
+                .contains(expectedMessage);
+    }
+
+    @Test
+    @DisabledOnOs(OS.WINDOWS)
+    public void testMultipleSymbolicLinkResolution() throws IOException {
+        final Path actualDirectory = temporaryFolder.toPath();
+        final Path firstSymbolicLink = temporaryFolder.toPath()
+                .resolve("firstLink");
+        Files.createSymbolicLink(firstSymbolicLink, actualDirectory);
+
+        final Path secondSymbolicLink = temporaryFolder.toPath()
+                .resolve("secondLink");
+        Files.createSymbolicLink(secondSymbolicLink, firstSymbolicLink);
+
+        final Configuration config = new DefaultConfiguration("myName");
+        final String cacheFilePath = secondSymbolicLink.resolve("cache.temp").toString();
+        final PropertyCacheFile cache = new PropertyCacheFile(config, cacheFilePath);
+
+        cache.persist();
+
+        final Path expectedFilePath = actualDirectory.resolve("cache.temp");
+        assertWithMessage("Cache file should be created in the final actual directory")
+                .that(Files.exists(expectedFilePath))
+                .isTrue();
+    }
+
     @Test
     public void testChangeInConfig() throws Exception {
         final DefaultConfiguration config = new DefaultConfiguration("myConfig");
         config.addProperty("attr", "value");
-
-        final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File cacheFile = new File(temporaryFolder, uniqueFileName);
         final PropertyCacheFile cache = new PropertyCacheFile(config, cacheFile.getPath());
         cache.load();
 
@@ -330,18 +431,12 @@ public void testChangeInConfig() throws Exception {
             .hasSize(1);
     }
 
-    /**
-     * Test functionality when toByteArray throws an exception.
-     *
-     * @noinspection ResultOfMethodCallIgnored
-     * @noinspectionreason ResultOfMethodCallIgnored - Setup for mockito to only
-     *                     mock toByteArray to throw exception.
-     */
     @Test
     public void testNonExistentResource() throws IOException {
         final Configuration config = new DefaultConfiguration("myName");
-        final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
-        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName);
+        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath.toString());
 
         // create cache with one file
         cache.load();
@@ -353,31 +448,27 @@ public void testNonExistentResource() throws IOException {
                 .that(hash)
                 .isNotNull();
 
-        try (MockedStatic<ByteStreams> byteStream = mockStatic(ByteStreams.class)) {
-            byteStream.when(() -> ByteStreams.toByteArray(any(BufferedInputStream.class)))
-                .thenThrow(IOException.class);
-
-            // apply new external resource to clear cache
-            final Set<String> resources = new HashSet<>();
-            final String resource = getPath("InputPropertyCacheFile.header");
-            resources.add(resource);
-            cache.putExternalResources(resources);
+        // apply new external resource to clear cache
+        final Set<String> resources = new HashSet<>();
+        final String resource = getPath("InputPropertyCacheFile.header");
+        resources.add(resource);
+        cache.putExternalResources(resources);
 
-            assertWithMessage("Should return false in file is not in cache")
-                    .that(cache.isInCache(myFile, 1))
-                    .isFalse();
+        assertWithMessage("Should return false in file is not in cache")
+                .that(cache.isInCache(myFile, 1))
+                .isFalse();
 
-            assertWithMessage("Should return false in file is not in cache")
-                    .that(cache.isInCache(resource, 1))
-                    .isFalse();
-        }
+        assertWithMessage("Should return false in file is not in cache")
+                .that(cache.isInCache(resource, 1))
+                .isFalse();
     }
 
     @Test
-    public void testExceptionNoSuchAlgorithmException() throws Exception {
+    public void testExceptionNoSuchAlgorithmException() {
         final Configuration config = new DefaultConfiguration("myName");
-        final String filePath = File.createTempFile("junit", null, temporaryFolder).getPath();
-        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName);
+        final PropertyCacheFile cache = new PropertyCacheFile(config, filePath.toString());
         cache.put("myFile", 1);
 
         try (MockedStatic<MessageDigest> messageDigest = mockStatic(MessageDigest.class)) {
@@ -385,7 +476,7 @@ public void testExceptionNoSuchAlgorithmException() throws Exception {
                     .thenThrow(NoSuchAlgorithmException.class);
 
             final ReflectiveOperationException ex =
-                assertThrows(ReflectiveOperationException.class, () -> {
+                getExpectedThrowable(ReflectiveOperationException.class, () -> {
                     TestUtil.invokeStaticMethod(PropertyCacheFile.class,
                             "getHashCodeBasedOnObjectContent", config);
                 });
@@ -412,7 +503,8 @@ public void testExceptionNoSuchAlgorithmException() throws Exception {
     @ParameterizedTest
     @ValueSource(strings = {"Same;Same", "First;Second"})
     public void testPutNonExistentExternalResource(String rawMessages) throws Exception {
-        final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File cacheFile = new File(temporaryFolder, uniqueFileName);
         final String[] messages = rawMessages.split(";");
         // We mock getUriByFilename method of CommonUtil to guarantee that it will
         // throw CheckstyleException with the specific content.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java
index 48638d28633..b0362a4c68e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java
index 4131fe49134..cda4dc3ca31 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ThreadModeSettingsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ThreadModeSettingsTest.java
index 4ddf6587896..4ba3fe3415b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/ThreadModeSettingsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/ThreadModeSettingsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
index 94c222b2a3f..03cc0a1f279 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -30,12 +30,15 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -54,7 +57,6 @@
 import com.puppycrawl.tools.checkstyle.api.FileContents;
 import com.puppycrawl.tools.checkstyle.api.FileText;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck;
 import com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck;
 import com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck;
 import com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck;
@@ -63,11 +65,11 @@
 import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck;
 import com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck;
 import com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck;
+import com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck;
 import com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck;
 import com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck;
 import com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck;
 import com.puppycrawl.tools.checkstyle.filters.SuppressWithNearbyCommentFilter;
-import com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter;
 import com.puppycrawl.tools.checkstyle.filters.SuppressionXpathFilter;
 import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
@@ -91,18 +93,12 @@ protected String getPackageLocation() {
 
     @Test
     public void testProperFileExtension() throws Exception {
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(ConstantNameCheck.class);
-        final File file = new File(temporaryFolder, "file.java");
-        try (Writer writer = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
-            final String content = "public class Main { public static final int k = 5 + 4; }";
-            writer.write(content);
-        }
-        final String[] expected1 = {
-            "1:45: " + getCheckMessage(ConstantNameCheck.class,
-                    MSG_INVALID_PATTERN, "k", "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"),
+        final String path = getPath("InputTreeWalkerProperFileExtension.java");
+        final String[] expected = {
+            "10:27: " + getCheckMessage(ConstantNameCheck.class,
+                        MSG_INVALID_PATTERN, "k", "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"),
         };
-        verify(checkConfig, file.getPath(), expected1);
+        verifyWithInlineConfigParserTwice(path, expected);
     }
 
     /**
@@ -129,16 +125,15 @@ public void testProperFileExtension() throws Exception {
      */
     @Test
     public void testNoAuditEventsWithoutFilters() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(OneTopLevelClassCheck.class);
         final String[] expected = {
-            "5:1: " + getCheckMessage(OneTopLevelClassCheck.class,
+            "10:1: " + getCheckMessage(OneTopLevelClassCheck.class,
                     OneTopLevelClassCheck.MSG_KEY, "InputTreeWalkerInner"),
         };
         try (MockedConstruction<TreeWalkerAuditEvent> mocked =
                  Mockito.mockConstruction(TreeWalkerAuditEvent.class, (mock, context) -> {
                      throw new CheckstyleException("No audit events expected");
                  })) {
-            verify(checkConfig, getPath("InputTreeWalker.java"), expected);
+            verifyWithInlineConfigParserTwice(getPath("InputTreeWalker.java"), expected);
         }
     }
 
@@ -148,13 +143,12 @@ public void testNoAuditEventsWithoutFilters() throws Exception {
      */
     @Test
     public void testConditionRequiredWithoutOrdinaryChecks() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(JavadocParagraphCheck.class);
         final String[] expected = {
-            "3: " + getCheckMessage(JavadocParagraphCheck.class,
+            "7: " + getCheckMessage(JavadocParagraphCheck.class,
                     JavadocParagraphCheck.MSG_REDUNDANT_PARAGRAPH),
         };
         final String path = getPath("InputTreeWalkerJavadoc.java");
-        final DetailAST mockAst = mock(DetailAST.class);
+        final DetailAST mockAst = mock();
         final DetailAST realAst = JavaParser.parseFile(new File(path),
                 JavaParser.Options.WITH_COMMENTS);
         // Ensure that there is no calls to walk(..., AstState.ORDINARY)
@@ -164,7 +158,7 @@ public void testConditionRequiredWithoutOrdinaryChecks() throws Exception {
             // This will re-enable walk(..., AstState.WITH_COMMENTS)
             parser.when(() -> JavaParser.appendHiddenCommentNodes(mockAst)).thenReturn(realAst);
 
-            verify(checkConfig, path, expected);
+            verifyWithInlineConfigParserTwice(path, expected);
         }
     }
 
@@ -174,9 +168,8 @@ public void testConditionRequiredWithoutOrdinaryChecks() throws Exception {
      */
     @Test
     public void testConditionRequiredWithoutCommentChecks() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(OneTopLevelClassCheck.class);
         final String[] expected = {
-            "5:1: " + getCheckMessage(OneTopLevelClassCheck.class,
+            "10:1: " + getCheckMessage(OneTopLevelClassCheck.class,
                     OneTopLevelClassCheck.MSG_KEY, "InputTreeWalkerInner"),
         };
         try (MockedStatic<JavaParser> parser =
@@ -185,21 +178,18 @@ public void testConditionRequiredWithoutCommentChecks() throws Exception {
             parser.when(() -> JavaParser.appendHiddenCommentNodes(any(DetailAST.class)))
                     .thenThrow(IllegalStateException.class);
 
-            verify(checkConfig, getPath("InputTreeWalker.java"), expected);
+            verifyWithInlineConfigParserTwice(getPath("InputTreeWalker.java"), expected);
         }
     }
 
     @Test
     public void testImproperFileExtension() throws Exception {
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(ConstantNameCheck.class);
-        final File file = new File(temporaryFolder, "file.pdf");
-        try (Writer writer = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
-            final String content = "public class Main { public static final int k = 5 + 4; }";
-            writer.write(content);
-        }
+        final String regularFilePath = getPath("InputTreeWalkerImproperFileExtension.java");
+        final File originalFile = new File(regularFilePath);
+        final File tempFile = new File(temporaryFolder, "file.pdf");
+        Files.copy(originalFile.toPath(), tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, file.getPath(), expected);
+        verifyWithInlineConfigParserTwice(tempFile.getPath(), expected);
     }
 
     @Test
@@ -210,8 +200,7 @@ public void testAcceptableTokens()
         checkConfig.addProperty("tokens", "VARIABLE_DEF, ENUM_DEF, CLASS_DEF, METHOD_DEF,"
                 + "IMPORT");
         try {
-            final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-            verify(checkConfig, getPath("InputTreeWalker.java"), expected);
+            execute(checkConfig, getPath("InputTreeWalker.java"));
             assertWithMessage("CheckstyleException is expected").fail();
         }
         catch (CheckstyleException ex) {
@@ -232,11 +221,14 @@ public void testAcceptableTokens()
     @Test
     public void testOnEmptyFile() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(HiddenFieldCheck.class);
-        final String pathToEmptyFile =
-                File.createTempFile("file", ".java", temporaryFolder).getPath();
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-
-        verify(checkConfig, pathToEmptyFile, expected);
+        final String uniqueFileName = "file_" + UUID.randomUUID() + ".java";
+        final File emptyFile = new File(temporaryFolder, uniqueFileName);
+        emptyFile.createNewFile();
+        execute(checkConfig, emptyFile.getPath());
+        final long fileSize = Files.size(emptyFile.toPath());
+        assertWithMessage("File should be empty")
+                .that(fileSize)
+                .isEqualTo(0);
     }
 
     @Test
@@ -244,9 +236,9 @@ public void testWithCheckNotHavingTreeWalkerAsParent() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(JavadocPackageCheck.class);
 
         try {
-            final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-            verify(createChecker(createTreeWalkerConfig(checkConfig)),
-                    File.createTempFile("junit", null, temporaryFolder).getPath(), expected);
+            final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+            final File filePath = new File(temporaryFolder, uniqueFileName);
+            execute(createTreeWalkerConfig(checkConfig), filePath.toString());
             assertWithMessage("CheckstyleException is expected").fail();
         }
         catch (CheckstyleException exception) {
@@ -297,15 +289,21 @@ public void testSettersForParameters() throws Exception {
     @Test
     public void testForInvalidCheckImplementation() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(BadJavaDocCheck.class);
-        final String pathToEmptyFile =
-                File.createTempFile("file", ".java", temporaryFolder).getPath();
+        final String uniqueFileName = "file_" + UUID.randomUUID() + ".java";
+        final File pathToEmptyFile = new File(temporaryFolder, uniqueFileName);
 
         try {
-            final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-            verify(checkConfig, pathToEmptyFile, expected);
+            execute(checkConfig, pathToEmptyFile.toString());
             assertWithMessage("Exception is expected").fail();
         }
         catch (CheckstyleException ex) {
+            assertWithMessage("Error message is unexpected")
+                    .that(ex.getMessage())
+                    .isEqualTo("cannot initialize module com.puppycrawl.tools.checkstyle."
+                            + "TreeWalker - Check 'com.puppycrawl.tools.checkstyle."
+                            + "TreeWalkerTest$BadJavaDocCheck' waits for comment type token "
+                            + "('SINGLE_LINE_COMMENT') and should override "
+                            + "'isCommentNodesRequired()' method to return 'true'");
             assertWithMessage("Error message is unexpected")
                     .that(ex.getMessage())
                     .contains("isCommentNodesRequired");
@@ -354,15 +352,9 @@ public void testProcessNonJavaFilesWithoutException() throws Exception {
 
     @Test
     public void testWithCacheWithNoViolation() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(HiddenFieldCheck.class);
-        final Checker checker = createChecker(checkConfig);
-        final PackageObjectFactory factory = new PackageObjectFactory(
-            new HashSet<>(), Thread.currentThread().getContextClassLoader());
-        checker.setModuleFactory(factory);
-        final File file = File.createTempFile("file", ".java", temporaryFolder);
+        final String path = getPath("InputTreeWalkerWithCacheWithNoViolation.java");
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-
-        verify(checker, file.getPath(), expected);
+        verifyWithInlineConfigParserTwice(path, expected);
     }
 
     @Test
@@ -415,13 +407,16 @@ public void testProcessWithRecognitionException() throws Exception {
 
     @Test
     public void testRequiredTokenIsEmptyIntArray() throws Exception {
-        final DefaultConfiguration checkConfig =
-            createModuleConfig(RequiredTokenIsEmptyIntArray.class);
-        final String pathToEmptyFile =
-                File.createTempFile("file", ".java", temporaryFolder).getPath();
-
+        final File file = new File(temporaryFolder, "file.java");
+        try (Writer writer = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
+            final String configComment = "/*\n"
+                    + "com.puppycrawl.tools.checkstyle.TreeWalkerTest"
+                    + "$RequiredTokenIsEmptyIntArray\n\n"
+                    + "*/";
+            writer.write(configComment);
+        }
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, pathToEmptyFile, expected);
+        verifyWithInlineConfigParserTwice(file.getPath(), expected);
     }
 
     @Test
@@ -493,42 +488,47 @@ public void testSetupChild() throws Exception {
 
     @Test
     public void testBehaviourWithChecksAndFilters() throws Exception {
-        final DefaultConfiguration filterConfig =
-                createModuleConfig(SuppressionCommentFilter.class);
-        filterConfig.addProperty("checkCPP", "false");
-
-        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
-        treeWalkerConfig.addChild(createModuleConfig(MemberNameCheck.class));
-        treeWalkerConfig.addChild(filterConfig);
 
         final String[] expected = {
-            "9:17: " + getCheckMessage(MemberNameCheck.class, "name.invalidPattern", "P",
+            "17:17: " + getCheckMessage(MemberNameCheck.class, "name.invalidPattern", "P",
                     "^[a-z][a-zA-Z0-9]*$"),
-            "4:17: " + getCheckMessage(MemberNameCheck.class, "name.invalidPattern", "I",
+            "12:17: " + getCheckMessage(MemberNameCheck.class, "name.invalidPattern", "I",
                     "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verify(treeWalkerConfig,
+        verifyWithInlineConfigParserTwice(
                 getPath("InputTreeWalkerSuppressionCommentFilter.java"),
                 expected);
     }
 
     @Test
     public void testMultiCheckOrder() throws Exception {
-        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
-        treeWalkerConfig.addChild(createModuleConfig(WhitespaceAroundCheck.class));
-        treeWalkerConfig.addChild(createModuleConfig(WhitespaceAfterCheck.class));
 
         final String[] expected = {
-            "6:9: " + getCheckMessage(WhitespaceAfterCheck.class, "ws.notFollowed", "if"),
-            "6:9: " + getCheckMessage(WhitespaceAroundCheck.class, "ws.notFollowed", "if"),
+            "13:9: " + getCheckMessage(WhitespaceAfterCheck.class, "ws.notFollowed", "if"),
+            "13:9: " + getCheckMessage(WhitespaceAroundCheck.class, "ws.notFollowed", "if"),
         };
 
-        verify(treeWalkerConfig,
+        verifyWithInlineConfigParserTwice(
                 getPath("InputTreeWalkerMultiCheckOrder.java"),
                 expected);
     }
 
+    @Test
+    public void testMultiCheckOfSameTypeNoIdResultsInOrderingByHash() throws Exception {
+
+        final String[] expected = {
+            "15:28: " + getCheckMessage(ParameterNameCheck.class,
+                    "name.invalidPattern", "V2", "^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"),
+            "17:25: " + getCheckMessage(ParameterNameCheck.class,
+                    "name.invalidPattern", "b", "^[a-z][a-z0-9][a-zA-Z0-9]*$"),
+        };
+
+        verifyWithInlineConfigParserTwice(
+                getPath("InputTreeWalkerMultiCheckOrder2.java"),
+                expected);
+    }
+
     @Test
     public void testFinishLocalSetupFullyInitialized() {
         final TreeWalker treeWalker = new TreeWalker();
@@ -549,9 +549,9 @@ public void testFinishLocalSetupFullyInitialized() {
     public void testCheckInitIsCalledInTreeWalker() throws Exception {
         final DefaultConfiguration checkConfig =
                 createModuleConfig(VerifyInitCheck.class);
-        final File file = File.createTempFile("file", ".pdf", temporaryFolder);
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, file.getPath(), expected);
+        final String uniqueFileName = "file_" + UUID.randomUUID() + ".pdf";
+        final File file = new File(temporaryFolder, uniqueFileName);
+        execute(checkConfig, file.getPath());
         assertWithMessage("Init was not called")
                 .that(VerifyInitCheck.isInitWasCalled())
                 .isTrue();
@@ -562,9 +562,9 @@ public void testCheckDestroyIsCalledInTreeWalker() throws Exception {
         VerifyDestroyCheck.resetDestroyWasCalled();
         final DefaultConfiguration checkConfig =
                 createModuleConfig(VerifyDestroyCheck.class);
-        final File file = File.createTempFile("file", ".pdf", temporaryFolder);
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, file.getPath(), expected);
+        final String uniqueFileName = "file_" + UUID.randomUUID() + ".pdf";
+        final File file = new File(temporaryFolder, uniqueFileName);
+        execute(checkConfig, file.getPath());
         assertWithMessage("Destroy was not called")
                 .that(VerifyDestroyCheck.isDestroyWasCalled())
                 .isTrue();
@@ -575,9 +575,9 @@ public void testCommentCheckDestroyIsCalledInTreeWalker() throws Exception {
         VerifyDestroyCheck.resetDestroyWasCalled();
         final DefaultConfiguration checkConfig =
                 createModuleConfig(VerifyDestroyCommentCheck.class);
-        final File file = File.createTempFile("file", ".pdf", temporaryFolder);
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, file.getPath(), expected);
+        final String uniqueFileName = "file_" + UUID.randomUUID() + ".pdf";
+        final File file = new File(temporaryFolder, uniqueFileName);
+        execute(checkConfig, file.getPath());
         assertWithMessage("Destroy was not called")
                 .that(VerifyDestroyCheck.isDestroyWasCalled())
                 .isTrue();
@@ -591,15 +591,16 @@ public void testCacheWhenFileExternalResourceContentDoesNotChange() throws Excep
         treeWalkerConfig.addChild(filterConfig);
 
         final DefaultConfiguration checkerConfig = createRootConfig(treeWalkerConfig);
-        final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName1 = "junit_" + UUID.randomUUID() + ".java";
+        final File cacheFile = new File(temporaryFolder, uniqueFileName1);
         checkerConfig.addProperty("cacheFile", cacheFile.getPath());
 
-        final String filePath = File.createTempFile("file", ".java", temporaryFolder).getPath();
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        final String uniqueFileName2 = "file_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName2);
 
-        verify(checkerConfig, filePath, expected);
+        execute(checkerConfig, filePath.toString());
         // One more time to use cache.
-        verify(checkerConfig, filePath, expected);
+        execute(checkerConfig, filePath.toString());
 
         assertWithMessage("External resource is not present in cache")
                 .that(Files.readString(cacheFile.toPath()))
@@ -608,21 +609,12 @@ public void testCacheWhenFileExternalResourceContentDoesNotChange() throws Excep
 
     @Test
     public void testTreeWalkerFilterAbsolutePath() throws Exception {
-        final DefaultConfiguration filterConfig = createModuleConfig(SuppressionXpathFilter.class);
-        filterConfig.addProperty("file",
-                getPath("InputTreeWalkerSuppressionXpathFilterAbsolute.xml"));
-        final DefaultConfiguration checkConfig = createModuleConfig(LeftCurlyCheck.class);
-
-        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
-        treeWalkerConfig.addChild(filterConfig);
-        treeWalkerConfig.addChild(checkConfig);
-
         // test is only valid when relative paths are given
         final String filePath = "src/test/resources/" + getPackageLocation()
                 + "/InputTreeWalkerSuppressionXpathFilterAbsolute.java";
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        verify(treeWalkerConfig, filePath, expected);
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParserTwice(filePath, expected);
     }
 
     @Test
@@ -635,13 +627,50 @@ public void testExternalResourceFiltersWithNoExternalResource() throws Exception
         treeWalkerConfig.addChild(filterConfig);
 
         final DefaultConfiguration checkerConfig = createRootConfig(treeWalkerConfig);
-        final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName1 = "junit_" + UUID.randomUUID() + ".java";
+        final File cacheFile = new File(temporaryFolder, uniqueFileName1);
         checkerConfig.addProperty("cacheFile", cacheFile.getPath());
+        final String uniqueFileName2 = "junit_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName2);
 
-        final String filePath = File.createTempFile("file", ".java", temporaryFolder).getPath();
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        execute(checkerConfig, filePath.toString());
+
+        final long cacheSize = Files.size(cacheFile.toPath());
+        assertWithMessage("cacheFile should not be empty")
+                .that(cacheSize)
+                .isNotEqualTo(0);
+    }
 
-        verify(checkerConfig, filePath, expected);
+    /**
+     * This test is checking that Checks execution ordered by name.
+     *
+     * @throws Exception if file is not found
+     */
+    @Test
+    public void testOrderOfCheckExecution() throws Exception {
+
+        final DefaultConfiguration configuration1 = createModuleConfig(AaCheck.class);
+        configuration1.addProperty("id", "2");
+        final DefaultConfiguration configuration2 = createModuleConfig(BbCheck.class);
+        configuration2.addProperty("id", "1");
+
+        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
+        treeWalkerConfig.addChild(configuration2);
+        treeWalkerConfig.addChild(configuration1);
+
+        final List<File> files =
+                Collections.singletonList(new File(getPath("InputTreeWalker2.java")));
+        final Checker checker = createChecker(treeWalkerConfig);
+
+        try {
+            checker.process(files);
+            assertWithMessage("exception is expected").fail();
+        }
+        catch (CheckstyleException exception) {
+            assertWithMessage("wrong order of Check executions")
+                    .that(exception.getCause().getMessage())
+                    .isEqualTo(AaCheck.class.toString());
+        }
     }
 
     public static class BadJavaDocCheck extends AbstractCheck {
@@ -738,6 +767,54 @@ public boolean isCommentNodesRequired() {
 
     }
 
+    public static class AaCheck extends AbstractCheck {
+
+        @Override
+        public int[] getDefaultTokens() {
+            return new int[0];
+        }
+
+        @Override
+        public int[] getAcceptableTokens() {
+            return new int[0];
+        }
+
+        @Override
+        public int[] getRequiredTokens() {
+            return new int[0];
+        }
+
+        @Override
+        public void beginTree(DetailAST rootAST) {
+            throw new IllegalStateException(AaCheck.class.toString());
+        }
+
+    }
+
+    public static class BbCheck extends AbstractCheck {
+
+        @Override
+        public int[] getDefaultTokens() {
+            return new int[0];
+        }
+
+        @Override
+        public int[] getAcceptableTokens() {
+            return new int[0];
+        }
+
+        @Override
+        public int[] getRequiredTokens() {
+            return new int[0];
+        }
+
+        @Override
+        public void beginTree(DetailAST rootAST) {
+            throw new IllegalStateException(BbCheck.class.toString());
+        }
+
+    }
+
     public static class RequiredTokenIsEmptyIntArray extends AbstractCheck {
 
         @Override
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java
index bf49eec65b2..be0a4d54e7f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XdocsPropertyTypeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XdocsPropertyTypeTest.java
index 5f70ddd6267..2a5f63bf72c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/XdocsPropertyTypeTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/XdocsPropertyTypeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -46,7 +46,7 @@ public void testAllPropertyTypesAreUsed() throws IOException {
             .map(field -> field.getAnnotation(XdocsPropertyType.class))
             .filter(Objects::nonNull)
             .map(XdocsPropertyType::value)
-            .collect(Collectors.toSet());
+            .collect(Collectors.toUnmodifiableSet());
 
         assertWithMessage("All property types should be used")
             .that(propertyTypes)
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XmlLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XmlLoaderTest.java
index fcba126ee79..85ae1264fb0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/XmlLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/XmlLoaderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilterTest.java
index 012bb7c3d59..3419f1b7f0d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAstFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListenerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListenerTest.java
index 206332dfc2b..1004768ae3f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListenerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/XpathFileGeneratorAuditListenerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java
index cd69b0c14ed..7b86e6c130c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.ant;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 import java.io.IOException;
@@ -245,7 +245,7 @@ public final void testNoConfigFile() throws IOException {
         final CheckstyleAntTask antTask = new CheckstyleAntTask();
         antTask.setProject(new Project());
         antTask.setFile(new File(getPath(FLAWLESS_INPUT)));
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -259,7 +259,7 @@ public final void testNonExistentConfig() throws IOException {
         antTask.setConfig(getPath(NOT_EXISTING_FILE));
         antTask.setProject(new Project());
         antTask.setFile(new File(getPath(FLAWLESS_INPUT)));
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -273,7 +273,7 @@ public final void testEmptyConfigFile() throws IOException {
         antTask.setConfig(getPath("InputCheckstyleAntTaskEmptyConfig.xml"));
         antTask.setProject(new Project());
         antTask.setFile(new File(getPath(FLAWLESS_INPUT)));
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -284,7 +284,7 @@ public final void testEmptyConfigFile() throws IOException {
     @Test
     public final void testNoFile() throws IOException {
         final CheckstyleAntTask antTask = getCheckstyleAntTask();
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -297,7 +297,7 @@ public final void testMaxWarningExceeded() throws IOException {
         final CheckstyleAntTask antTask = getCheckstyleAntTask();
         antTask.setFile(new File(getPath(WARNING_INPUT)));
         antTask.setMaxWarnings(0);
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -331,7 +331,7 @@ public final void testFailureProperty() throws IOException {
 
         antTask.setProject(project);
         antTask.setFailureProperty(failurePropertyName);
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -463,7 +463,7 @@ public final void testSimultaneousConfiguration() throws IOException {
 
         final CheckstyleAntTask antTask = new CheckstyleAntTask();
         antTask.setConfig(url.toString());
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 () -> antTask.setConfig("Any string value"),
                 "BuildException is expected");
         final String expected = "Attribute 'config' has already been set";
@@ -492,7 +492,7 @@ public final void testSetPropertiesNonExistentFile() throws IOException {
         final CheckstyleAntTask antTask = getCheckstyleAntTask();
         antTask.setFile(new File(getPath(FLAWLESS_INPUT)));
         antTask.setProperties(new File(getPath(NOT_EXISTING_FILE)));
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -572,7 +572,7 @@ public final void testCreateListenerException() throws IOException {
         final File outputFile = new File("target/");
         formatter.setTofile(outputFile);
         antTask.addFormatter(formatter);
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -591,7 +591,7 @@ public final void testCreateListenerExceptionWithXmlLogger() throws IOException
         formatterType.setValue("xml");
         formatter.setType(formatterType);
         antTask.addFormatter(formatter);
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -610,7 +610,7 @@ public final void testCreateListenerExceptionWithSarifLogger() throws IOExceptio
         formatterType.setValue("sarif");
         formatter.setType(formatterType);
         antTask.addFormatter(formatter);
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -621,7 +621,7 @@ public final void testCreateListenerExceptionWithSarifLogger() throws IOExceptio
     @Test
     public void testSetInvalidType() {
         final CheckstyleAntTask.FormatterType formatterType = new CheckstyleAntTask.FormatterType();
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 () -> formatterType.setValue("foo"),
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -832,7 +832,7 @@ public void testCheckerException() throws IOException {
         antTask.setConfig(getPath(CONFIG_FILE));
         antTask.setProject(new Project());
         antTask.setFile(new File(""));
-        final BuildException ex = assertThrows(BuildException.class,
+        final BuildException ex = getExpectedThrowable(BuildException.class,
                 antTask::execute,
                 "BuildException is expected");
         assertWithMessage("Error message is unexpected")
@@ -869,7 +869,7 @@ private static void assertLoggedTime(List<MessageLevelPair> loggedMessages,
             .that(optionalMessageLevelPair.isPresent())
             .isTrue();
 
-        final long actualTime = getNumberFromLine(optionalMessageLevelPair.get().getMsg());
+        final long actualTime = getNumberFromLine(optionalMessageLevelPair.orElseThrow().getMsg());
 
         assertWithMessage("Logged time in '" + expectedMsg + "' "
                               + "must be less than the testing time")
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java
index 8a147a33fee..41e80e97bd3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -177,7 +177,7 @@ public int[] getRequiredTokens() {
             Charset.defaultCharset().name())));
 
         assertWithMessage("Invalid line content")
-                .that(check.getLine(3))
+                .that(check.getLine(9))
                 .isEqualTo(" * I'm a javadoc");
     }
 
@@ -206,7 +206,7 @@ public int[] getRequiredTokens() {
 
         final int[] expectedCodePoints = "    public int getVariable() {".codePoints().toArray();
         assertWithMessage("Invalid line content")
-                .that(check.getLineCodePoints(12))
+                .that(check.getLineCodePoints(18))
                 .isEqualTo(expectedCodePoints);
     }
 
@@ -382,12 +382,10 @@ public void testAstLog() throws Exception {
 
     @Test
     public void testCheck() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(ViolationAstCheck.class);
-
         final String[] expected = {
-            "1:1: Violation.",
+            "6:1: Violation.",
         };
-        verify(checkConfig, getPath("InputAbstractCheckTestFileContents.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractCheckTestFileContents.java"), expected);
     }
 
     /**
@@ -399,7 +397,11 @@ public void testCheck() throws Exception {
     public void testTokensAreUnmodifiable() {
         final DummyAbstractCheck check = new DummyAbstractCheck();
         final Set<String> tokenNameSet = check.getTokenNames();
-        assertThrows(UnsupportedOperationException.class, () -> tokenNameSet.add(""));
+        final Exception ex = getExpectedThrowable(UnsupportedOperationException.class,
+                () -> tokenNameSet.add(""));
+        assertWithMessage("Exception class is not expected")
+                .that(ex.getClass())
+                .isEqualTo(UnsupportedOperationException.class);
     }
 
     public static final class DummyAbstractCheck extends AbstractCheck {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheckTest.java
index 34eca4cc872..c898e938754 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -187,7 +187,7 @@ public void testSetExtensionThrowsExceptionWhenTheyAreNull() {
     public void testLineColumnLog() throws Exception {
         final ViolationFileSetCheck check = new ViolationFileSetCheck();
         check.configure(new DefaultConfiguration("filesetcheck"));
-        final File file = new File(getPath("InputAbstractFileSetLineColumn.txt"));
+        final File file = new File(getPath("InputAbstractFileSetLineColumn.java"));
         final FileText theText = new FileText(file.getAbsoluteFile(),
                 StandardCharsets.UTF_8.name());
         final SortedSet<Violation> internalViolations = check.process(file, theText);
@@ -202,7 +202,7 @@ public void testLineColumnLog() throws Exception {
                 .isEqualTo(1);
         assertWithMessage("expected column")
                 .that(violation.getColumnNo())
-                .isEqualTo(6);
+                .isEqualTo(1);
     }
 
     @Test
@@ -218,12 +218,10 @@ public void testGetMessageDispatcher() {
 
     @Test
     public void testCheck() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(ViolationFileSetCheck.class);
-
         final String[] expected = {
-            "1:6: Violation.",
+            "1:1: Violation.",
         };
-        verify(checkConfig, getPath("InputAbstractFileSetLineColumn.txt"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractFileSetLineColumn.java"), expected);
     }
 
     @Test
@@ -296,7 +294,7 @@ public static class ViolationFileSetCheck extends AbstractFileSetCheck {
 
         @Override
         protected void processFiltered(File file, FileText fileText) {
-            log(1, 5, MSG_KEY);
+            log(1, 0, MSG_KEY);
         }
 
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java
index 5574fcaa2f4..da3feb3ffa1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/AuditEventTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/AuditEventTest.java
index 9da27313518..bdf74546c79 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/AuditEventTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/AuditEventTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import org.junit.jupiter.api.Test;
 
@@ -46,7 +46,7 @@ public void test() {
 
     @Test
     public void testNoSource() {
-        final IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
+        final IllegalArgumentException ex = getExpectedThrowable(IllegalArgumentException.class,
                 () -> new AuditEvent(null),
                 "IllegalArgumentException expected");
         assertWithMessage("Invalid exception message")
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSetTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSetTest.java
index 1ab22847e46..3abb167d34d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSetTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSetTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -114,8 +114,11 @@ public void testUnmodifiableSet() {
         filterSet.addBeforeExecutionFileFilter(filter);
         final Set<BeforeExecutionFileFilter> excFilterSet =
             filterSet.getBeforeExecutionFileFilters();
-        assertThrows(UnsupportedOperationException.class,
+        final Exception ex = getExpectedThrowable(UnsupportedOperationException.class,
             () -> excFilterSet.add(filter));
+        assertWithMessage("Exception message is not expected")
+                .that(ex.getClass())
+                .isEqualTo(UnsupportedOperationException.class);
     }
 
     /*
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/CommentTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/CommentTest.java
index c1c26b6bddd..2556b94f6c5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/CommentTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/CommentTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java
index 7e10bfc24cf..84d40e7d9e9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 import java.util.Arrays;
@@ -339,7 +339,11 @@ public void testUnmodifiableGetSingleLineComment() {
                 Arrays.asList("// comment ", " A + B ", " ")));
         cppComments.reportSingleLineComment(1, 0);
         final Map<Integer, TextBlock> comments = cppComments.getSingleLineComments();
-        assertThrows(UnsupportedOperationException.class, () -> comments.remove(0));
+        final Exception ex = getExpectedThrowable(UnsupportedOperationException.class,
+                () -> comments.remove(0));
+        assertWithMessage("Exception message not expected")
+                .that(ex.getClass())
+                .isEqualTo(UnsupportedOperationException.class);
     }
 
     @Test
@@ -348,6 +352,10 @@ public void testUnmodifiableGetBlockComments() {
                 Arrays.asList("/* comment ", " ", " comment */")));
         clangComments.reportBlockComment(1, 0, 3, 9);
         final Map<Integer, List<TextBlock>> comments = clangComments.getBlockComments();
-        assertThrows(UnsupportedOperationException.class, () -> comments.remove(0));
+        final Exception ex = getExpectedThrowable(UnsupportedOperationException.class,
+                () -> comments.remove(0));
+        assertWithMessage("Exception message not expected")
+                .that(ex.getClass())
+                .isEqualTo(UnsupportedOperationException.class);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileSetCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileSetCheckTest.java
index d8aff002532..072151d14e2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileSetCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileSetCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,10 +38,8 @@ protected String getPackageLocation() {
 
     @Test
     public void testTranslation() throws Exception {
-        final Configuration checkConfig =
-            createModuleConfig(TestFileSetCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputFileSetIllegalTokens.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputFileSetIllegalTokens.java"), expected);
 
         assertWithMessage("destroy() not called by Checker")
                 .that(TestFileSetCheck.isDestroyed())
@@ -50,11 +48,8 @@ public void testTranslation() throws Exception {
 
     @Test
     public void testProcessCallsFinishBeforeCallingDestroy() throws Exception {
-        final Configuration checkConfig =
-            createModuleConfig(TestFileSetCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-
-        verify(checkConfig, getPath("InputFileSetIllegalTokens.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputFileSetIllegalTokens.java"), expected);
 
         assertWithMessage("FileContent should be available during finishProcessing() call")
                 .that(TestFileSetCheck.isFileContentAvailable())
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java
index be7bc1620a2..2b049873071 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/FilterSetTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/FilterSetTest.java
index 8a9a519c03e..ffa0cbb5bea 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/FilterSetTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/FilterSetTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.util.Objects;
 import java.util.Set;
@@ -115,8 +115,11 @@ public void testUnmodifiableSet() {
         final Filter filter = new FilterSet();
         filterSet.addFilter(filter);
         final Set<Filter> subFilterSet = filterSet.getFilters();
-        assertThrows(UnsupportedOperationException.class,
+        final Exception ex = getExpectedThrowable(UnsupportedOperationException.class,
             () -> subFilterSet.add(filter));
+        assertWithMessage("Exception message not expected")
+                .that(ex.getClass())
+                .isEqualTo(UnsupportedOperationException.class);
     }
 
     /*
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/FullIdentTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/FullIdentTest.java
index 15f56ab2659..ea6ef9d0594 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/FullIdentTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/FullIdentTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypesTest.java
index 6447a3be6fc..cb257c7f4e7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java
index d2ed8a5a863..b9725fde848 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/ScopeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/ScopeTest.java
index e7f99f0f346..6180b4fbae0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/ScopeTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/ScopeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounterTest.java
index 1d47d78c4e2..6276ba99b9f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelTest.java
index bc2df56f0b5..c28daacb08a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/TokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/TokenTypesTest.java
index 91f492bb5e7..0ff658c5929 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/TokenTypesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/TokenTypesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,7 +43,7 @@ public void testAllTokenTypesHasDescription() {
         final Set<String> expected = Arrays.stream(TokenUtil.getAllTokenIds())
             .mapToObj(TokenUtil::getTokenName)
             .filter(name -> name.charAt(0) != '$')
-            .collect(Collectors.toSet());
+            .collect(Collectors.toUnmodifiableSet());
         final Set<String> actual = bundle.keySet();
         assertWithMessage("TokenTypes without description")
                 .that(actual)
@@ -56,7 +56,8 @@ public void testAllDescriptionsEndsWithPeriod() {
             .mapToObj(TokenUtil::getTokenName)
             .filter(name -> name.charAt(0) != '$')
             .map(TokenUtil::getShortDescription)
-            .filter(desc -> desc.charAt(desc.length() - 1) != '.').collect(Collectors.toSet());
+            .filter(desc -> desc.charAt(desc.length() - 1) != '.')
+            .collect(Collectors.toUnmodifiableSet());
         assertWithMessage("Malformed TokenType descriptions")
                 .that(badDescriptions)
                 .isEqualTo(Collections.emptySet());
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java
index 0a08148401d..8be97788698 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java
index 9061e50a456..1bbbea9de4f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,9 +26,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -50,19 +51,26 @@ public final class InlineConfigParser {
     /** A pattern matching the symbol: "\" or "/". */
     private static final Pattern SLASH_PATTERN = Pattern.compile("[\\\\/]");
 
+    /**
+     * Pattern for lines under
+     * {@link InlineConfigParser#VIOLATIONS_SOME_LINES_ABOVE_PATTERN}.
+     */
+    private static final Pattern VIOLATION_MESSAGE_PATTERN = Pattern
+            .compile(".*//\\s*(?:['\"](.*)['\"])?$");
     /**
      * A pattern that matches the following comments formats.
      * <ol>
-     *     <li> "// violation" </li>
-     *     <li> "// violation, 'violation message'" </li>
-     *     <li> "// violation 'violation messages'" </li>
+     *     <li> // violation </li>
+     *     <li> // violation, 'violation message' </li>
+     *     <li> // violation 'violation messages' </li>
+     *     <li> // violation, "violation messages" </li>
      * </ol>
      *
      * <p>
      * This pattern will not match the following formats.
      * <ol>
-     *     <li> "// violation, explanation" </li>
-     *     <li> "// violation, explanation, 'violation message'" </li>
+     *     <li> // violation, explanation </li>
+     *     <li> // violation, explanation, 'violation message' </li>
      * </ol>
      *
      * These are matched by
@@ -70,27 +78,27 @@ public final class InlineConfigParser {
      * </p>
      */
     private static final Pattern VIOLATION_PATTERN = Pattern
-            .compile(".*//\\s*violation,?\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*violation,?\\s*(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// violation above". */
     private static final Pattern VIOLATION_ABOVE_PATTERN = Pattern
-            .compile(".*//\\s*violation above\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*violation above,?\\s*(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// violation below". */
     private static final Pattern VIOLATION_BELOW_PATTERN = Pattern
-            .compile(".*//\\s*violation below\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*violation below,?\\s*(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// violation above, explanation". */
     private static final Pattern VIOLATION_ABOVE_WITH_EXPLANATION_PATTERN = Pattern
-            .compile(".*//\\s*violation above,\\s.+\\s(?:'(.*)')?$");
+            .compile(".*//\\s*violation above,\\s.+\\s(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// violation below, explanation". */
     private static final Pattern VIOLATION_BELOW_WITH_EXPLANATION_PATTERN = Pattern
-            .compile(".*//\\s*violation below,\\s.+\\s(?:'(.*)')?$");
+            .compile(".*//\\s*violation below,\\s.+\\s(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// violation, explanation". */
     private static final Pattern VIOLATION_WITH_EXPLANATION_PATTERN = Pattern
-            .compile(".*//\\s*violation,\\s.+\\s(?:'(.*)')?$");
+            .compile(".*//\\s*violation,\\s.+\\s(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// X violations". */
     private static final Pattern MULTIPLE_VIOLATIONS_PATTERN = Pattern
@@ -106,23 +114,53 @@ public final class InlineConfigParser {
 
     /** A pattern to find the string: "// filtered violation". */
     private static final Pattern FILTERED_VIOLATION_PATTERN = Pattern
-            .compile(".*//\\s*filtered violation\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*filtered violation\\s*(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// filtered violation above". */
     private static final Pattern FILTERED_VIOLATION_ABOVE_PATTERN = Pattern
-            .compile(".*//\\s*filtered violation above\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*filtered violation above\\s*(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// filtered violation below". */
     private static final Pattern FILTERED_VIOLATION_BELOW_PATTERN = Pattern
-            .compile(".*//\\s*filtered violation below\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*filtered violation below\\s*(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// violation X lines above". */
     private static final Pattern VIOLATION_SOME_LINES_ABOVE_PATTERN = Pattern
-            .compile(".*//\\s*violation (\\d+) lines above\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*violation (\\d+) lines above\\s*(?:['\"](.*)['\"])?$");
 
     /** A pattern to find the string: "// violation X lines below". */
     private static final Pattern VIOLATION_SOME_LINES_BELOW_PATTERN = Pattern
-            .compile(".*//\\s*violation (\\d+) lines below\\s*(?:'(.*)')?$");
+            .compile(".*//\\s*violation (\\d+) lines below\\s*(?:['\"](.*)['\"])?$");
+
+    /**
+     * <p>
+     * Multiple violations for above line. Messages are X lines below.
+     * {@code
+     *   // X violations above:
+     *   //                    'violation message1'
+     *   //                    'violation messageX'
+     * }
+     *
+     * Messages are matched by {@link InlineConfigParser#VIOLATION_MESSAGE_PATTERN}
+     * </p>
+     */
+    private static final Pattern VIOLATIONS_ABOVE_PATTERN_WITH_MESSAGES = Pattern
+            .compile(".*//\\s*(\\d+) violations above:$");
+
+    /**
+     * <p>
+     * Multiple violations for line. Violations are Y lines above, messages are X lines below.
+     * {@code
+     *   // X violations Y lines above:
+     *   //                            'violation message1'
+     *   //                            'violation messageX'
+     * }
+     *
+     * Messages are matched by {@link InlineConfigParser#VIOLATION_MESSAGE_PATTERN}
+     * </p>
+     */
+    private static final Pattern VIOLATIONS_SOME_LINES_ABOVE_PATTERN = Pattern
+            .compile(".*//\\s*(\\d+) violations (\\d+) lines above:$");
 
     /** The String "(null)". */
     private static final String NULL_STRING = "(null)";
@@ -132,17 +170,6 @@ public final class InlineConfigParser {
             ConfigurationLoader.DTD_PUBLIC_CS_ID_1_3,
             ConfigurationLoader.DTD_PUBLIC_CS_ID_1_3);
 
-    /**
-     * Checks in which violation message is not specified in input file and have more than
-     * one violation message key.
-     * Until <a href="https://github.com/checkstyle/checkstyle/issues/11214">#11214</a>
-     */
-    private static final Set<String> SUPPRESSED_CHECKS = new HashSet<>(Arrays.asList(
-            "com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck",
-            "com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck",
-            "com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck",
-            "com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck"));
-
     /**
      *  Inlined configs can not be used in non-java checks, as Inlined config is java style
      *  multiline comment.
@@ -197,6 +224,56 @@ public static TestInputConfiguration parseWithFilteredViolations(String inputFil
         return parse(inputFilePath, true);
     }
 
+    /**
+     * Parse the input file with configuration in xml header.
+     *
+     * @param inputFilePath the input file path.
+     * @throws Exception if unable to parse the xml header
+     */
+    public static TestInputConfiguration parseWithXmlHeader(String inputFilePath)
+            throws Exception {
+
+        final Path filePath = Paths.get(inputFilePath);
+        final List<String> lines = readFile(filePath);
+        if (!checkIsXmlConfig(lines)) {
+            throw new CheckstyleException("Config cannot be parsed as xml.");
+        }
+
+        final List<String> inlineConfig = getInlineConfig(lines);
+        final String stringXmlConfig = LATEST_DTD + String.join("", inlineConfig);
+        final InputSource inputSource = new InputSource(new StringReader(stringXmlConfig));
+        final Configuration xmlConfig = ConfigurationLoader.loadConfiguration(
+                inputSource, new PropertiesExpander(System.getProperties()),
+                ConfigurationLoader.IgnoredModulesOptions.EXECUTE
+        );
+        final String configName = xmlConfig.getName();
+        if (!"Checker".equals(configName)) {
+            throw new CheckstyleException(
+                    "First module should be Checker, but was " + configName);
+        }
+
+        final TestInputConfiguration.Builder testInputConfigBuilder =
+                new TestInputConfiguration.Builder();
+        testInputConfigBuilder.setXmlConfiguration(xmlConfig);
+        try {
+            setViolations(testInputConfigBuilder, lines, false);
+        }
+        catch (CheckstyleException ex) {
+            throw new CheckstyleException(ex.getMessage() + " in " + inputFilePath, ex);
+        }
+        return testInputConfigBuilder.buildWithXmlConfiguration();
+    }
+
+    /**
+     * Check whether a file provides xml configuration.
+     *
+     * @param lines lines of the file
+     * @return true if a file provides xml configuration, otherwise false.
+     */
+    private static boolean checkIsXmlConfig(List<String> lines) {
+        return "/*xml".equals(lines.get(0));
+    }
+
     private static void setModules(TestInputConfiguration.Builder testInputConfigBuilder,
                                    String inputFilePath, List<String> lines)
             throws Exception {
@@ -206,9 +283,8 @@ private static void setModules(TestInputConfiguration.Builder testInputConfigBui
         }
 
         final List<String> inlineConfig = getInlineConfig(lines);
-        final boolean isXmlConfig = "/*xml".equals(lines.get(0));
 
-        if (isXmlConfig) {
+        if (checkIsXmlConfig(lines)) {
             final String stringXmlConfig = LATEST_DTD + String.join("", inlineConfig);
             final InputSource inputSource = new InputSource(new StringReader(stringXmlConfig));
             final Configuration xmlConfig = ConfigurationLoader.loadConfiguration(
@@ -231,7 +307,7 @@ private static List<String> getInlineConfig(List<String> lines) {
         return lines.stream()
                 .skip(1)
                 .takeWhile(line -> !line.startsWith("*/"))
-                .collect(Collectors.toList());
+                .collect(Collectors.toUnmodifiableList());
     }
 
     private static void handleXmlConfig(TestInputConfiguration.Builder testInputConfigBuilder,
@@ -246,7 +322,7 @@ private static void handleXmlConfig(TestInputConfiguration.Builder testInputConf
             }
             else {
                 final ModuleInputConfiguration.Builder moduleInputConfigBuilder =
-                    new ModuleInputConfiguration.Builder();
+                        new ModuleInputConfiguration.Builder();
                 setModuleName(moduleInputConfigBuilder, inputFilePath, moduleName);
                 setProperties(inputFilePath, module, moduleInputConfigBuilder);
                 testInputConfigBuilder.addChildModule(moduleInputConfigBuilder.build());
@@ -274,12 +350,34 @@ private static void handleKeyValueConfig(TestInputConfiguration.Builder testInpu
 
     private static String getFullyQualifiedClassName(String filePath, String moduleName)
             throws CheckstyleException {
+        // This is a hack until https://github.com/checkstyle/checkstyle/issues/13845
+        final Map<String, String> moduleMappings = new HashMap<>();
+        moduleMappings.put("ParameterNumber",
+                "com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck");
+        moduleMappings.put("SuppressWarningsHolder",
+                "com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder");
+        moduleMappings.put("SuppressWarningsFilter",
+                "com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter");
+        moduleMappings.put("MemberName",
+                "com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck");
+        moduleMappings.put("ConstantName",
+                "com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck");
+        moduleMappings.put("NoWhitespaceAfter",
+                "com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck");
+        moduleMappings.put("SummaryJavadoc",
+                "com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck");
+        moduleMappings.put("LineLength",
+                "com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck");
+
         String fullyQualifiedClassName;
-        if (moduleName.startsWith("com.")) {
+        if (moduleMappings.containsKey(moduleName)) {
+            fullyQualifiedClassName = moduleMappings.get(moduleName);
+        }
+        else if (moduleName.startsWith("com.")) {
             fullyQualifiedClassName = moduleName;
         }
         else {
-            final String path = SLASH_PATTERN.matcher(filePath).replaceAll("\\.");
+            final String path = SLASH_PATTERN.matcher(filePath).replaceAll(".");
             final int endIndex = path.lastIndexOf(moduleName.toLowerCase(Locale.ROOT));
             if (endIndex == -1) {
                 throw new CheckstyleException("Unable to resolve module name: " + moduleName
@@ -424,7 +522,6 @@ private static void setViolations(TestInputConfiguration.Builder inputConfigBuil
             throws ClassNotFoundException, CheckstyleException {
         final List<ModuleInputConfiguration> moduleLists = inputConfigBuilder.getChildrenModules();
         final boolean specifyViolationMessage = moduleLists.size() == 1
-                && !SUPPRESSED_CHECKS.contains(moduleLists.get(0).getModuleName())
                 && !PERMANENT_SUPPRESSED_CHECKS.contains(moduleLists.get(0).getModuleName())
                 && getNumberOfMessages(moduleLists.get(0).getModuleName()) > 1;
         for (int lineNo = 0; lineNo < lines.size(); lineNo++) {
@@ -474,6 +571,10 @@ private static void setViolations(TestInputConfiguration.Builder inputConfigBuil
                 VIOLATION_SOME_LINES_ABOVE_PATTERN.matcher(lines.get(lineNo));
         final Matcher violationSomeLinesBelowMatcher =
                 VIOLATION_SOME_LINES_BELOW_PATTERN.matcher(lines.get(lineNo));
+        final Matcher violationsAboveMatcherWithMessages =
+                VIOLATIONS_ABOVE_PATTERN_WITH_MESSAGES.matcher(lines.get(lineNo));
+        final Matcher violationsSomeLinesAboveMatcher =
+                VIOLATIONS_SOME_LINES_ABOVE_PATTERN.matcher(lines.get(lineNo));
         if (violationMatcher.matches()) {
             final String violationMessage = violationMatcher.group(1);
             final int violationLineNum = lineNo + 1;
@@ -528,6 +629,16 @@ else if (violationSomeLinesBelowMatcher.matches()) {
                     violationLineNum);
             inputConfigBuilder.addViolation(violationLineNum, violationMessage);
         }
+        else if (violationsAboveMatcherWithMessages.matches()) {
+            inputConfigBuilder.addViolations(
+                getExpectedViolationsForSpecificLineAbove(
+                    lines, lineNo, lineNo, violationsAboveMatcherWithMessages));
+        }
+        else if (violationsSomeLinesAboveMatcher.matches()) {
+            inputConfigBuilder.addViolations(
+                getExpectedViolations(
+                    lines, lineNo, violationsSomeLinesAboveMatcher));
+        }
         else if (multipleViolationsMatcher.matches()) {
             Collections
                     .nCopies(Integer.parseInt(multipleViolationsMatcher.group(1)), lineNo + 1)
@@ -556,6 +667,40 @@ else if (useFilteredViolations) {
         }
     }
 
+    private static List<TestInputViolation> getExpectedViolationsForSpecificLineAbove(
+                                              List<String> lines, int lineNo, int violationLineNum,
+                                              Matcher matcher) {
+        final List<TestInputViolation> results = new ArrayList<>();
+
+        final int expectedMessageCount =
+            Integer.parseInt(matcher.group(1));
+        for (int index = 1; index <= expectedMessageCount; index++) {
+            final String lineWithMessage = lines.get(lineNo + index);
+            final Matcher messageMatcher = VIOLATION_MESSAGE_PATTERN.matcher(lineWithMessage);
+            if (messageMatcher.matches()) {
+                final String violationMessage = messageMatcher.group(1);
+                results.add(new TestInputViolation(violationLineNum, violationMessage));
+            }
+        }
+        if (results.size() != expectedMessageCount) {
+            final String message = String.format(Locale.ROOT,
+                "Declared amount of violation messages at line %s is %s but found %s",
+                lineNo + 1, expectedMessageCount, results.size());
+            throw new IllegalStateException(message);
+        }
+        return results;
+    }
+
+    private static List<TestInputViolation> getExpectedViolations(
+                                              List<String> lines, int lineNo,
+                                              Matcher matcher) {
+        final int linesAbove =
+            Integer.parseInt(matcher.group(2));
+        final int violationLineNum = lineNo - linesAbove + 1;
+        return getExpectedViolationsForSpecificLineAbove(lines,
+            lineNo, violationLineNum, matcher);
+    }
+
     private static void setFilteredViolation(TestInputConfiguration.Builder inputConfigBuilder,
                                              int lineNo, String line,
                                              boolean specifyViolationMessage)
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/ModuleInputConfiguration.java b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/ModuleInputConfiguration.java
index 72b3c1b2b46..6cecf05a9b5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/ModuleInputConfiguration.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/ModuleInputConfiguration.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputConfiguration.java b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputConfiguration.java
index 907731bb495..c1a10a65fb6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputConfiguration.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputConfiguration.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -30,6 +30,7 @@
 import com.puppycrawl.tools.checkstyle.Checker;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.TreeWalker;
+import com.puppycrawl.tools.checkstyle.api.Configuration;
 
 public final class TestInputConfiguration {
 
@@ -54,7 +55,10 @@ public final class TestInputConfiguration {
             "com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck",
             "com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck",
             "com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck",
-            "com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"
+            "com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck",
+            "com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheckTest$ViolationFileSetCheck",
+            "com.puppycrawl.tools.checkstyle.api.FileSetCheckTest$TestFileSetCheck",
+            "com.puppycrawl.tools.checkstyle.CheckerTest$VerifyPositionAfterTabFileSet"
     ));
 
     private final List<ModuleInputConfiguration> childrenModules;
@@ -63,12 +67,24 @@ public final class TestInputConfiguration {
 
     private final List<TestInputViolation> filteredViolations;
 
+    private final Configuration xmlConfiguration;
+
     private TestInputConfiguration(List<ModuleInputConfiguration> childrenModules,
                                    List<TestInputViolation> violations,
                                    List<TestInputViolation> filteredViolations) {
         this.childrenModules = childrenModules;
         this.violations = violations;
         this.filteredViolations = filteredViolations;
+        xmlConfiguration = null;
+    }
+
+    private TestInputConfiguration(List<TestInputViolation> violations,
+                                   List<TestInputViolation> filteredViolations,
+                                   Configuration xmlConfiguration) {
+        childrenModules = null;
+        this.violations = violations;
+        this.filteredViolations = filteredViolations;
+        this.xmlConfiguration = xmlConfiguration;
     }
 
     public List<ModuleInputConfiguration> getChildrenModules() {
@@ -86,6 +102,7 @@ public List<TestInputViolation> getFilteredViolations() {
     public DefaultConfiguration createConfiguration() {
         final DefaultConfiguration root = new DefaultConfiguration(ROOT_MODULE_NAME);
         root.addProperty("charset", StandardCharsets.UTF_8.name());
+
         final DefaultConfiguration treeWalker = createTreeWalker();
         childrenModules
                 .stream()
@@ -102,6 +119,10 @@ else if (!treeWalker.getName().equals(moduleConfig.getName())) {
         return root;
     }
 
+    public Configuration getXmlConfiguration() {
+        return xmlConfiguration;
+    }
+
     public DefaultConfiguration createConfigurationWithoutFilters() {
         final DefaultConfiguration root = new DefaultConfiguration(ROOT_MODULE_NAME);
         root.addProperty("charset", StandardCharsets.UTF_8.name());
@@ -141,6 +162,8 @@ public static final class Builder {
 
         private final List<TestInputViolation> filteredViolations = new ArrayList<>();
 
+        private Configuration xmlConfiguration;
+
         public void addChildModule(ModuleInputConfiguration childModule) {
             childrenModules.add(childModule);
         }
@@ -149,10 +172,26 @@ public void addViolation(int violationLine, String violationMessage) {
             violations.add(new TestInputViolation(violationLine, violationMessage));
         }
 
+        public void addViolations(List<TestInputViolation> inputViolations) {
+            violations.addAll(inputViolations);
+        }
+
         public void addFilteredViolation(int violationLine, String violationMessage) {
             filteredViolations.add(new TestInputViolation(violationLine, violationMessage));
         }
 
+        public void setXmlConfiguration(Configuration xmlConfiguration) {
+            this.xmlConfiguration = xmlConfiguration;
+        }
+
+        public TestInputConfiguration buildWithXmlConfiguration() {
+            return new TestInputConfiguration(
+                    violations,
+                    filteredViolations,
+                    xmlConfiguration
+            );
+        }
+
         public TestInputConfiguration build() {
             return new TestInputConfiguration(
                     childrenModules,
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputViolation.java b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputViolation.java
index 36bcc884c1b..0c608f75332 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputViolation.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/TestInputViolation.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckTest.java
index a820059325b..f4d154afe0b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
index 4bb9154873a..d9b865befdc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
index 50fa7aa138b..7e42aa64838 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckTest.java
index b34bb4b9855..5089e977b98 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java
index da43e13d2d1..8d00f9af6a3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckTest.java
index 90e732f3c8f..fc394d07cc8 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckTest.java
index a0a8df4b72b..14da3a584c7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
index 22aa084681d..9ba3b73a253 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java
index 5c82fd1d462..c383d65b969 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -421,8 +421,8 @@ public void testClearState() throws Exception {
                 .that(annotationDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, annotationDef.get(),
-                        "ENTRIES",
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        annotationDef.orElseThrow(), "ENTRIES",
                         entries -> ((ThreadLocal<List<Object>>) entries).get().isEmpty()))
                 .isTrue();
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java
index 289e7198745..01c5c07623e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java
index c47b3e11061..51b5193d744 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java
index 202d12e4b06..0477feffc08 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java
index 36802650cf0..dfd13fec287 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java
index 8dc3f3b2a7d..72efa6042d2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java
index 15af44385aa..76fc0f944b3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java
index 87ac6425bdc..834c454722a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -54,7 +54,7 @@ public void testCorrect() throws Exception {
     }
 
     @Test
-    public void testIncorrect() throws Exception {
+    public void testIncorrectOne() throws Exception {
         final String[] expected = {
             "15:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn"),
             "20:15: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"),
@@ -79,14 +79,22 @@ public void testIncorrect() throws Exception {
             "94:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_21", 11, 8),
             "97:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_21", 10, 8),
             "99:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"),
-            "106:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_21", 0, 3),
         };
         verifyWithInlineConfigParser(
-                getPath("InputAnnotationLocationIncorrect.java"), expected);
+                getPath("InputAnnotationLocationIncorrectOne.java"), expected);
     }
 
     @Test
-    public void testIncorrectAllTokens() throws Exception {
+    public void testIncorrectTwo() throws Exception {
+        final String[] expected = {
+            "17:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_21", 0, 3),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputAnnotationLocationIncorrectTwo.java"), expected);
+    }
+
+    @Test
+    public void testIncorrectAllTokensOne() throws Exception {
         final String[] expected = {
             "15:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn3"),
             "20:15: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"),
@@ -111,10 +119,18 @@ public void testIncorrectAllTokens() throws Exception {
             "95:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 11, 8),
             "98:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 10, 8),
             "101:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"),
-            "108:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 0, 3),
         };
         verifyWithInlineConfigParser(
-                getPath("InputAnnotationLocationIncorrect3.java"), expected);
+                getPath("InputAnnotationLocationIncorrect3One.java"), expected);
+    }
+
+    @Test
+    public void testIncorrectAllTokensTwo() throws Exception {
+        final String[] expected = {
+            "17:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 0, 3),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputAnnotationLocationIncorrect3Two.java"), expected);
     }
 
     @Test
@@ -148,7 +164,7 @@ public void testWithoutAnnotations() throws Exception {
     }
 
     @Test
-    public void testWithParameters() throws Exception {
+    public void testWithParametersOne() throws Exception {
         final String[] expected = {
             "25:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_12", 8, 4),
             "33:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_12", 8, 4),
@@ -162,10 +178,18 @@ public void testWithParameters() throws Exception {
             "78:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 7, 4),
             "93:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 11, 8),
             "96:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 10, 8),
-            "106:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 0, 3),
         };
         verifyWithInlineConfigParser(
-                getPath("InputAnnotationLocationIncorrect2.java"), expected);
+                getPath("InputAnnotationLocationIncorrect2One.java"), expected);
+    }
+
+    @Test
+    public void testWithParametersTwo() throws Exception {
+        final String[] expected = {
+            "17:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 0, 3),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputAnnotationLocationIncorrect2Two.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckTest.java
index 519eb471fec..ce4d5a7366a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -73,7 +73,7 @@ public void testGetAcceptableTokens() {
     }
 
     @Test
-    public void testCheck() throws Exception {
+    public void testAnnotationOnSameLineCheckPublicMethodAndVariable() throws Exception {
         final String[] expected = {
             "17:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Annotation"),
             "18:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Annotation"),
@@ -81,11 +81,11 @@ public void testCheck() throws Exception {
             "24:18: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Annotation"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputAnnotationOnSameLineCheck.java"), expected);
+                getPath("InputAnnotationOnSameLineCheckPublicMethodAndVariable.java"), expected);
     }
 
     @Test
-    public void testCheckAcceptableTokens() throws Exception {
+    public void testAnnotationOnSameLineCheckTokensOnMethodAndVar() throws Exception {
         final String[] expected = {
             "18:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Annotation3"),
             "19:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Annotation"),
@@ -93,11 +93,11 @@ public void testCheckAcceptableTokens() throws Exception {
             "25:18: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Annotation3"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputAnnotationOnSameLineCheck3.java"), expected);
+                getPath("InputAnnotationOnSameLineCheckTokensOnMethodAndVar.java"), expected);
     }
 
     @Test
-    public void testCheck2() throws Exception {
+    public void testAnnotationOnSameLineCheckPrivateAndDeprecatedVar() throws Exception {
         final String[] expected = {
             "19:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
             "24:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "SuppressWarnings"),
@@ -105,16 +105,16 @@ public void testCheck2() throws Exception {
             "28:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputAnnotationOnSameLineCheck2.java"), expected);
+                getPath("InputAnnotationOnSameLineCheckPrivateAndDeprecatedVar.java"), expected);
     }
 
     @Test
-    public void testCheckOnDifferentTokens() throws Exception {
+    public void testAnnotationOnSameLineCheckInterfaceAndEnum() throws Exception {
         final String[] expected = {
             "14:1: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
             "17:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
             "21:8: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
-            "22:72: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
+            "22:71: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
             "25:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
             "26:35: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
             "29:18: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
@@ -129,7 +129,7 @@ public void testCheckOnDifferentTokens() throws Exception {
             "62:5: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Ann"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputAnnotationOnSameLineCheckOnDifferentTokens.java"), expected);
+                getPath("InputAnnotationOnSameLineCheckInterfaceAndEnum.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckTest.java
index 630786d14f5..ba080fff8fa 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckTest.java
index 4559d2824ba..d4937a74861 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java
index d060424b618..b5a103ce730 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckTest.java
index 17eb8b3405b..69e0796693a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java
index 6476ea5e65c..2a1ed592b88 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java
index dbba3d8b49d..ea4d89e84fb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java
index e3b6456b2a8..ddb43217614 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java
index b8c1ea05618..ee9990d13e4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckTest.java
index 426b1350826..6d338e74378 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
index 9e586372a17..1470f8d113b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java
index 43cad029ee6..c36dd59babb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -306,6 +306,13 @@ public void testAloneOrSingleLine() throws Exception {
                 getPath("InputRightCurlyTestAloneOrSingleline.java"), expected);
     }
 
+    @Test
+    public void testAloneOrSingleLineTryCatchBlock() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputRightCurlyTestAloneOrSinglelineTryCatchBlock.java"), expected);
+    }
+
     @Test
     public void testCatchWithoutFinally() throws Exception {
         final String[] expected = {
@@ -387,9 +394,8 @@ public void testTryWithResourceAlone() throws Exception {
     public void testTryWithResourceAloneSingle() throws Exception {
         final String[] expected = {
             "27:9: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 9),
-            "36:64: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 64),
-            "44:15: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 15),
-            "46:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "43:15: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 15),
+            "45:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
         };
         verifyWithInlineConfigParser(
                 getPath("InputRightCurlyTryWithResourceAloneSingle.java"), expected);
@@ -821,4 +827,158 @@ public void testSwitchExpression7() throws Exception {
         verifyWithInlineConfigParser(
                 getNonCompilablePath("InputRightCurlyTestSwitchExpression7.java"), expected);
     }
+
+    @Test
+    public void testCaseBlocksInSwitchStatementAlone() throws Exception {
+        final String[] expected = {
+            "33:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "44:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "73:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "78:44: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 44),
+            "90:39: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 39),
+            "97:42: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 42),
+            "107:35: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 35),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputRightCurlyCaseBlocksInSwitchStatementAlone.java"), expected);
+    }
+
+    @Test
+    public void testCaseBlocksInSwitchStatementAlone2() throws Exception {
+        final String[] expected = {
+            "17:15: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 15),
+            "26:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "38:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "41:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "49:24: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 24),
+            "49:45: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 45),
+            "57:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "68:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "68:26: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 26),
+            "75:34: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 34),
+            "75:47: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 47),
+            "82:23: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 23),
+            "102:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputRightCurlyCaseBlocksInSwitchStatementAlone2.java"), expected);
+    }
+
+    @Test
+    public void testCaseBlocksInSwitchStatementAloneOrSingleLine() throws Exception {
+        final String[] expected = {
+            "33:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "44:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "73:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "78:51: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 51),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline.java"),
+                expected);
+    }
+
+    @Test
+    public void testCaseBlocksInSwitchStatementAloneOrSingle2() throws Exception {
+        final String[] expected = {
+            "18:15: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 15),
+            "27:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "39:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "42:15: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 15),
+            "50:23: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 23),
+            "71:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "80:23: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 23),
+            "100:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline2.java"),
+                expected);
+    }
+
+    @Test
+    public void testCaseBlocksInSwitchStatementSame() throws Exception {
+        final String[] expected = {
+            "33:16: " + getCheckMessage(MSG_KEY_LINE_BREAK_BEFORE, "}", 16),
+            "44:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "73:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "78:51: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 51),
+            "106:23: " + getCheckMessage(MSG_KEY_LINE_BREAK_BEFORE, "}", 23),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputRightCurlyCaseBlocksInSwitchStatementSame.java"), expected);
+    }
+
+    @Test
+    public void testCaseBlocksInSwitchStatementSame2() throws Exception {
+        final String[] expected = {
+            "18:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "27:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "39:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "42:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "50:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "70:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "77:34: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 34),
+            "77:47: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 47),
+            "85:23: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 23),
+            "103:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputRightCurlyCaseBlocksInSwitchStatementSame2.java"), expected);
+    }
+
+    @Test
+    public void testCaseBlocksWithSwitchRuleAlone() throws Exception {
+        final String[] expected = {
+            "32:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "44:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "45:27: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 27),
+            "56:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "69:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "74:46: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 46),
+            "83:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "83:36: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 36),
+            "93:31: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 31),
+            "94:31: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 31),
+        };
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputRightCurlyCaseBlocksWithSwitchRuleAlone.java"),
+                expected);
+    }
+
+    @Test
+    public void testCaseBlocksWithSwitchRuleAloneOrSingleLine() throws Exception {
+
+        final String[] expected = {
+            "27:19: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 19),
+            "41:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "53:23: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 23),
+            "54:27: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 27),
+            "64:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "77:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "82:46: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 46),
+            "91:13: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 13),
+            "102:31: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 31),
+        };
+        final String fileName = "InputRightCurlyCaseBlocksWithSwitchRuleAloneOrSingleline.java";
+        verifyWithInlineConfigParser(getNonCompilablePath(fileName), expected);
+    }
+
+    @Test
+    public void testCaseBlocksWithSwitchExpressionAlone() throws Exception {
+        final String[] expected = {
+            "63:31: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 31),
+            "86:42: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 42),
+        };
+        final String fileName = "InputRightCurlyCaseBlocksWithSwitchExpressionAlone.java";
+        verifyWithInlineConfigParser(getNonCompilablePath(fileName), expected);
+    }
+
+    @Test
+    public void testCaseBlocksWithSwitchExpressionAloneOrSingleLine() throws Exception {
+        final String[] expected = {
+            "63:31: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 31),
+        };
+        final String fileName =
+                "InputRightCurlyCaseBlocksWithSwitchExpressionAloneOrSingleline.java";
+        verifyWithInlineConfigParser(getNonCompilablePath(fileName), expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java
index aeefc25ed31..f79a6e1d18f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckTest.java
index e950fba4cc6..c7fecaa3be0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckTest.java
index 684b6071c89..e3be547bd53 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckTest.java
index 69ae7cafb62..5b6420ea348 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheckTest.java
new file mode 100644
index 00000000000..09c073e125f
--- /dev/null
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ConstructorsDeclarationGroupingCheckTest.java
@@ -0,0 +1,84 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.checks.coding;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+import static com.puppycrawl.tools.checkstyle.checks.coding.ConstructorsDeclarationGroupingCheck.MSG_KEY;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
+
+public class ConstructorsDeclarationGroupingCheckTest extends AbstractModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping";
+    }
+
+    @Test
+    public void testDefault() throws Exception {
+        final String[] expected = {
+            "23:5: " + getCheckMessage(MSG_KEY, 19),
+            "28:5: " + getCheckMessage(MSG_KEY, 19),
+            "45:9: " + getCheckMessage(MSG_KEY, 39),
+            "55:13: " + getCheckMessage(MSG_KEY, 49),
+            "59:9: " + getCheckMessage(MSG_KEY, 39),
+            "63:5: " + getCheckMessage(MSG_KEY, 19),
+            "66:5: " + getCheckMessage(MSG_KEY, 19),
+            "85:7: " + getCheckMessage(MSG_KEY, 81),
+            "90:7: " + getCheckMessage(MSG_KEY, 81),
+            "93:7: " + getCheckMessage(MSG_KEY, 81),
+            "97:5: " + getCheckMessage(MSG_KEY, 19),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputConstructorsDeclarationGrouping.java"), expected);
+    }
+
+    @Test
+    public void testConstructorsDeclarationGroupingRecords() throws Exception {
+
+        final String[] expected = {
+            "20:9: " + getCheckMessage(MSG_KEY, 12),
+            "23:9: " + getCheckMessage(MSG_KEY, 12),
+            "28:9: " + getCheckMessage(MSG_KEY, 12),
+            "45:9: " + getCheckMessage(MSG_KEY, 39),
+        };
+
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputConstructorsDeclarationGroupingRecords.java"),
+                expected);
+    }
+
+    @Test
+    public void testTokensNotNull() {
+        final ConstructorsDeclarationGroupingCheck check =
+                new ConstructorsDeclarationGroupingCheck();
+        assertWithMessage("Acceptable tokens should not be null")
+                .that(check.getAcceptableTokens())
+                .isNotNull();
+        assertWithMessage("Default tokens should not be null")
+                .that(check.getDefaultTokens())
+                .isNotNull();
+        assertWithMessage("Required tokens should not be null")
+                .that(check.getRequiredTokens())
+                .isNotNull();
+    }
+
+}
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckTest.java
index 68ec5c921e1..347aea65595 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckTest.java
index f6a4f1140a7..a50ef7a0223 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckTest.java
index 309edb9b56f..e0c92f16570 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckTest.java
index be133830a20..69d80a9be9c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java
index fc3d5d1321c..7cc17ee9531 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java
index a6f308af22f..d550218b981 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckTest.java
index 53b150606a5..ede6735cf6c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckTest.java
index 51423c013c0..85cde1500c3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -48,7 +48,7 @@ public void testDefault() throws Exception {
             "187:11: " + getCheckMessage(MSG_FALL_THROUGH),
             "377:11: " + getCheckMessage(MSG_FALL_THROUGH),
             "380:11: " + getCheckMessage(MSG_FALL_THROUGH),
-            "382:40: " + getCheckMessage(MSG_FALL_THROUGH),
+            "382:27: " + getCheckMessage(MSG_FALL_THROUGH),
             "424:13: " + getCheckMessage(MSG_FALL_THROUGH),
             "432:9: " + getCheckMessage(MSG_FALL_THROUGH),
             "444:9: " + getCheckMessage(MSG_FALL_THROUGH),
@@ -124,8 +124,6 @@ public void testLastCaseGroup() throws Exception {
             "432:9: " + getCheckMessage(MSG_FALL_THROUGH),
             "444:9: " + getCheckMessage(MSG_FALL_THROUGH),
             "454:9: " + getCheckMessage(MSG_FALL_THROUGH),
-            // line 490 violation expected till https://github.com/checkstyle/checkstyle/pull/12966
-            "490:9: " + getCheckMessage(MSG_FALL_THROUGH),
             "491:9: " + getCheckMessage(MSG_FALL_THROUGH),
             "492:9: " + getCheckMessage(MSG_FALL_THROUGH),
         };
@@ -254,6 +252,7 @@ public void testLastCase() throws Exception {
         final String[] expected = {
             "48:11: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
             "83:11: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
+            "112:11: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
         };
         verifyWithInlineConfigParser(
                 getPath("InputFallThrough4.java"),
@@ -273,13 +272,8 @@ public void testIfElse() throws Exception {
     @Test
     public void testFallThrough() throws Exception {
         final String[] expected = {
-            "16:13: " + getCheckMessage(MSG_FALL_THROUGH),
-            "18:13: " + getCheckMessage(MSG_FALL_THROUGH),
             "23:13: " + getCheckMessage(MSG_FALL_THROUGH),
-            "25:13: " + getCheckMessage(MSG_FALL_THROUGH),
             "27:13: " + getCheckMessage(MSG_FALL_THROUGH),
-            // line 37 needs consideration https://github.com/checkstyle/checkstyle/pull/12966
-            "37:10: " + getCheckMessage(MSG_FALL_THROUGH),
             "52:13: " + getCheckMessage(MSG_FALL_THROUGH),
             "65:13: " + getCheckMessage(MSG_FALL_THROUGH),
             "80:13: " + getCheckMessage(MSG_FALL_THROUGH),
@@ -337,7 +331,11 @@ public void testFallThrough7() throws Exception {
     public void testLastLine() throws Exception {
         final String[] expected = {
             "21:13: " + getCheckMessage(MSG_FALL_THROUGH),
+            // until https://github.com/checkstyle/checkstyle/issues/13553
+            "33:13: " + getCheckMessage(MSG_FALL_THROUGH),
             "99:39: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
+            // until https://github.com/checkstyle/checkstyle/issues/13553
+            "107:11: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
         };
         verifyWithInlineConfigParser(
                 getPath("InputFallThroughLastLineCommentCheck.java"),
@@ -349,10 +347,48 @@ public void testLastLine2() throws Exception {
         final String[] expected = {
             "19:13: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
             "22:13: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
-            "25:13: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
         };
         verifyWithInlineConfigParser(
                 getNonCompilablePath("InputFallThrough5.java"),
                 expected);
     }
+
+    @Test
+    public void testReliefCommentBetweenMultipleComment() throws Exception {
+        final String[] expected = {
+            // until https://github.com/checkstyle/checkstyle/issues/13553
+            "25:17: " + getCheckMessage(MSG_FALL_THROUGH),
+            // until https://github.com/checkstyle/checkstyle/issues/13553
+            "34:13: " + getCheckMessage(MSG_FALL_THROUGH_LAST),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFallThrough8.java"),
+                expected);
+    }
+
+    @Test
+    public void testLabeledBreak() throws Exception {
+        final String[] expected = {
+            "51:17: " + getCheckMessage(MSG_FALL_THROUGH),
+            "55:17: " + getCheckMessage(MSG_FALL_THROUGH),
+            "69:17: " + getCheckMessage(MSG_FALL_THROUGH),
+            "78:17: " + getCheckMessage(MSG_FALL_THROUGH),
+            "88:17: " + getCheckMessage(MSG_FALL_THROUGH),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFallThroughLabeledBreak.java"),
+                expected);
+
+    }
+
+    @Test
+    public void testSwitchLabeledRules() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputFallThroughSwitchRules.java"),
+                expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
index 69dd791e98f..6822b7f47ce 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,7 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testDefault() throws Exception {
+    public void testInputFinalLocalVariableOne() throws Exception {
 
         final String[] expected = {
             "17:13: " + getCheckMessage(MSG_KEY, "i"),
@@ -56,32 +56,64 @@ public void testDefault() throws Exception {
             "74:16: " + getCheckMessage(MSG_KEY, "x"),
             "82:21: " + getCheckMessage(MSG_KEY, "w"),
             "83:26: " + getCheckMessage(MSG_KEY, "runnable"),
-            "104:17: " + getCheckMessage(MSG_KEY, "weird"),
-            "105:17: " + getCheckMessage(MSG_KEY, "j"),
-            "106:17: " + getCheckMessage(MSG_KEY, "k"),
-            "193:13: " + getCheckMessage(MSG_KEY, "x"),
-            "198:17: " + getCheckMessage(MSG_KEY, "x"),
-            "218:17: " + getCheckMessage(MSG_KEY, "n"),
-            "224:13: " + getCheckMessage(MSG_KEY, "q"),
-            "225:13: " + getCheckMessage(MSG_KEY, "w"),
-            "234:21: " + getCheckMessage(MSG_KEY, "w"),
-            "235:21: " + getCheckMessage(MSG_KEY, "e"),
-            "255:17: " + getCheckMessage(MSG_KEY, "n"),
-            "267:17: " + getCheckMessage(MSG_KEY, "t"),
-            "277:21: " + getCheckMessage(MSG_KEY, "foo"),
-            "296:13: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "308:13: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "352:13: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "365:13: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "368:21: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "383:13: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "394:13: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "426:13: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "429:21: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
-            "449:33: " + getCheckMessage(MSG_KEY, "table"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputFinalLocalVariable.java"), expected);
+                getPath("InputFinalLocalVariableOne.java"), expected);
+    }
+
+    @Test
+    public void testInputFinalLocalVariableTwo() throws Exception {
+        final String[] expected = {
+            "24:17: " + getCheckMessage(MSG_KEY, "weird"),
+            "25:17: " + getCheckMessage(MSG_KEY, "j"),
+            "26:17: " + getCheckMessage(MSG_KEY, "k"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariableTwo.java"), expected);
+    }
+
+    @Test
+    public void testInputFinalLocalVariableThree() throws Exception {
+        final String[] expected = {
+            "14:17: " + getCheckMessage(MSG_KEY, "x"),
+            "20:21: " + getCheckMessage(MSG_KEY, "x"),
+            "41:21: " + getCheckMessage(MSG_KEY, "n"),
+            "47:17: " + getCheckMessage(MSG_KEY, "q"),
+            "48:17: " + getCheckMessage(MSG_KEY, "w"),
+            "57:25: " + getCheckMessage(MSG_KEY, "w"),
+            "58:25: " + getCheckMessage(MSG_KEY, "e"),
+            "79:21: " + getCheckMessage(MSG_KEY, "n"),
+            "92:21: " + getCheckMessage(MSG_KEY, "t"),
+            "102:25: " + getCheckMessage(MSG_KEY, "foo"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariableThree.java"), expected);
+    }
+
+    @Test
+    public void testInputFinalLocalVariableFour() throws Exception {
+        final String[] expected = {
+            "16:17: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "28:17: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "72:17: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "85:17: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "88:25: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariableFour.java"), expected);
+    }
+
+    @Test
+    public void testFinalLocalVariableFive() throws Exception {
+        final String[] expected = {
+            "15:17: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "26:17: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "58:17: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "61:25: " + getCheckMessage(MSG_KEY, "shouldBeFinal"),
+            "81:41: " + getCheckMessage(MSG_KEY, "table"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariableFive.java"), expected);
     }
 
     @Test
@@ -94,15 +126,54 @@ public void testRecordsInput() throws Exception {
     }
 
     @Test
-    public void testParameter() throws Exception {
+    public void testInputFinalLocalVariable2One() throws Exception {
 
         final String[] expected = {
-            "53:28: " + getCheckMessage(MSG_KEY, "aArg"),
-            "157:36: " + getCheckMessage(MSG_KEY, "_o"),
-            "162:37: " + getCheckMessage(MSG_KEY, "_o1"),
+            "52:28: " + getCheckMessage(MSG_KEY, "aArg"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariable2One.java"), expected);
+    }
+
+    @Test
+    public void testInputFinalLocalVariable2Two() throws Exception {
+
+        final String[] excepted = {
+            "78:36: " + getCheckMessage(MSG_KEY, "_o"),
+            "83:37: " + getCheckMessage(MSG_KEY, "_o1"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariable2Two.java"), excepted);
+    }
+
+    @Test
+    public void testInputFinalLocalVariable2Three() throws Exception {
+
+        final String[] excepted = {
+
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariable2Three.java"), excepted);
+    }
+
+    @Test
+    public void testInputFinalLocalVariable2Four() throws Exception {
+
+        final String[] excepted = {
+
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputFinalLocalVariable2Four.java"), excepted);
+    }
+
+    @Test
+    public void testInputFinalLocalVariable2Five() throws Exception {
+
+        final String[] excepted = {
+
         };
         verifyWithInlineConfigParser(
-                getPath("InputFinalLocalVariable2.java"), expected);
+                getPath("InputFinalLocalVariable2Five.java"), excepted);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java
index d7c325ae7b8..8a1b5a29184 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -470,6 +470,30 @@ public void testClassNestedInRecord() throws Exception {
             expected);
     }
 
+    @Test
+    public void testHiddenFieldInnerRecordsImplicitlyStatic() throws Exception {
+
+        final String[] expected = {
+            "35:30: " + getCheckMessage(MSG_KEY, "pointer"),
+        };
+
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputHiddenFieldInnerRecordsImplicitlyStatic.java"),
+                expected);
+    }
+
+    @Test
+    public void testHiddenFieldRecordsImplicitlyStaticClassComparison() throws Exception {
+
+        final String[] expected = {
+            "49:27: " + getCheckMessage(MSG_KEY, "x"),
+        };
+
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputHiddenFieldRecordsImplicitlyStaticClassComparison.java"),
+                expected);
+    }
+
     /**
      * We cannot reproduce situation when visitToken is called and leaveToken is not.
      * So, we have to use reflection to be sure that even in such situation
@@ -490,8 +514,8 @@ public void testClearState() throws Exception {
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
                 .that(
-                    TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.get(), "frame",
-                        new CheckIfStatefulFieldCleared()))
+                    TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.orElseThrow(),
+                        "frame", new CheckIfStatefulFieldCleared()))
                 .isTrue();
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java
index cd7f334d87e..91497438fcd 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,7 +34,7 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testDefault() throws Exception {
+    public void testIllegalCatchCheckDefaultTokens() throws Exception {
 
         final String[] expected = {
             "14:11: " + getCheckMessage(MSG_KEY, "RuntimeException"),
@@ -46,11 +46,11 @@ public void testDefault() throws Exception {
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputIllegalCatch.java"), expected);
+                getPath("InputIllegalCatchCheckDefaultTokens.java"), expected);
     }
 
     @Test
-    public void testIllegalClassNames() throws Exception {
+    public void testIllegalCatchCheckSuperclassThrowable() throws Exception {
         final String[] expected = {
             "14:11: " + getCheckMessage(MSG_KEY, "Exception"),
             "15:11: " + getCheckMessage(MSG_KEY, "Throwable"),
@@ -59,11 +59,11 @@ public void testIllegalClassNames() throws Exception {
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputIllegalCatch3.java"), expected);
+                getPath("InputIllegalCatchCheckSuperclassThrowable.java"), expected);
     }
 
     @Test
-    public void testIllegalClassNamesBad() throws Exception {
+    public void testIllegalCatchCheckSuperclassException() throws Exception {
         // check that incorrect names don't break the Check
         final String[] expected = {
             "15:11: " + getCheckMessage(MSG_KEY, "Exception"),
@@ -71,11 +71,11 @@ public void testIllegalClassNamesBad() throws Exception {
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputIllegalCatch4.java"), expected);
+                getPath("InputIllegalCatchCheckSuperclassException.java"), expected);
     }
 
     @Test
-    public void testMultipleTypes() throws Exception {
+    public void testIllegalCatchCheckMultipleExceptions() throws Exception {
         final String[] expected = {
             "15:11: " + getCheckMessage(MSG_KEY, "RuntimeException"),
             "15:11: " + getCheckMessage(MSG_KEY, "SQLException"),
@@ -91,7 +91,7 @@ public void testMultipleTypes() throws Exception {
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputIllegalCatch2.java"), expected);
+                getPath("InputIllegalCatchCheckMultipleExceptions.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java
index cdfae53155b..0684d367302 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -181,9 +181,8 @@ public void testClearStateClassNames() throws Exception {
                 .that(classDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-            .that(
-                TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.get(), "classNames",
-                    classNames -> ((Collection<String>) classNames).isEmpty()))
+            .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.orElseThrow(),
+                    "classNames", classNames -> ((Collection<String>) classNames).isEmpty()))
             .isTrue();
     }
 
@@ -207,9 +206,8 @@ public void testClearStateImports() throws Exception {
                 .that(importDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-            .that(
-                TestUtil.isStatefulFieldClearedDuringBeginTree(check, importDef.get(), "imports",
-                    imports -> ((Collection<?>) imports).isEmpty()))
+            .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, importDef.orElseThrow(),
+                    "imports", imports -> ((Collection<?>) imports).isEmpty()))
             .isTrue();
     }
 
@@ -234,8 +232,8 @@ public void testClearStateInstantiations() throws Exception {
                 .that(literalNew.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, literalNew.get(),
-                        "instantiations",
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        literalNew.orElseThrow(), "instantiations",
                         instantiations -> ((Collection<DetailAST>) instantiations).isEmpty()))
                 .isTrue();
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java
index 1e401db7b14..973957238c2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
index e24b50c37a9..9d626ec0425 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,18 +38,18 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testCheckWithDefaultSettings()
+    public void testIllegalTokensCheckDefaultTokenLabel()
             throws Exception {
         final String[] expected = {
             "36:14: " + getCheckMessage(MSG_KEY, "label:"),
             "38:25: " + getCheckMessage(MSG_KEY, "anotherLabel:"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokens.java"), expected);
+                getPath("InputIllegalTokensCheckDefaultTokenLabel.java"), expected);
     }
 
     @Test
-    public void testPreviouslyIllegalTokens()
+    public void testIllegalTokensCheckSwitchAndPostIncDec()
             throws Exception {
         final String[] expected = {
             "18:9: " + getCheckMessage(MSG_KEY, "switch"),
@@ -57,23 +57,23 @@ public void testPreviouslyIllegalTokens()
             "22:18: " + getCheckMessage(MSG_KEY, "++"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokens2.java"), expected);
+                getPath("InputIllegalTokensCheckSwitchAndPostIncDec.java"), expected);
     }
 
     @Test
-    public void testNative() throws Exception {
+    public void testIllegalTokensCheckTokenNative() throws Exception {
         final String[] expected = {
             "27:12: " + getCheckMessage(MSG_KEY, "native"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokens3.java"), expected);
+                getPath("InputIllegalTokensCheckTokenNative.java"), expected);
     }
 
     @Test
-    public void testCommentContentToken()
+    public void testIllegalTokensCheckCommentsContent()
             throws Exception {
 
-        final String path = getPath("InputIllegalTokens4.java");
+        final String path = getPath("InputIllegalTokensCheckCommentsContent.java");
         final String lineSeparator =
                 CheckUtil.getLineSeparatorForFile(path, StandardCharsets.UTF_8);
         final String[] expected = {
@@ -100,7 +100,7 @@ public void testCommentContentToken()
     }
 
     @Test
-    public void testBlockCommentBeginToken()
+    public void testIllegalTokensCheckBlockCommentBegin()
             throws Exception {
 
         final String[] expected = {
@@ -108,11 +108,11 @@ public void testBlockCommentBeginToken()
             "10:1: " + getCheckMessage(MSG_KEY, "/*"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokens5.java"), expected);
+                getPath("InputIllegalTokensCheckBlockCommentBegin.java"), expected);
     }
 
     @Test
-    public void testBlockCommentEndToken()
+    public void testIllegalTokensCheckBlockCommentEnd()
             throws Exception {
 
         final String[] expected = {
@@ -120,11 +120,11 @@ public void testBlockCommentEndToken()
             "12:2: " + getCheckMessage(MSG_KEY, "*/"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokens6.java"), expected);
+                getPath("InputIllegalTokensCheckBlockCommentEnd.java"), expected);
     }
 
     @Test
-    public void testSingleLineCommentToken()
+    public void testIllegalTokensCheckSingleLineComment()
             throws Exception {
 
         final String[] expected = {
@@ -132,7 +132,7 @@ public void testSingleLineCommentToken()
             "42:26: " + getCheckMessage(MSG_KEY, "//"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokens7.java"), expected);
+                getPath("InputIllegalTokensCheckSingleLineComment.java"), expected);
     }
 
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
index b35d448832e..7485d5315ed 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,6 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenTextCheck.MSG_KEY;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -43,46 +42,46 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testCaseSensitive()
+    public void testIllegalTokenTextCheckDefaultCaseSensitive()
             throws Exception {
         final String[] expected = {
             "34:28: " + getCheckMessage(MSG_KEY, "a href"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokenTextTokens.java"), expected);
+                getPath("InputIllegalTokenTextCheckDefaultCaseSensitive.java"), expected);
     }
 
     @Test
-    public void testCaseInSensitive()
+    public void testIllegalTokenTextCheckCaseInSensitive()
             throws Exception {
         final String[] expected = {
             "34:28: " + getCheckMessage(MSG_KEY, "a href"),
             "35:32: " + getCheckMessage(MSG_KEY, "a href"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokenTextTokens2.java"), expected);
+                getPath("InputIllegalTokenTextCheckCaseInSensitive.java"), expected);
     }
 
     @Test
-    public void testCustomMessage()
+    public void testIllegalTokenTextCheckCustomMessageInStringLiteral()
             throws Exception {
 
         final String[] expected = {
             "34:28: " + "My custom message",
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokenTextTokens3.java"), expected);
+                getPath("InputIllegalTokenTextCheckCustomMessageInStringLiteral.java"), expected);
     }
 
     @Test
-    public void testNullCustomMessage()
+    public void testIllegalTokenTextCheckNullMessageInStringLiteral()
             throws Exception {
 
         final String[] expected = {
             "34:28: " + getCheckMessage(MSG_KEY, "a href"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokenTextTokens4.java"), expected);
+                getPath("InputIllegalTokenTextCheckNullMessageInStringLiteral.java"), expected);
     }
 
     @Test
@@ -133,7 +132,7 @@ public void testTokensNotNull() {
     }
 
     @Test
-    public void testCommentToken()
+    public void testIllegalTokenTextCheckCommentToken()
             throws Exception {
 
         final String[] expected = {
@@ -141,7 +140,25 @@ public void testCommentToken()
             "45:28: " + getCheckMessage(MSG_KEY, "a href"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputIllegalTokenTextTokens5.java"), expected);
+                getPath("InputIllegalTokenTextCheckCommentToken.java"), expected);
+    }
+
+    @Test
+    public void testStringTemplate()
+            throws Exception {
+
+        final String[] expected = {
+            "29:28: " + getCheckMessage(MSG_KEY, "x"),
+            "29:35: " + getCheckMessage(MSG_KEY, "x"),
+            "59:20: " + getCheckMessage(MSG_KEY, "x"),
+            "59:27: " + getCheckMessage(MSG_KEY, "x"),
+            "73:23: " + getCheckMessage(MSG_KEY, "x"),
+            "73:30: " + getCheckMessage(MSG_KEY, "x"),
+        };
+
+        verifyWithInlineConfigParser(
+                getNonCompilablePath(
+                        "InputIllegalTokenTextStringTemplate.java"), expected);
     }
 
     @Test
@@ -162,7 +179,7 @@ public void testOrderOfProperties() {
 
     @Test
     public void testAcceptableTokensMakeSense() {
-        final int expectedTokenTypesTotalNumber = 188;
+        final int expectedTokenTypesTotalNumber = 195;
         assertWithMessage("Total number of TokenTypes has changed, acceptable tokens in"
                 + " IllegalTokenTextCheck need to be reconsidered.")
             .that(TokenUtil.getTokenTypesTotalNumber())
@@ -170,7 +187,7 @@ public void testAcceptableTokensMakeSense() {
 
         final IllegalTokenTextCheck check = new IllegalTokenTextCheck();
         final int[] allowedTokens = check.getAcceptableTokens();
-        final List<Integer> tokenTypesWithMutableText = Arrays.asList(
+        final List<Integer> tokenTypesWithMutableText = List.of(
             TokenTypes.NUM_DOUBLE,
             TokenTypes.NUM_FLOAT,
             TokenTypes.NUM_INT,
@@ -179,7 +196,8 @@ public void testAcceptableTokensMakeSense() {
             TokenTypes.COMMENT_CONTENT,
             TokenTypes.STRING_LITERAL,
             TokenTypes.CHAR_LITERAL,
-            TokenTypes.TEXT_BLOCK_CONTENT
+            TokenTypes.TEXT_BLOCK_CONTENT,
+            TokenTypes.STRING_TEMPLATE_CONTENT
         );
         for (int tokenType : allowedTokens) {
             assertWithMessage(TokenUtil.getTokenName(tokenType) + " should not be allowed"
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
index cdb01e70362..4c8cdc82ab7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@
 
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.MSG_KEY;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 
@@ -236,7 +236,7 @@ public void testExtendsImplements() throws Exception {
     public void testStarImports() throws Exception {
 
         final String[] expected = {
-            "25:5: " + getCheckMessage(MSG_KEY, "List"),
+            "24:5: " + getCheckMessage(MSG_KEY, "List"),
         };
 
         verifyWithInlineConfigParser(
@@ -299,11 +299,11 @@ public void testClearDataBetweenFiles() throws Exception {
     @Test
     public void testIllegalTypeEnhancedInstanceof() throws Exception {
         final String[] expected = {
-            "28:9: " + getCheckMessage(MSG_KEY, "LinkedHashMap"),
-            "31:28: " + getCheckMessage(MSG_KEY, "LinkedHashMap"),
-            "35:35: " + getCheckMessage(MSG_KEY, "HashMap"),
-            "40:52: " + getCheckMessage(MSG_KEY, "TreeSet"),
-            "41:32: " + getCheckMessage(MSG_KEY, "TreeSet"),
+            "29:9: " + getCheckMessage(MSG_KEY, "LinkedHashMap"),
+            "32:28: " + getCheckMessage(MSG_KEY, "LinkedHashMap"),
+            "36:35: " + getCheckMessage(MSG_KEY, "HashMap"),
+            "41:52: " + getCheckMessage(MSG_KEY, "TreeSet"),
+            "43:28: " + getCheckMessage(MSG_KEY, "TreeSet"),
         };
 
         verifyWithInlineConfigParser(
@@ -439,7 +439,7 @@ public void testImproperLeaveToken() {
         final IllegalTypeCheck check = new IllegalTypeCheck();
         final DetailAstImpl enumAst = new DetailAstImpl();
         enumAst.setType(TokenTypes.ENUM_DEF);
-        final IllegalStateException exception = assertThrows(IllegalStateException.class,
+        final IllegalStateException exception = getExpectedThrowable(IllegalStateException.class,
                 () -> check.visitToken(enumAst), "IllegalStateException was expected");
 
         assertWithMessage("Message doesn't contain ast")
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java
index f33cc2527ef..e8c6a5f2153 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,25 +42,41 @@ public void testIt() throws Exception {
             "22:19: " + getCheckMessage(MSG_KEY),
             "24:39: " + getCheckMessage(MSG_KEY),
             "26:35: " + getCheckMessage(MSG_KEY),
-            "44:16: " + getCheckMessage(MSG_KEY),
-            "45:24: " + getCheckMessage(MSG_KEY),
-            "46:19: " + getCheckMessage(MSG_KEY),
-            "47:17: " + getCheckMessage(MSG_KEY),
-            "48:29: " + getCheckMessage(MSG_KEY),
-            "49:20: " + getCheckMessage(MSG_KEY),
-            "50:17: " + getCheckMessage(MSG_KEY),
-            "50:31: " + getCheckMessage(MSG_KEY),
-            "50:41: " + getCheckMessage(MSG_KEY),
-            "51:16: " + getCheckMessage(MSG_KEY),
-            "51:27: " + getCheckMessage(MSG_KEY),
-            "52:32: " + getCheckMessage(MSG_KEY),
-            "92:19: " + getCheckMessage(MSG_KEY),
-            "181:22: " + getCheckMessage(MSG_KEY),
+            "73:19: " + getCheckMessage(MSG_KEY),
         };
         verifyWithInlineConfigParser(
                 getPath("InputInnerAssignment.java"), expected);
     }
 
+    @Test
+    public void testMethod() throws Exception {
+        final String[] expected = {
+            "73:22: " + getCheckMessage(MSG_KEY),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputInnerAssignmentMethod.java"), expected);
+    }
+
+    @Test
+    public void testDemoBug1195047Comment3() throws Exception {
+        final String[] expected = {
+            "18:16: " + getCheckMessage(MSG_KEY),
+            "19:24: " + getCheckMessage(MSG_KEY),
+            "20:19: " + getCheckMessage(MSG_KEY),
+            "21:17: " + getCheckMessage(MSG_KEY),
+            "22:29: " + getCheckMessage(MSG_KEY),
+            "23:20: " + getCheckMessage(MSG_KEY),
+            "24:17: " + getCheckMessage(MSG_KEY),
+            "24:31: " + getCheckMessage(MSG_KEY),
+            "24:41: " + getCheckMessage(MSG_KEY),
+            "25:16: " + getCheckMessage(MSG_KEY),
+            "25:27: " + getCheckMessage(MSG_KEY),
+            "26:32: " + getCheckMessage(MSG_KEY),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputInnerAssignmentDemoBug1195047Comment3.java"), expected);
+    }
+
     @Test
     public void testLambdaExpression() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
@@ -93,4 +109,24 @@ public void testTokensNotNull() {
             .isNotNull();
     }
 
+    @Test
+    public void testInnerAssignmentSwitchAndSwitchExpression() throws Exception {
+        final String[] expected = {
+            "28:23: " + getCheckMessage(MSG_KEY),
+            "38:25: " + getCheckMessage(MSG_KEY),
+            "40:25: " + getCheckMessage(MSG_KEY),
+            "41:26: " + getCheckMessage(MSG_KEY),
+            "49:25: " + getCheckMessage(MSG_KEY),
+            "51:31: " + getCheckMessage(MSG_KEY),
+            "52:26: " + getCheckMessage(MSG_KEY),
+            "59:42: " + getCheckMessage(MSG_KEY),
+            "61:34: " + getCheckMessage(MSG_KEY),
+            "94:25: " + getCheckMessage(MSG_KEY),
+            "96:26: " + getCheckMessage(MSG_KEY),
+            "98:27: " + getCheckMessage(MSG_KEY),
+        };
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputInnerAssignmentSwitchAndSwitchExpression.java"),
+                expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java
index 64e6034dca5..6c189aa7f51 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -632,6 +632,19 @@ public void testMagicNumberIgnoreFieldDeclarationRecords()
                 expected);
     }
 
+    @Test
+    public void testMagicNumberIgnoreFieldDeclarationWithAnnotation()
+            throws Exception {
+        final String[] expected = {
+            "16:38: " + getCheckMessage(MSG_KEY, "3"),
+            "20:40: " + getCheckMessage(MSG_KEY, "60"),
+            "21:34: " + getCheckMessage(MSG_KEY, "20"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputMagicNumberIgnoreFieldDeclarationWithAnnotation.java"),
+                expected);
+    }
+
     @Test
     public void testIgnoreInAnnotationElementDefault() throws Exception {
         final String[] expected = {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java
index becc20b06ce..5abdb6a158c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,15 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
 import com.puppycrawl.tools.checkstyle.DetailAstImpl;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
@@ -230,4 +233,12 @@ public void testGetRequiredTokens() {
                 .that(matchXpathCheck.getRequiredTokens())
                 .isEmpty();
     }
+
+    @Test
+    public void testMatchXpathWithFailedEvaluation() {
+        final CheckstyleException ex = getExpectedThrowable(CheckstyleException.class,
+                () -> verifyWithInlineConfigParser(getPath("InputMatchXpath5.java")));
+        assertThat(ex.getCause().getMessage())
+                .isEqualTo("Evaluation of Xpath query failed: count(*) div 0");
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckTest.java
index 704367bb428..5e10e51424d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,14 +34,14 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testMissingSwitchDefault() throws Exception {
+    public void testMissingCtorEmptyClass() throws Exception {
 
         final String[] expected = {
             "9:1: " + getCheckMessage(MSG_KEY),
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputMissingCtor.java"),
+                getPath("InputMissingCtorEmptyClass.java"),
                expected);
     }
 
@@ -60,7 +60,7 @@ public void testTokensNotNull() {
     }
 
     @Test
-    public void testMissingCtorClassOnOneLine() throws Exception {
+    public void testMissingCtorNestedClasses() throws Exception {
 
         final String[] expected = {
             "9:1: " + getCheckMessage(MSG_KEY),
@@ -69,7 +69,7 @@ public void testMissingCtorClassOnOneLine() throws Exception {
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputMissingCtor2.java"),
+                getPath("InputMissingCtorNestedClasses.java"),
                 expected);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckTest.java
index 5dccd7a361b..401e31b90a7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -72,6 +72,14 @@ public void testMissingSwitchDefaultSwitchExpressions() throws Exception {
             expected);
     }
 
+    @Test
+    public void testNullCaseLabel() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputMissingSwitchDefaultCheckNullCaseLabel.java"),
+            expected);
+    }
+
     @Test
     public void testMissingSwitchDefaultSwitchExpressionsTwo() throws Exception {
         final String[] expected = {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckTest.java
index 1be44d2a321..64387afe43c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -193,8 +193,8 @@ public void testClearState() throws Exception {
                 .that(methodDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, methodDef.get(),
-                        "variableStack",
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        methodDef.orElseThrow(), "variableStack",
                         variableStack -> ((Collection<Set<String>>) variableStack).isEmpty()))
                 .isTrue();
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckTest.java
index 51f25b8cf8e..0e7efbfbb71 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckTest.java
index fc9df923f31..158b851368e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckTest.java
index 2a5748f5fa1..43f3aed13a7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,7 @@ protected String getPackageLocation() {
      *     interface-requirements for test-methods.
      */
     @Test
-    public void testNestedTooDeep() throws Exception {
+    public void testNestedForDepthCheckCustomMaxLevelTwo() throws Exception {
 
         final String[] expected = {
             "32:11: " + getCheckMessage(MSG_KEY, 3, 2),
@@ -53,7 +53,7 @@ public void testNestedTooDeep() throws Exception {
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputNestedForDepth.java"),
+                getPath("InputNestedForDepthCheckCustomMaxLevelTwo.java"),
                expected);
     }
 
@@ -68,12 +68,12 @@ public void testNestedTooDeep() throws Exception {
      *     interface-requirements for test-methods.
      */
     @Test
-    public void testNestedOk() throws Exception {
+    public void testNestedForDepthCheckCustomMaxLevelFour() throws Exception {
 
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
         verifyWithInlineConfigParser(
-                getPath("InputNestedForDepth1.java"),
+                getPath("InputNestedForDepthCheckCustomMaxLevelFour.java"),
                expected);
     }
 
@@ -92,13 +92,13 @@ public void testTokensNotNull() {
     }
 
     @Test
-    public void testNestedDefault() throws Exception {
+    public void testNestedForDepthCheckDefaultMaxLevel() throws Exception {
         final String[] expected = {
             "27:9: " + getCheckMessage(MSG_KEY, 2, 1),
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputNestedForDepthDefault.java"),
+                getPath("InputNestedForDepthCheckDefaultMaxLevel.java"),
                expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckTest.java
index 89e5d509f6a..d4d2315ed28 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckTest.java
index 432fea5cacf..829b7fae3c1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckTest.java
index 13b5da4b78a..dc1e649e389 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckTest.java
index b67ee245aea..1399ba01d73 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckTest.java
index e0b5ca7098a..747b9bf2e1d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,7 +34,7 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testDefault() throws Exception {
+    public void testDefaultOne() throws Exception {
         final String[] expected = {
             "23:12: " + getCheckMessage(MSG_KEY),
             "28:12: " + getCheckMessage(MSG_KEY),
@@ -44,23 +44,39 @@ public void testDefault() throws Exception {
             "53:21: " + getCheckMessage(MSG_KEY),
             "58:12: " + getCheckMessage(MSG_KEY),
             "76:9: " + getCheckMessage(MSG_KEY),
-            "106:55: " + getCheckMessage(MSG_KEY),
-            "110:14: " + getCheckMessage(MSG_KEY),
-            "114:14: " + getCheckMessage(MSG_KEY),
-            "130:14: " + getCheckMessage(MSG_KEY),
-            "134:14: " + getCheckMessage(MSG_KEY),
-            "138:55: " + getCheckMessage(MSG_KEY),
-            "144:33: " + getCheckMessage(MSG_KEY),
-            "151:33: " + getCheckMessage(MSG_KEY),
-            "168:13: " + getCheckMessage(MSG_KEY),
-            "186:21: " + getCheckMessage(MSG_KEY),
-            "206:10: " + getCheckMessage(MSG_KEY),
-            "250:55: " + getCheckMessage(MSG_KEY),
-            "255:9: " + getCheckMessage(MSG_KEY),
-            "258:9: " + getCheckMessage(MSG_KEY),
         };
         verifyWithInlineConfigParser(
-                getPath("InputNoEnumTrailingComma.java"), expected);
+                getPath("InputNoEnumTrailingCommaOne.java"), expected);
+    }
+
+    @Test
+    public void testDefaultTwo() throws Exception {
+        final String[] expected = {
+            "20:55: " + getCheckMessage(MSG_KEY),
+            "24:14: " + getCheckMessage(MSG_KEY),
+            "28:14: " + getCheckMessage(MSG_KEY),
+            "44:14: " + getCheckMessage(MSG_KEY),
+            "48:14: " + getCheckMessage(MSG_KEY),
+            "52:55: " + getCheckMessage(MSG_KEY),
+            "58:33: " + getCheckMessage(MSG_KEY),
+            "65:33: " + getCheckMessage(MSG_KEY),
+            "82:13: " + getCheckMessage(MSG_KEY),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputNoEnumTrailingCommaTwo.java"), expected);
+    }
+
+    @Test
+    public void testDefaultThree() throws Exception {
+        final String[] expected = {
+            "13:21: " + getCheckMessage(MSG_KEY),
+            "33:10: " + getCheckMessage(MSG_KEY),
+            "77:55: " + getCheckMessage(MSG_KEY),
+            "82:9: " + getCheckMessage(MSG_KEY),
+            "85:9: " + getCheckMessage(MSG_KEY),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputNoEnumTrailingCommaThree.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java
index d9d3f785a6f..8c650abd5d2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
index 7cd5134e353..755f4e5fafb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,20 +38,36 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testMultiCaseClass() throws Exception {
+    public void testMultiCaseSmallTalkStyle() throws Exception {
         final String[] expected = {
             "13:59: " + getCheckMessage(MSG_KEY),
-            "93:21: " + getCheckMessage(MSG_KEY),
-            "120:14: " + getCheckMessage(MSG_KEY),
-            "146:15: " + getCheckMessage(MSG_KEY),
-            "158:23: " + getCheckMessage(MSG_KEY),
-            "178:19: " + getCheckMessage(MSG_KEY),
-            "181:59: " + getCheckMessage(MSG_KEY),
+            "87:21: " + getCheckMessage(MSG_KEY),
         };
+        verifyWithInlineConfigParser(
+                getPath("InputOneStatementPerLineSingleLineSmallTalkStyle.java"),
+                expected);
+    }
 
+    @Test
+    public void testMultiCaseLoops() throws Exception {
+        final String[] expected = {
+            "27:18: " + getCheckMessage(MSG_KEY),
+            "53:17: " + getCheckMessage(MSG_KEY),
+            "65:25: " + getCheckMessage(MSG_KEY),
+            "85:23: " + getCheckMessage(MSG_KEY),
+            "88:63: " + getCheckMessage(MSG_KEY),
+        };
         verifyWithInlineConfigParser(
-                getPath("InputOneStatementPerLineSingleLine.java"),
-            expected);
+                getPath("InputOneStatementPerLineSingleLineInLoops.java"),
+                expected);
+    }
+
+    @Test
+    public void testMultiCaseDeclarations() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputOneStatementPerLineSingleLineForDeclarations.java"),
+                expected);
     }
 
     @Test
@@ -69,23 +85,31 @@ public void testTokensNotNull() {
     }
 
     @Test
-    public void testWithMultilineStatements() throws Exception {
+    public void testDeclarationsWithMultilineStatements() throws Exception {
         final String[] expected = {
             "49:21: " + getCheckMessage(MSG_KEY),
             "66:17: " + getCheckMessage(MSG_KEY),
             "74:17: " + getCheckMessage(MSG_KEY),
             "86:10: " + getCheckMessage(MSG_KEY),
             "95:28: " + getCheckMessage(MSG_KEY),
-            "140:39: " + getCheckMessage(MSG_KEY),
-            "173:46: " + getCheckMessage(MSG_KEY),
-            "184:47: " + getCheckMessage(MSG_KEY),
         };
-
         verifyWithInlineConfigParser(
-                getPath("InputOneStatementPerLineMultiline.java"),
+                getPath("InputOneStatementPerLineMultilineForDeclarations.java"),
             expected);
     }
 
+    @Test
+    public void testLoopsAndTryWithResourceWithMultilineStatements() throws Exception {
+        final String[] expected = {
+            "53:39: " + getCheckMessage(MSG_KEY),
+            "86:44: " + getCheckMessage(MSG_KEY),
+            "97:45: " + getCheckMessage(MSG_KEY),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputOneStatementPerLineMultilineInLoopsAndTryWithResources.java"),
+                expected);
+    }
+
     @Test
     public void oneStatementNonCompilableInputTest() throws Exception {
         final String[] expected = {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java
index 18da2e4348b..a578c811ed7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
 public class OverloadMethodsDeclarationOrderCheckTest
     extends AbstractModuleTestSupport {
@@ -40,8 +41,12 @@ public void testDefault() throws Exception {
         final String[] expected = {
             "32:5: " + getCheckMessage(MSG_KEY, 21),
             "60:9: " + getCheckMessage(MSG_KEY, 49),
-            "72:5: " + getCheckMessage(MSG_KEY, 70),
-            "115:5: " + getCheckMessage(MSG_KEY, 104),
+            "65:9: " + getCheckMessage(MSG_KEY, 60),
+            "83:5: " + getCheckMessage(MSG_KEY, 81),
+            "127:5: " + getCheckMessage(MSG_KEY, 116),
+            "138:5: " + getCheckMessage(MSG_KEY, 132),
+            "149:9: " + getCheckMessage(MSG_KEY, 143),
+            "152:5: " + getCheckMessage(MSG_KEY, 138),
         };
         verifyWithInlineConfigParser(
                 getPath("InputOverloadMethodsDeclarationOrder.java"), expected);
@@ -54,12 +59,24 @@ public void testOverloadMethodsDeclarationOrderRecords() throws Exception {
             "21:9: " + getCheckMessage(MSG_KEY, 15),
             "41:9: " + getCheckMessage(MSG_KEY, 35),
             "57:9: " + getCheckMessage(MSG_KEY, 50),
+            "63:9: " + getCheckMessage(MSG_KEY, 57),
         };
         verifyWithInlineConfigParser(
                 getNonCompilablePath("InputOverloadMethodsDeclarationOrderRecords.java"),
             expected);
     }
 
+    @Test
+    public void testOverloadMethodsDeclarationOrderPrivateAndStaticMethods() throws Exception {
+
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        verifyWithInlineConfigParser(
+                getPath(
+                        "InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java"
+                ), expected);
+    }
+
     @Test
     public void testTokensNotNull() {
         final OverloadMethodsDeclarationOrderCheck check =
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
index 88893207d4c..387100a3e9e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckTest.java
index 285d8a2c235..959dba45b5a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -117,7 +117,7 @@ public void testClearState() throws Exception {
                 .that(methodDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-            .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, methodDef.get(),
+            .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, methodDef.orElseThrow(),
                 "parameterNamesStack",
                 parameterNamesStack -> ((Collection<Set<String>>) parameterNamesStack).isEmpty()))
             .isTrue();
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java
index a37f3ae9025..a175c3eb197 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -576,7 +576,7 @@ public void testClearState() throws Exception {
                 .that(classDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.get(),
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.orElseThrow(),
                         "current", current -> ((Collection<?>) current).isEmpty()))
                 .isTrue();
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckTest.java
index e99ad38ecba..761ec327696 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.coding.ReturnCountCheck.MSG_KEY;
 import static com.puppycrawl.tools.checkstyle.checks.coding.ReturnCountCheck.MSG_KEY_VOID;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 import java.util.Collection;
@@ -169,8 +169,8 @@ public void testClearState() throws Exception {
                 .that(methodDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, methodDef.get(),
-                        "contextStack",
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        methodDef.orElseThrow(), "contextStack",
                         contextStack -> ((Collection<Set<String>>) contextStack).isEmpty()))
                 .isTrue();
     }
@@ -186,7 +186,7 @@ public void testImproperVisitToken() {
         final ReturnCountCheck check = new ReturnCountCheck();
         final DetailAstImpl classDefAst = new DetailAstImpl();
         classDefAst.setType(TokenTypes.CLASS_DEF);
-        final IllegalStateException exception = assertThrows(IllegalStateException.class,
+        final IllegalStateException exception = getExpectedThrowable(IllegalStateException.class,
                 () -> check.visitToken(classDefAst), "IllegalStateException was expected");
 
         assertWithMessage("Message doesn't contain ast")
@@ -205,7 +205,7 @@ public void testImproperLeaveToken() {
         final ReturnCountCheck check = new ReturnCountCheck();
         final DetailAstImpl classDefAst = new DetailAstImpl();
         classDefAst.setType(TokenTypes.CLASS_DEF);
-        final IllegalStateException exception = assertThrows(IllegalStateException.class,
+        final IllegalStateException exception = getExpectedThrowable(IllegalStateException.class,
                 () -> check.leaveToken(classDefAst), "IllegalStateException was expected");
 
         assertWithMessage("Message doesn't contain ast")
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckTest.java
index 5ab59c317c6..54dc5bcda8f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckTest.java
index e0637bd54bb..31d224b5c2c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckTest.java
index 9efc1ba315f..db2e0df9922 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java
index 85b0c7358da..819407fcdb5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -106,8 +106,8 @@ public void testClearState() throws Exception {
                 .that(methodDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, methodDef.get(),
-                        "methodStack",
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        methodDef.orElseThrow(), "methodStack",
                         methodStack -> ((Collection<Set<String>>) methodStack).isEmpty()))
                 .isTrue();
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckTest.java
index ed21b56a73f..d4c61f25d0a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java
index e26b87277c4..a7ee404cf61 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckTest.java
index 1720be86fd8..45a0a8301b1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckTest.java
index 6d67e9b6e2a..daeb29144b9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckTest.java
index e046aa3a1b5..a79d4c66555 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckTest.java
index 5897f6b8877..2bfc286c6bf 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java
index 97cf08fd26c..7b5ba6dcb45 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -149,6 +149,16 @@ public void testUnusedLocalVar2() throws Exception {
                 expected);
     }
 
+    @Test
+    public void testUnusedLocalVar3() throws Exception {
+        final String[] expected = {
+            "21:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariable3.java"),
+                expected);
+    }
+
     @Test
     public void testUnusedLocalVarInAnonInnerClasses() throws Exception {
         final String[] expected = {
@@ -241,6 +251,59 @@ public void testUnusedLocalVarNestedClasses3() throws Exception {
                 expected);
     }
 
+    @Test
+    public void testUnusedLocalVarNestedClasses4() throws Exception {
+        final String[] expected = {
+            "12:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+            "13:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ab"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableNestedClasses4.java"),
+                expected);
+    }
+
+    @Test
+    public void testUnusedLocalVarNestedClasses5() throws Exception {
+        final String[] expected = {
+            "12:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+            "13:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ab"),
+            "19:11: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "abc"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableNestedClasses5.java"),
+                expected);
+    }
+
+    @Test
+    public void testUnusedLocalVarNestedClasses6() throws Exception {
+        final String[] expected = {
+            "12:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+            "13:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ab"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableNestedClasses6.java"),
+                expected);
+    }
+
+    @Test
+    public void testUnusedLocalVarNestedClasses7() throws Exception {
+        final String[] expected = {
+            "10:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+            "11:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ab"),
+            "16:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ab"),
+            "23:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+            "24:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ab"),
+            "28:13: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableNestedClasses7.java"),
+                expected);
+    }
+
     @Test
     public void testUnusedLocalVarTestWarningSeverity() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
@@ -264,6 +327,36 @@ public void testUnusedLocalVarEnum() throws Exception {
                 expected);
     }
 
+    @Test
+    public void testUnusedLocalVarLambdas() throws Exception {
+        final String[] expected = {
+            "14:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "hoo"),
+            "20:17: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "j"),
+            "31:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "hoo2"),
+            "32:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "hoo3"),
+            "33:15: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "myComponent"),
+            "34:19: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "myComponent3"),
+            "40:25: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "j"),
+            "52:21: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "j"),
+            "65:17: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ja"),
+            "73:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "k"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableLambdaExpression.java"),
+                expected);
+    }
+
+    @Test
+    public void testUnusedLocalVariableLocalClasses() throws Exception {
+        final String[] expected = {
+            "14:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "a"),
+            "15:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "ab"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableLocalClasses.java"),
+                expected);
+    }
+
     @Test
     public void testUnusedLocalVarRecords() throws Exception {
         final String[] expected = {
@@ -297,6 +390,34 @@ public void testUnusedLocalVariableTernaryAndExpressions() throws Exception {
                 expected);
     }
 
+    @Test
+    public void testUnusedLocalVariableSwitchStatement() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableSwitchStatement.java"),
+                expected);
+    }
+
+    @Test
+    public void testUnusedLocalVariableSwitchStatement2() throws Exception {
+        final String[] expected = {
+            "58:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "j"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedLocalVariableSwitchStatement2.java"),
+                expected);
+    }
+
+    @Test
+    public void testUnusedLocalVariableSwitchExpression() throws Exception {
+        final String[] expected = {
+            "15:9: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "line2"),
+        };
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputUnusedLocalVariableSwitchExpression.java"),
+                expected);
+    }
+
     @Test
     public void testClearStateVariables() throws Exception {
         final UnusedLocalVariableCheck check = new UnusedLocalVariableCheck();
@@ -308,7 +429,7 @@ public void testClearStateVariables() throws Exception {
         assertWithMessage("Ast should contain METHOD_DEF")
                 .that(methodDef.isPresent())
                 .isTrue();
-        final DetailAST variableDef = methodDef.get().getLastChild()
+        final DetailAST variableDef = methodDef.orElseThrow().getLastChild()
                 .findFirstToken(TokenTypes.VARIABLE_DEF);
         assertWithMessage("State is not cleared on beginTree")
                 .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, variableDef,
@@ -330,7 +451,7 @@ public void testClearStateClasses() throws Exception {
         assertWithMessage("Ast should contain CLASS_DEF")
                 .that(classDef.isPresent())
                 .isTrue();
-        final DetailAST classDefToken = classDef.get();
+        final DetailAST classDefToken = classDef.orElseThrow();
         assertWithMessage("State is not cleared on beginTree")
                 .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDefToken,
                         "typeDeclarations",
@@ -370,7 +491,7 @@ public void testClearStateAnonInnerClass() throws Exception {
                 .isTrue();
         check.beginTree(root);
         check.visitToken(classDefAst);
-        check.visitToken(literalNew.get());
+        check.visitToken(literalNew.orElseThrow());
         check.beginTree(null);
         final Predicate<Object> isClear = anonInnerAstToTypeDesc -> {
             return ((Map<?, ?>) anonInnerAstToTypeDesc).isEmpty();
@@ -399,7 +520,7 @@ public void testClearStatePackageDef() throws Exception {
         assertWithMessage("Ast should contain PACKAGE_DEF")
                 .that(packageDef.isPresent())
                 .isTrue();
-        final DetailAST packageDefToken = packageDef.get();
+        final DetailAST packageDefToken = packageDef.orElseThrow();
         assertWithMessage("State is not cleared on beginTree")
                 .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, packageDefToken,
                         "packageName",
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java
index 956d2e5f3ba..3b4050ad2fe 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -168,6 +168,8 @@ public void testValidateBetweenScopesOption() throws Exception {
             "231:9: " + getCheckMessage(MSG_KEY, "t", 5, 1),
             "234:9: " + getCheckMessage(MSG_KEY, "c", 3, 1),
             "235:9: " + getCheckMessage(MSG_KEY, "d2", 3, 1),
+            "272:9: " + getCheckMessage(MSG_KEY, "sel", 2, 1),
+            "273:9: " + getCheckMessage(MSG_KEY, "model", 2, 1),
             "312:9: " + getCheckMessage(MSG_KEY, "wh", 2, 1),
             "355:9: " + getCheckMessage(MSG_KEY, "green", 2, 1),
             "356:9: " + getCheckMessage(MSG_KEY, "blue", 3, 1),
@@ -178,10 +180,20 @@ public void testValidateBetweenScopesOption() throws Exception {
             "483:9: " + getCheckMessage(MSG_KEY, "l2", 2, 1),
             "491:9: " + getCheckMessage(MSG_KEY, "myOption", 7, 1),
             "503:9: " + getCheckMessage(MSG_KEY, "myOption", 6, 1),
+            "516:9: " + getCheckMessage(MSG_KEY, "count", 4, 1),
             "517:9: " + getCheckMessage(MSG_KEY, "files", 2, 1),
             "552:13: " + getCheckMessage(MSG_KEY, "id", 2, 1),
             "554:13: " + getCheckMessage(MSG_KEY, "parentId", 4, 1),
+            "855:9: " + getCheckMessage(MSG_KEY, "a", 5, 1),
+            "867:9: " + getCheckMessage(MSG_KEY, "a", 5, 1),
+            "879:9: " + getCheckMessage(MSG_KEY, "a", 5, 1),
+            "891:9: " + getCheckMessage(MSG_KEY, "a", 5, 1),
+            "903:9: " + getCheckMessage(MSG_KEY, "a", 5, 1),
+            "913:9: " + getCheckMessage(MSG_KEY, "a", 5, 1),
+            "924:9: " + getCheckMessage(MSG_KEY, "a", 2, 1),
+            "945:9: " + getCheckMessage(MSG_KEY, "a", 5, 1),
             "990:9: " + getCheckMessage(MSG_KEY, "a", 2, 1),
+            "1001:9: " + getCheckMessage(MSG_KEY, "a", 4, 1),
             "1036:9: " + getCheckMessage(MSG_KEY, "c", 4, 1),
             "1066:9: " + getCheckMessage(MSG_KEY, "a", 4, 1),
         };
@@ -253,11 +265,19 @@ public void testDefaultConfiguration() throws Exception {
             "231:9: " + getCheckMessage(MSG_KEY_EXT, "t", 5, 3),
             "491:9: " + getCheckMessage(MSG_KEY_EXT, "myOption", 7, 3),
             "503:9: " + getCheckMessage(MSG_KEY_EXT, "myOption", 6, 3),
+            "516:9: " + getCheckMessage(MSG_KEY_EXT, "count", 4, 3),
             "554:13: " + getCheckMessage(MSG_KEY_EXT, "parentId", 4, 3),
+            "855:9: " + getCheckMessage(MSG_KEY_EXT, "a", 5, 3),
+            "867:9: " + getCheckMessage(MSG_KEY_EXT, "a", 5, 3),
+            "879:9: " + getCheckMessage(MSG_KEY_EXT, "a", 5, 3),
+            "891:9: " + getCheckMessage(MSG_KEY_EXT, "a", 5, 3),
+            "903:9: " + getCheckMessage(MSG_KEY_EXT, "a", 5, 3),
+            "913:9: " + getCheckMessage(MSG_KEY_EXT, "a", 5, 3),
+            "945:9: " + getCheckMessage(MSG_KEY_EXT, "a", 5, 3),
             "1036:9: " + getCheckMessage(MSG_KEY_EXT, "c", 4, 3),
+            "1001:9: " + getCheckMessage(MSG_KEY_EXT, "a", 4, 3),
             "1066:9: " + getCheckMessage(MSG_KEY_EXT, "a", 4, 3),
         };
-
         verifyWithInlineConfigParser(
                 getPath("InputVariableDeclarationUsageDistanceDefault.java"), expected);
     }
@@ -283,8 +303,9 @@ public void testAnonymousClass() throws Exception {
 
     @Test
     public void testLabels() throws Exception {
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-
+        final String[] expected = {
+            "15:9: " + getCheckMessage(MSG_KEY_EXT, "eol", 5, 3),
+        };
         verifyWithInlineConfigParser(
                 getPath("InputVariableDeclarationUsageDistanceLabels.java"), expected);
     }
@@ -377,4 +398,14 @@ public void testVariableDeclarationUsageDistance1() throws Exception {
         verifyWithInlineConfigParser(
                 getPath("InputVariableDeclarationUsageDistance1.java"), expected);
     }
+
+    @Test
+    public void testVariableDeclarationUsageDistanceCloseToBlock() throws Exception {
+        final String[] expected = {
+            "15:9: " + getCheckMessage(MSG_KEY, "a", 13, 1),
+            "16:9: " + getCheckMessage(MSG_KEY, "b", 13, 1),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputVariableDeclarationUsageDistanceCloseToBlock.java"), expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckTest.java
index 23e7e34238d..2846ecc0194 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java
index 4a8a61ed1ce..55614826581 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -269,8 +269,9 @@ public void testClearState() throws Exception {
                 .that(packageDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, packageDef.get(),
-                        "packageName", packageName -> ((String) packageName).isEmpty()))
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        packageDef.orElseThrow(), "packageName",
+                        packageName -> ((String) packageName).isEmpty()))
                 .isTrue();
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckTest.java
index caec7f0cef3..347c5ba6a3a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java
index d19b850af5c..b409d577025 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckTest.java
index dfa6ad14b94..76873d98e4e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java
index 0c16896617a..c19fa19e8fb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckTest.java
index 128571ad554..25c387e46bc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java
index 83c4930ad65..8133758193c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,7 +37,7 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testDefault() throws Exception {
+    public void testThrowsCountDefault() throws Exception {
 
         final String[] expected = {
             "25:20: " + getCheckMessage(MSG_KEY, 5, 4),
@@ -47,18 +47,18 @@ public void testDefault() throws Exception {
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputThrowsCount.java"), expected);
+                getPath("InputThrowsCountDefault.java"), expected);
     }
 
     @Test
-    public void testMax() throws Exception {
+    public void testThrowsCountCustomMaxCount() throws Exception {
 
         final String[] expected = {
             "35:20: " + getCheckMessage(MSG_KEY, 6, 5),
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputThrowsCount2.java"), expected);
+                getPath("InputThrowsCountCustomMaxCount.java"), expected);
     }
 
     @Test
@@ -96,7 +96,7 @@ public void testWrongTokenType() {
     }
 
     @Test
-    public void testNotIgnorePrivateMethod() throws Exception {
+    public void testThrowsCountNotIgnorePrivateMethods() throws Exception {
         final String[] expected = {
             "25:20: " + getCheckMessage(MSG_KEY, 5, 4),
             "30:20: " + getCheckMessage(MSG_KEY, 5, 4),
@@ -105,11 +105,11 @@ public void testNotIgnorePrivateMethod() throws Exception {
             "63:43: " + getCheckMessage(MSG_KEY, 5, 4),
         };
         verifyWithInlineConfigParser(
-                getPath("InputThrowsCount3.java"), expected);
+                getPath("InputThrowsCountNotIgnorePrivateMethods.java"), expected);
     }
 
     @Test
-    public void testMethodWithAnnotation() throws Exception {
+    public void testThrowsCountMethodWithAnnotation() throws Exception {
         final String[] expected = {
             "26:26: " + getCheckMessage(MSG_KEY, 5, 4),
         };
@@ -118,7 +118,7 @@ public void testMethodWithAnnotation() throws Exception {
     }
 
     @Test
-    public void testOverriding() throws Exception {
+    public void testThrowsCountMaxAllowZero() throws Exception {
         final String[] expected = {
             "17:20: " + getCheckMessage(MSG_KEY, 1, 0),
             "21:20: " + getCheckMessage(MSG_KEY, 1, 0),
@@ -129,7 +129,7 @@ public void testOverriding() throws Exception {
             "67:43: " + getCheckMessage(MSG_KEY, 5, 0),
         };
         verifyWithInlineConfigParser(
-                getPath("InputThrowsCount4.java"), expected);
+                getPath("InputThrowsCountMaxAllowZero.java"), expected);
     }
 
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java
index ec270f53bcb..97227304197 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
index 9a10a0fa58b..41e716f309d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck.MSG_MISMATCH;
 import static com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck.MSG_MISSING;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 import static org.mockito.Mockito.mockConstruction;
 import static org.mockito.Mockito.when;
 
@@ -86,9 +86,8 @@ public void testWhitespaceHeader() throws Exception {
     public void testNonExistentHeaderFile() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(HeaderCheck.class);
         checkConfig.addProperty("headerFile", getPath("nonExistent.file"));
-        final CheckstyleException ex = assertThrows(CheckstyleException.class, () -> {
-            createChecker(checkConfig);
-        });
+        final CheckstyleException ex = getExpectedThrowable(CheckstyleException.class,
+                () -> createChecker(checkConfig));
         assertWithMessage("Invalid exception message")
                 .that(ex)
                 .hasMessageThat()
@@ -109,9 +108,8 @@ public void testInvalidCharset() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(HeaderCheck.class);
         checkConfig.addProperty("headerFile", getPath("InputHeaderjava.header"));
         checkConfig.addProperty("charset", "XSO-8859-1");
-        final CheckstyleException ex = assertThrows(CheckstyleException.class, () -> {
-            createChecker(checkConfig);
-        });
+        final CheckstyleException ex = getExpectedThrowable(CheckstyleException.class,
+                () -> createChecker(checkConfig));
         assertWithMessage("Invalid exception message")
                 .that(ex)
                 .hasMessageThat()
@@ -131,9 +129,8 @@ public void testInvalidCharset() throws Exception {
     public void testEmptyFilename() {
         final DefaultConfiguration checkConfig = createModuleConfig(HeaderCheck.class);
         checkConfig.addProperty("headerFile", "");
-        final CheckstyleException ex = assertThrows(CheckstyleException.class, () -> {
-            createChecker(checkConfig);
-        });
+        final CheckstyleException ex = getExpectedThrowable(CheckstyleException.class,
+                () -> createChecker(checkConfig));
         assertWithMessage("Invalid exception message")
                 .that(ex)
                 .hasMessageThat()
@@ -154,9 +151,8 @@ public void testEmptyFilename() {
     public void testNullFilename() {
         final DefaultConfiguration checkConfig = createModuleConfig(HeaderCheck.class);
         checkConfig.addProperty("headerFile", null);
-        final CheckstyleException ex = assertThrows(CheckstyleException.class, () -> {
-            createChecker(checkConfig);
-        });
+        final CheckstyleException ex = getExpectedThrowable(CheckstyleException.class,
+                () -> createChecker(checkConfig));
         assertWithMessage("Invalid exception message")
                 .that(ex)
                 .hasMessageThat()
@@ -191,9 +187,9 @@ public void testIgnore() throws Exception {
     public void testSetHeaderTwice() {
         final HeaderCheck check = new HeaderCheck();
         check.setHeader("Header");
-        final IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> {
-            check.setHeader("Header2");
-        });
+        final IllegalArgumentException ex =
+                getExpectedThrowable(IllegalArgumentException.class,
+                        () -> check.setHeader("Header2"));
         assertWithMessage("Invalid exception message")
                 .that(ex)
                 .hasMessageThat()
@@ -206,8 +202,9 @@ public void testIoExceptionWhenLoadingHeaderFile() throws Exception {
         final HeaderCheck check = new HeaderCheck();
         check.setHeaderFile(new URI("test://bad"));
 
-        final ReflectiveOperationException ex = assertThrows(ReflectiveOperationException.class,
-            () -> TestUtil.invokeMethod(check, "loadHeaderFile"));
+        final ReflectiveOperationException ex =
+                getExpectedThrowable(ReflectiveOperationException.class,
+                        () -> TestUtil.invokeMethod(check, "loadHeaderFile"));
         assertWithMessage("Invalid exception cause message")
             .that(ex)
                 .hasCauseThat()
@@ -262,8 +259,9 @@ public void testIgnoreLinesSorted() throws Exception {
     public void testLoadHeaderFileTwice() {
         final HeaderCheck check = new HeaderCheck();
         check.setHeader("Header");
-        final ReflectiveOperationException ex = assertThrows(ReflectiveOperationException.class,
-                () -> TestUtil.invokeMethod(check, "loadHeaderFile"));
+        final ReflectiveOperationException ex =
+                getExpectedThrowable(ReflectiveOperationException.class,
+                        () -> TestUtil.invokeMethod(check, "loadHeaderFile"));
         assertWithMessage("Invalid exception cause message")
                 .that(ex)
                 .hasCauseThat()
@@ -297,7 +295,7 @@ public void testExternalResource() throws Exception {
             .isEqualTo(1);
         assertWithMessage("Invalid resource location")
             .that(results.iterator().next())
-            .isEqualTo(uri.toString());
+            .isEqualTo(uri.toASCIIString());
     }
 
     @Test
@@ -307,9 +305,9 @@ public void testIoExceptionWhenLoadingHeader() {
                 LineNumberReader.class, (mock, context) -> {
                     when(mock.readLine()).thenThrow(IOException.class);
                 })) {
-            final IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> {
-                check.setHeader("header");
-            });
+            final IllegalArgumentException ex =
+                    getExpectedThrowable(IllegalArgumentException.class,
+                            () -> check.setHeader("header"));
             assertWithMessage("Invalid exception cause")
                     .that(ex)
                     .hasCauseThat()
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckTest.java
index 44ade48e0df..956a491ea02 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResultTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResultTest.java
index 4ed82d071be..b149afcb741 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResultTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResultTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckTest.java
index c846c35cbdc..b44abf62e71 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -39,13 +39,11 @@ protected String getPackageLocation() {
     public void testDefaultOperation()
             throws Exception {
         final String[] expected = {
-            "12:54: " + getCheckMessage(MSG_KEY, "com.puppycrawl."
-                    + "tools.checkstyle.checks.imports.*"),
-            "14:15: " + getCheckMessage(MSG_KEY, "java.io.*"),
-            "15:17: " + getCheckMessage(MSG_KEY, "java.lang.*"),
-            "30:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "31:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "33:27: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
+            "12:15: " + getCheckMessage(MSG_KEY, "java.io.*"),
+            "13:17: " + getCheckMessage(MSG_KEY, "java.lang.*"),
+            "28:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "29:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "31:27: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
         };
 
         verifyWithInlineConfigParser(
@@ -58,9 +56,7 @@ public void testExcludes()
             throws Exception {
         // allow the java.io/java.lang,javax.swing.WindowConstants star imports
         final String[] expected2 = {
-            "12:54: " + getCheckMessage(MSG_KEY, "com.puppycrawl."
-                    + "tools.checkstyle.checks.imports.*"),
-            "33:27: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
+            "31:27: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputAvoidStarImportExcludes.java"),
@@ -71,9 +67,9 @@ public void testExcludes()
     public void testAllowClassImports() throws Exception {
         // allow all class star imports
         final String[] expected2 = {
-            "30:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "31:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "33:27: " + getCheckMessage(MSG_KEY, "java.io.File.*"), };
+            "28:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "29:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "31:27: " + getCheckMessage(MSG_KEY, "java.io.File.*"), };
         verifyWithInlineConfigParser(
                 getPath("InputAvoidStarImportAllowClass.java"), expected2);
     }
@@ -82,10 +78,8 @@ public void testAllowClassImports() throws Exception {
     public void testAllowStaticMemberImports() throws Exception {
         // allow all static star imports
         final String[] expected2 = {
-            "12:54: " + getCheckMessage(MSG_KEY, "com.puppycrawl."
-                    + "tools.checkstyle.checks.imports.*"),
-            "14:15: " + getCheckMessage(MSG_KEY, "java.io.*"),
-            "15:17: " + getCheckMessage(MSG_KEY, "java.lang.*"),
+            "12:15: " + getCheckMessage(MSG_KEY, "java.io.*"),
+            "13:17: " + getCheckMessage(MSG_KEY, "java.lang.*"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputAvoidStarImportAllowStaticMember.java"), expected2);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java
index 9e513e8bab1..e78433d27cb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -48,16 +48,16 @@ public void testGetRequiredTokens() {
     public void testDefaultOperation()
             throws Exception {
         final String[] expected = {
-            "26:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
-            "28:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "29:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
-            "30:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
-            "31:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
-            "32:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
-            "33:113: " + getCheckMessage(MSG_KEY,
+            "24:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
+            "26:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "27:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
+            "28:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
+            "29:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
+            "30:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
+            "31:113: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
-            "34:124: " + getCheckMessage(MSG_KEY,
+            "32:124: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
@@ -71,13 +71,13 @@ public void testStarExcludes()
             throws Exception {
         // allow the "java.io.File.*" AND "sun.net.ftpclient.FtpClient.*" star imports
         final String[] expected = {
-            "28:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "31:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
-            "32:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
-            "33:113: " + getCheckMessage(MSG_KEY,
+            "26:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "29:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
+            "30:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
+            "31:113: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
-            "34:124: " + getCheckMessage(MSG_KEY,
+            "32:124: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
@@ -90,14 +90,14 @@ public void testMemberExcludes()
             throws Exception {
         // allow the java.io.File.listRoots and java.lang.Math.E member imports
         final String[] expected = {
-            "28:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "29:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
-            "30:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
-            "32:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
-            "33:113: " + getCheckMessage(MSG_KEY,
+            "26:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "27:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
+            "28:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
+            "30:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
+            "31:113: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
-            "34:124: " + getCheckMessage(MSG_KEY,
+            "32:124: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
@@ -110,16 +110,16 @@ public void testBogusMemberExcludes()
             throws Exception {
         // should NOT mask anything
         final String[] expected = {
-            "28:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
-            "30:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "31:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
-            "32:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
-            "33:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
-            "34:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
-            "35:113: " + getCheckMessage(MSG_KEY,
+            "26:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
+            "28:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "29:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
+            "30:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
+            "31:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
+            "32:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
+            "33:113: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
-            "36:124: " + getCheckMessage(MSG_KEY,
+            "34:124: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
@@ -133,13 +133,13 @@ public void testInnerClassMemberExcludesStar()
         // should mask com.puppycrawl.tools.checkstyle.imports.avoidstaticimport.
         // InputAvoidStaticImportNestedClass.InnerClass.one
         final String[] expected = {
-            "27:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
-            "29:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
-            "30:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
-            "31:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
-            "32:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
-            "33:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
-            "34:113: " + getCheckMessage(MSG_KEY,
+            "25:27: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
+            "27:42: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
+            "28:27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
+            "29:27: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
+            "30:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.E"),
+            "31:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.sqrt"),
+            "32:113: " + getCheckMessage(MSG_KEY,
                     "com.puppycrawl.tools.checkstyle.checks.imports."
                     + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
         };
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRuleTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRuleTest.java
index ac6372fd04e..7183d272970 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRuleTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ClassImportRuleTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java
index 4fed741fe6e..ff2792a4dda 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -74,17 +74,17 @@ public void testCustom() throws Exception {
                     "java.io.File.createTempFile"),
             "17:1: " + getCheckMessage(MSG_LEX, "java.awt.print.Paper.*",
                     "java.io.File.createTempFile"),
-            "20:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.awt.Button"),
-            "21:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.awt.Frame"),
-            "22:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.awt.Dialog"),
-            "23:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.awt.color.ColorSpace"),
-            "24:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.awt.event.ActionEvent"),
-            "25:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "javax.swing.JComponent"),
-            "26:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "javax.swing.JTable"),
-            "27:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.io.File"),
-            "28:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.io.IOException"),
-            "29:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.io.InputStream"),
-            "30:1: " + getCheckMessage(MSG_ORDER, STD, SAME, "java.io.Reader"),
+            "20:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.awt.Button"),
+            "21:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.awt.Frame"),
+            "22:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.awt.Dialog"),
+            "23:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.awt.color.ColorSpace"),
+            "24:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.awt.event.ActionEvent"),
+            "25:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "javax.swing.JComponent"),
+            "26:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "javax.swing.JTable"),
+            "27:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.io.File"),
+            "28:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.io.IOException"),
+            "29:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.io.InputStream"),
+            "30:1: " + getCheckMessage(MSG_ORDER, STD, THIRD, "java.io.Reader"),
         };
 
         verifyWithInlineConfigParser(
@@ -109,13 +109,59 @@ public void testStaticStandardThird() throws Exception {
             "30:1: " + getCheckMessage(MSG_LEX, "java.io.Reader", "javax.swing.JTable"),
             "34:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "com.google.common.collect.*"),
             "34:1: " + getCheckMessage(MSG_LEX, "com.google.common.collect.*",
-                    "com.puppycrawl.tools.checkstyle.*"),
+                    "com.google.errorprone.annotations.*"),
         };
 
         verifyWithInlineConfigParser(
                 getPath("InputCustomImportOrderDefault3.java"), expected);
     }
 
+    @Test
+    public void testStaticStandardThirdListCustomRules() throws Exception {
+        final String[] expected = {
+            "16:1: " + getCheckMessage(MSG_LEX, "java.awt.Button.ABORT",
+                    "java.io.File.createTempFile"),
+            "17:1: " + getCheckMessage(MSG_LEX, "java.awt.print.Paper.*",
+                    "java.io.File.createTempFile"),
+            "22:1: " + getCheckMessage(MSG_LEX, "java.awt.Dialog", "java.awt.Frame"),
+            "27:1: " + getCheckMessage(MSG_LEX, "java.io.File", "javax.swing.JTable"),
+            "28:1: " + getCheckMessage(MSG_LEX, "java.io.IOException", "javax.swing.JTable"),
+            "29:1: " + getCheckMessage(MSG_LEX, "java.io.InputStream", "javax.swing.JTable"),
+            "30:1: " + getCheckMessage(MSG_LEX, "java.io.Reader", "javax.swing.JTable"),
+            "34:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "com.google.common.collect.*"),
+            "34:1: " + getCheckMessage(MSG_LEX, "com.google.common.collect.*",
+                    "com.google.errorprone.annotations.*"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputCustomImportOrderListRules.java"), expected);
+    }
+
+    @Test
+    public void testStaticStandardThirdListCustomRulesWhitespace() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        verifyWithInlineConfigParser(
+                getPath("InputCustomImportOrderListRulesWhitespace.java"), expected);
+    }
+
+    @Test
+    public void testInputCustomImportOrderSingleLineList() throws Exception {
+        final String[] expected = {
+            "14:112: " + getCheckMessage(MSG_LINE_SEPARATOR,
+                "java.util.Map"),
+            "15:1: " + getCheckMessage(MSG_LINE_SEPARATOR,
+                "com.google.common.annotations.Beta"),
+            "22:1: " + getCheckMessage(MSG_LINE_SEPARATOR,
+                "com.puppycrawl.tools.checkstyle.*"),
+            "26:1: " + getCheckMessage(MSG_LINE_SEPARATOR,
+                "picocli.*"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputCustomImportOrderSingleLineList.java"),
+            expected);
+    }
+
     /**
      * Checks different combinations for same_package group.
      */
@@ -164,11 +210,11 @@ public void testOrderRuleWithOneGroup() throws Exception {
                     "javax.swing.WindowConstants.*"),
             "23:1: " + getCheckMessage(MSG_LEX, "java.util.concurrent.*",
                     "javax.swing.WindowConstants.*"),
-            "26:1: " + getCheckMessage(MSG_LEX, "com.puppycrawl.tools.checkstyle.*",
-                    "com.puppycrawl.tools.checkstyle.checks.*"),
+            "26:1: " + getCheckMessage(MSG_LEX, "com.google.errorprone.annotations.*",
+                    "com.google.errorprone.annotations.concurrent.*"),
             "28:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "com.google.common.base.*"),
             "28:1: " + getCheckMessage(MSG_LEX, "com.google.common.base.*",
-                    "com.puppycrawl.tools.checkstyle.checks.*"),
+                    "com.google.errorprone.annotations.concurrent.*"),
         };
 
         verifyWithInlineConfigParser(
@@ -224,8 +270,8 @@ public void testWithoutLineSeparator2() throws Exception {
         final String[] expected = {
             "16:1: " + getCheckMessage(MSG_LEX, "java.io.File.createTempFile",
                 "javax.swing.WindowConstants.*"),
-            "20:1: " + getCheckMessage(MSG_LEX, "com.puppycrawl.tools.checkstyle.*",
-                "com.puppycrawl.tools.checkstyle.checks.*"),
+            "20:1: " + getCheckMessage(MSG_LEX, "java.util.concurrent.locks.*",
+                "java.util.concurrent.locks.AbstractOwnableSynchronizer.*"),
         };
 
         verifyWithInlineConfigParser(
@@ -339,7 +385,7 @@ public void testBeginTreeClear() throws Exception {
     public void testImportsContainingJava() throws Exception {
         final String[] expected = {
             "17:1: " + getCheckMessage(MSG_LINE_SEPARATOR,
-                    "com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck"),
+                    "com.google.errorprone.annotations.*"),
         };
 
         verifyWithInlineConfigParser(
@@ -542,7 +588,7 @@ public void testNoImports() throws Exception {
     public void testDefaultConfiguration() throws Exception {
         final String[] expected = {
             "20:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "java.awt.Button"),
-            "32:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "com.puppycrawl.tools.checkstyle.*"),
+            "32:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "java.io.*"),
             "34:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP, "com.google.common.collect.*"),
         };
         verifyWithInlineConfigParser(
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControlTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControlTest.java
index ad8236022d7..14bfb211440 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControlTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/FileImportControlTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java
index d09880910c3..d4a80577806 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,9 +47,9 @@ public void testGetRequiredTokens() {
     public void testWithSupplied()
             throws Exception {
         final String[] expected = {
-            "14:1: " + getCheckMessage(MSG_KEY, "java.io.*"),
-            "28:1: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
-            "32:1: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
+            "12:1: " + getCheckMessage(MSG_KEY, "java.io.*"),
+            "26:1: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
+            "30:1: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputIllegalImportDefault1.java"), expected);
@@ -89,9 +89,9 @@ public void testGetAcceptableTokens() {
     public void testIllegalClasses()
             throws Exception {
         final String[] expected = {
-            "16:1: " + getCheckMessage(MSG_KEY, "java.sql.Connection"),
-            "20:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
-            "33:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
+            "14:1: " + getCheckMessage(MSG_KEY, "java.sql.Connection"),
+            "18:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
+            "31:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputIllegalImportDefault3.java"), expected);
@@ -101,9 +101,9 @@ public void testIllegalClasses()
     public void testIllegalClassesStarImport()
             throws Exception {
         final String[] expected = {
-            "14:1: " + getCheckMessage(MSG_KEY, "java.io.*"),
-            "20:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
-            "33:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
+            "12:1: " + getCheckMessage(MSG_KEY, "java.io.*"),
+            "18:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
+            "31:1: " + getCheckMessage(MSG_KEY, "org.junit.jupiter.api.*"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputIllegalImportDefault4.java"), expected);
@@ -113,13 +113,13 @@ public void testIllegalClassesStarImport()
     public void testIllegalPackagesRegularExpression()
             throws Exception {
         final String[] expected = {
-            "17:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
-            "18:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
-            "21:1: " + getCheckMessage(MSG_KEY, "java.util.Enumeration"),
-            "22:1: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
-            "39:1: " + getCheckMessage(MSG_KEY, "java.util.Date"),
-            "40:1: " + getCheckMessage(MSG_KEY, "java.util.Calendar"),
-            "41:1: " + getCheckMessage(MSG_KEY, "java.util.BitSet"),
+            "15:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
+            "16:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
+            "19:1: " + getCheckMessage(MSG_KEY, "java.util.Enumeration"),
+            "20:1: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
+            "37:1: " + getCheckMessage(MSG_KEY, "java.util.Date"),
+            "38:1: " + getCheckMessage(MSG_KEY, "java.util.Calendar"),
+            "39:1: " + getCheckMessage(MSG_KEY, "java.util.BitSet"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputIllegalImportDefault5.java"), expected);
@@ -129,9 +129,9 @@ public void testIllegalPackagesRegularExpression()
     public void testIllegalClassesRegularExpression()
             throws Exception {
         final String[] expected = {
-            "17:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
-            "18:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
-            "22:1: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
+            "15:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
+            "16:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
+            "20:1: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputIllegalImportDefault6.java"), expected);
@@ -141,17 +141,17 @@ public void testIllegalClassesRegularExpression()
     public void testIllegalPackagesAndClassesRegularExpression()
             throws Exception {
         final String[] expected = {
-            "17:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
-            "18:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
-            "21:1: " + getCheckMessage(MSG_KEY, "java.util.Enumeration"),
-            "22:1: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
-            "35:1: " + getCheckMessage(MSG_KEY, "java.awt.Component"),
-            "36:1: " + getCheckMessage(MSG_KEY, "java.awt.Graphics2D"),
-            "37:1: " + getCheckMessage(MSG_KEY, "java.awt.HeadlessException"),
-            "38:1: " + getCheckMessage(MSG_KEY, "java.awt.Label"),
-            "39:1: " + getCheckMessage(MSG_KEY, "java.util.Date"),
-            "40:1: " + getCheckMessage(MSG_KEY, "java.util.Calendar"),
-            "41:1: " + getCheckMessage(MSG_KEY, "java.util.BitSet"),
+            "15:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
+            "16:1: " + getCheckMessage(MSG_KEY, "java.util.List"),
+            "19:1: " + getCheckMessage(MSG_KEY, "java.util.Enumeration"),
+            "20:1: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
+            "33:1: " + getCheckMessage(MSG_KEY, "java.awt.Component"),
+            "34:1: " + getCheckMessage(MSG_KEY, "java.awt.Graphics2D"),
+            "35:1: " + getCheckMessage(MSG_KEY, "java.awt.HeadlessException"),
+            "36:1: " + getCheckMessage(MSG_KEY, "java.awt.Label"),
+            "37:1: " + getCheckMessage(MSG_KEY, "java.util.Date"),
+            "38:1: " + getCheckMessage(MSG_KEY, "java.util.Calendar"),
+            "39:1: " + getCheckMessage(MSG_KEY, "java.util.BitSet"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputIllegalImportDefault7.java"), expected);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java
index 56e633f9f96..680623d8ec4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,15 +19,18 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck.MSG_DISALLOWED;
 import static com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck.MSG_MISSING_FILE;
 import static com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck.MSG_UNKNOWN_PKG;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -339,14 +342,16 @@ public void testCacheWhenFileExternalResourceContentDoesNotChange() throws Excep
         treeWalkerConfig.addChild(checkConfig);
 
         final DefaultConfiguration checkerConfig = createRootConfig(treeWalkerConfig);
-        final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName1 = "junit_" + UUID.randomUUID() + ".java";
+        final File cacheFile = new File(temporaryFolder, uniqueFileName1);
         checkerConfig.addProperty("cacheFile", cacheFile.getPath());
 
-        final String filePath = File.createTempFile("empty", ".java", temporaryFolder).getPath();
+        final String uniqueFileName2 = "empty_" + UUID.randomUUID() + ".java";
+        final File filePath = new File(temporaryFolder, uniqueFileName2);
 
-        execute(checkerConfig, filePath);
+        execute(checkerConfig, filePath.toString());
         // One more time to use cache.
-        execute(checkerConfig, filePath);
+        execute(checkerConfig, filePath.toString());
 
         final String contents = Files.readString(cacheFile.toPath());
         assertWithMessage("External resource is not present in cache")
@@ -439,6 +444,38 @@ public void testBeginTreeCurrentImportControl() throws Exception {
         verifyWithInlineConfigParser(file1, file2, expectedFirstInput, expectedSecondInput);
     }
 
+    @Test
+    public void testImportControlFileName() throws Exception {
+        final String[] expected = {
+            "11:1: " + getCheckMessage(MSG_DISALLOWED, "java.awt.Image"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputImportControlTestRegexpInFile.java"), expected);
+    }
+
+    @Test
+    public void testImportControlFileName2() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        verifyWithInlineConfigParser(
+                getPath("InputImportControlTestRegexpInFile2.java"), expected);
+    }
+
+    @Test
+    public void testImportControlTestException() {
+        final CheckstyleException ex = getExpectedThrowable(CheckstyleException.class,
+                () -> {
+                    verifyWithInlineConfigParser(getPath("InputImportControlTestException.java"));
+                });
+
+        assertThat(ex.getCause().getCause().getCause().getCause().getCause().getMessage())
+                .startsWith("unable to parse file:");
+        assertThat(ex.getCause().getCause().getCause().getCause().getCause().getMessage())
+                .endsWith("- Document root element \"import-control\", must match DOCTYPE"
+                 + " root \"null\".");
+    }
+
     /**
      * Returns String message of original exception that was thrown in
      * ImportControlCheck.setUrl or ImportControlCheck.setFile
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java
index 23b47961698..bb9d9e11c98 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -146,11 +146,11 @@ public void testLoadThrowsException() {
 
     @Test
     public void testInputStreamFailsOnRead() throws Exception {
-        try (InputStream inputStream = mock(InputStream.class)) {
+        try (InputStream inputStream = mock()) {
             final int available = doThrow(IOException.class).when(inputStream).available();
-            final URL url = mock(URL.class);
+            final URL url = mock();
             when(url.openStream()).thenReturn(inputStream);
-            final URI uri = mock(URI.class);
+            final URI uri = mock();
             when(uri.toURL()).thenReturn(url);
 
             final CheckstyleException ex = assertThrows(CheckstyleException.class, () -> {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
index 54d8631ba35..bdadfc7a9bb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,6 +47,14 @@ protected String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/checks/imports/importorder";
     }
 
+    @Test
+    public void testVeryPreciseGrouping() throws Exception {
+        final String[] expected = {};
+
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputImportOrder6.java"), expected);
+    }
+
     @Test
     public void testGetTokens() {
         final ImportOrderCheck checkObj = new ImportOrderCheck();
@@ -334,7 +342,7 @@ public void testHonorsTokenProperty() throws Exception {
     @Test
     public void testWildcard() throws Exception {
         final String[] expected = {
-            "25:1: " + getCheckMessage(MSG_ORDERING, "javax.crypto.Cipher"),
+            "24:1: " + getCheckMessage(MSG_ORDERING, "javax.crypto.Cipher"),
         };
 
         verifyWithInlineConfigParser(
@@ -345,7 +353,7 @@ public void testWildcard() throws Exception {
     public void testWildcardUnspecified() throws Exception {
         final String[] expected = {
             "23:1: " + getCheckMessage(MSG_SEPARATED_IN_GROUP,
-                "com.puppycrawl.tools.checkstyle.checks.imports.importorder.InputImportOrderBug"),
+                "javax.crypto.Cipher"),
         };
 
         verifyWithInlineConfigParser(
@@ -808,8 +816,9 @@ public void testClearState() throws Exception {
                 .that(staticImport.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, staticImport.get(),
-                        "lastImportStatic", lastImportStatic -> !((boolean) lastImportStatic)))
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        staticImport.orElseThrow(), "lastImportStatic",
+                        lastImportStatic -> !(boolean) lastImportStatic))
                 .isTrue();
 
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControlTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControlTest.java
index f8c865d1ae9..a53174cab2e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControlTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportControlTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRuleTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRuleTest.java
index f10ba70a4b6..28e421aaab0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRuleTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/PkgImportRuleTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java
index 312e4c8cce2..4b2cebbb5d2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java
index 92312b21e87..077cb81595a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -69,8 +69,8 @@ public void testReferencedStateIsCleared() throws Exception {
     public void testWithoutProcessJavadoc() throws Exception {
         final String[] expected = {
             "11:8: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks."
-                + "imports.unusedimports.InputUnusedImportsBug"),
+                "com.google.errorprone.annotations."
+                + "concurrent.GuardedBy"),
             "15:8: " + getCheckMessage(MSG_KEY, "java.lang.String"),
             "17:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
             "18:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
@@ -85,19 +85,22 @@ public void testWithoutProcessJavadoc() throws Exception {
             "37:8: " + getCheckMessage(MSG_KEY, "java.util.Date"),
             "38:8: " + getCheckMessage(MSG_KEY, "java.util.Calendar"),
             "39:8: " + getCheckMessage(MSG_KEY, "java.util.BitSet"),
-            "41:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.Checker"),
-            "42:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.CheckerTest"),
-            "43:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.Definitions"),
+            "41:8: " + getCheckMessage(MSG_KEY, "com.google.errorprone."
+                    + "annotations.CheckReturnValue"),
+            "42:8: " + getCheckMessage(MSG_KEY, "com.google.errorprone."
+                    + "annotations.CanIgnoreReturnValue"),
+            "43:8: " + getCheckMessage(MSG_KEY, "com.google.errorprone."
+                    + "annotations.CompatibleWith"),
             "44:8: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks.imports.unusedimports."
-                        + "InputUnusedImports15Extensions"),
+                "com.google.errorprone.annotations.concurrent."
+                        + "LazyInit"),
             "45:8: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest"),
+                "com.google.errorprone.annotations.DoNotCall"),
             "46:8: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.PackageNamesLoader"),
+                "com.google.errorprone.annotations.CompileTimeConstant"),
             "47:8: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.DefaultConfiguration"),
-            "48:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.DefaultLogger"),
+                "com.google.errorprone.annotations.FormatMethod"),
+            "48:8: " + getCheckMessage(MSG_KEY, "com.google.errorprone.annotations.FormatString"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputUnusedImports2.java"), expected);
@@ -107,8 +110,8 @@ public void testWithoutProcessJavadoc() throws Exception {
     public void testProcessJavadoc() throws Exception {
         final String[] expected = {
             "11:8: " + getCheckMessage(MSG_KEY,
-                    "com.puppycrawl.tools.checkstyle.checks."
-                    + "imports.unusedimports.InputUnusedImportsBug"),
+                    "com.google.errorprone.annotations."
+                    + "concurrent.GuardedBy"),
             "15:8: " + getCheckMessage(MSG_KEY, "java.lang.String"),
             "17:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
             "18:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
@@ -118,7 +121,7 @@ public void testProcessJavadoc() throws Exception {
             "31:15: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
             // "30:8: Unused import - java.awt.Component.", // Should be detected
             "36:8: " + getCheckMessage(MSG_KEY, "java.awt.Label"),
-            "48:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.DefaultLogger"),
+            "48:8: " + getCheckMessage(MSG_KEY, "com.google.errorprone.annotations.ForOverride"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputUnusedImports.java"), expected);
@@ -327,4 +330,55 @@ public void testStateIsClearedOnBeginTreeCollect() throws Exception {
         );
         verifyWithInlineConfigParser(file1, file2, expectedFirstInput, expectedSecondInput);
     }
+
+    @Test
+    public void testStaticMethodRefImports() throws Exception {
+        final String[] expected = {
+            "26:15: " + getCheckMessage(MSG_KEY, "java.lang.String.format"),
+            "27:15: " + getCheckMessage(MSG_KEY, "java.util.Arrays.sort"),
+            "28:15: " + getCheckMessage(MSG_KEY, "java.util.List.of"),
+            "29:15: " + getCheckMessage(MSG_KEY, "java.util.Collections.emptyMap"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedImportsFromStaticMethodRef.java"), expected);
+    }
+
+    @Test
+    public void testStaticMethodRefImportsExtended() throws Exception {
+        final String[] expected = {
+            "17:8: " + getCheckMessage(MSG_KEY, "java.util.Objects"),
+            "18:15: " + getCheckMessage(MSG_KEY, "java.util.Arrays.toString"),
+            "19:15: " + getCheckMessage(MSG_KEY, "java.util.Arrays.asList"),
+            "20:15: " + getCheckMessage(MSG_KEY, "java.lang.Integer.parseInt"),
+            "21:15: " + getCheckMessage(MSG_KEY, "java.util.Collections.emptyList"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedImportsFromStaticMethodRefExtended.java"), expected);
+    }
+
+    @Test
+    public void testStaticMethodRefImportsWithJavadocDisabled() throws Exception {
+        final String[] expected = {
+            "24:8: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
+            "25:15: " + getCheckMessage(MSG_KEY, "java.lang.Integer.parseInt"),
+            "26:15: " + getCheckMessage(MSG_KEY, "java.lang.String.format"),
+            "27:15: " + getCheckMessage(MSG_KEY, "java.util.List.of"),
+            "28:15: " + getCheckMessage(MSG_KEY, "java.util.Collections.emptyMap"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedImportsFromStaticMethodRefJavadocDisabled.java"), expected);
+    }
+
+    @Test
+    public void testStaticMethodRefImportsInDocsOnly() throws Exception {
+        final String[] expected = {
+            "11:8: " + getCheckMessage(MSG_KEY, "java.lang.Integer"),
+            "12:15: " + getCheckMessage(MSG_KEY, "java.util.Collections.emptyEnumeration"),
+            "13:15: " + getCheckMessage(MSG_KEY, "java.util.Arrays.sort"),
+            "14:15: " + getCheckMessage(MSG_KEY, "java.util.Collections.shuffle"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputUnusedImportsFromStaticMethodRefInDocsOnly.java"), expected);
+    }
+
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java
index b3506e9747b..5f6fe4406fc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,7 @@ protected String getPackageLocation() {
     }
 
     @Test
-    public void testCommentIsAtTheEndOfBlock() throws Exception {
+    public void testCommentIsAtTheEndOfBlockOne() throws Exception {
         final String[] expected = {
             "25:26: " + getCheckMessage(MSG_KEY_SINGLE, 24, 25, 8),
             "40:6: " + getCheckMessage(MSG_KEY_SINGLE, 42, 5, 4),
@@ -49,51 +49,91 @@ public void testCommentIsAtTheEndOfBlock() throws Exception {
             "81:19: " + getCheckMessage(MSG_KEY_SINGLE, 77, 18, 8),
             "95:32: " + getCheckMessage(MSG_KEY_SINGLE, 92, 31, 8),
             "107:22: " + getCheckMessage(MSG_KEY_SINGLE, 105, 21, 8),
-            "122:30: " + getCheckMessage(MSG_KEY_SINGLE, 123, 29, 12),
-            "145:27: " + getCheckMessage(MSG_KEY_SINGLE, 138, 26, 8),
-            "171:34: " + getCheckMessage(MSG_KEY_SINGLE, 168, 33, 8),
-            "181:22: " + getCheckMessage(MSG_KEY_SINGLE, 180, 21, 8),
-            "193:35: " + getCheckMessage(MSG_KEY_SINGLE, 191, 34, 8),
-            "215:27: " + getCheckMessage(MSG_KEY_SINGLE, 213, 26, 8),
-            "221:1: " + getCheckMessage(MSG_KEY_SINGLE, 220, 0, 8),
-            "235:13: " + getCheckMessage(MSG_KEY_SINGLE, 232, 12, 8),
-            "241:1: " + getCheckMessage(MSG_KEY_SINGLE, 240, 0, 8),
-            "255:13: " + getCheckMessage(MSG_KEY_SINGLE, 252, 12, 8),
-            "262:1: " + getCheckMessage(MSG_KEY_SINGLE, 259, 0, 8),
-            "272:15: " + getCheckMessage(MSG_KEY_SINGLE, 271, 14, 8),
-            "278:10: " + getCheckMessage(MSG_KEY_SINGLE, 276, 9, 8),
-            "284:10: " + getCheckMessage(MSG_KEY_SINGLE, 283, 9, 8),
-            "323:10: " + getCheckMessage(MSG_KEY_SINGLE, 322, 9, 8),
-            "329:1: " + getCheckMessage(MSG_KEY_SINGLE, 330, 0, 4),
-            "343:1: " + getCheckMessage(MSG_KEY_SINGLE, 340, 0, 8),
-            "362:10: " + getCheckMessage(MSG_KEY_SINGLE, 359, 9, 8),
-            "388:13: " + getCheckMessage(MSG_KEY_BLOCK, 389, 12, 8),
-            "391:13: " + getCheckMessage(MSG_KEY_SINGLE, 389, 12, 8),
-            "401:13: " + getCheckMessage(MSG_KEY_SINGLE, 400, 12, 8),
-            "408:9: " + getCheckMessage(MSG_KEY_SINGLE, 409, 8, 10),
-            "465:1: " + getCheckMessage(MSG_KEY_SINGLE, 463, 0, 8),
-            "481:11: " + getCheckMessage(MSG_KEY_BLOCK, 477, 10, 8),
-            "491:11: " + getCheckMessage(MSG_KEY_BLOCK, 485, 10, 8),
-            "499:11: " + getCheckMessage(MSG_KEY_BLOCK, 495, 10, 8),
-            "507:11: " + getCheckMessage(MSG_KEY_BLOCK, 503, 10, 8),
-            "515:11: " + getCheckMessage(MSG_KEY_BLOCK, 511, 10, 8),
-            "526:11: " + getCheckMessage(MSG_KEY_SINGLE, 519, 10, 8),
-            "533:1: " + getCheckMessage(MSG_KEY_SINGLE, 530, 0, 8),
-            "540:1: " + getCheckMessage(MSG_KEY_SINGLE, 537, 0, 8),
-            "546:1: " + getCheckMessage(MSG_KEY_SINGLE, 544, 0, 8),
-            "554:5: " + getCheckMessage(MSG_KEY_SINGLE, 550, 4, 8),
-            "559:13: " + getCheckMessage(MSG_KEY_SINGLE, 558, 12, 8),
-            "565:1: " + getCheckMessage(MSG_KEY_SINGLE, 563, 0, 8),
-            "570:1: " + getCheckMessage(MSG_KEY_SINGLE, 569, 0, 8),
-            "585:1: " + getCheckMessage(MSG_KEY_SINGLE, 582, 0, 8),
-            "597:13: " + getCheckMessage(MSG_KEY_SINGLE, 595, 12, 8),
         };
-        final String testInputFile = "InputCommentsIndentationCommentIsAtTheEndOfBlock.java";
+        final String testInputFile = "InputCommentsIndentationCommentIsAtTheEndOfBlockOne.java";
         verifyWithInlineConfigParser(getPath(testInputFile), expected);
     }
 
     @Test
-    public void testCommentIsInsideSwitchBlock() throws Exception {
+    public void testCommentIsAtTheEndOfBlockTwo() throws Exception {
+        final String[] expected = {
+            "22:30: " + getCheckMessage(MSG_KEY_SINGLE, 23, 29, 12),
+            "45:27: " + getCheckMessage(MSG_KEY_SINGLE, 38, 26, 8),
+            "71:34: " + getCheckMessage(MSG_KEY_SINGLE, 68, 33, 8),
+            "81:22: " + getCheckMessage(MSG_KEY_SINGLE, 80, 21, 8),
+            "93:35: " + getCheckMessage(MSG_KEY_SINGLE, 91, 34, 8),
+            "115:27: " + getCheckMessage(MSG_KEY_SINGLE, 113, 26, 8),
+        };
+        final String testInputFile = "InputCommentsIndentationCommentIsAtTheEndOfBlockTwo.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsAtTheEndOfBlockThree() throws Exception {
+        final String[] expected = {
+            "21:1: " + getCheckMessage(MSG_KEY_SINGLE, 20, 0, 8),
+            "35:13: " + getCheckMessage(MSG_KEY_SINGLE, 32, 12, 8),
+            "42:1: " + getCheckMessage(MSG_KEY_SINGLE, 40, 0, 8),
+            "56:13: " + getCheckMessage(MSG_KEY_SINGLE, 53, 12, 8),
+            "63:1: " + getCheckMessage(MSG_KEY_SINGLE, 60, 0, 8),
+            "73:15: " + getCheckMessage(MSG_KEY_SINGLE, 72, 14, 8),
+            "79:10: " + getCheckMessage(MSG_KEY_SINGLE, 77, 9, 8),
+            "85:10: " + getCheckMessage(MSG_KEY_SINGLE, 84, 9, 8),
+        };
+        final String testInputFile = "InputCommentsIndentationCommentIsAtTheEndOfBlockThree.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsAtTheEndOfBlockFour() throws Exception {
+        final String[] expected = {
+            "22:10: " + getCheckMessage(MSG_KEY_SINGLE, 21, 9, 8),
+            "28:1: " + getCheckMessage(MSG_KEY_SINGLE, 29, 0, 4),
+            "41:1: " + getCheckMessage(MSG_KEY_SINGLE, 38, 0, 8),
+            "60:10: " + getCheckMessage(MSG_KEY_SINGLE, 57, 9, 8),
+            "86:13: " + getCheckMessage(MSG_KEY_BLOCK, 87, 12, 8),
+            "89:13: " + getCheckMessage(MSG_KEY_SINGLE, 87, 12, 8),
+            "99:13: " + getCheckMessage(MSG_KEY_SINGLE, 98, 12, 8),
+            "106:9: " + getCheckMessage(MSG_KEY_SINGLE, 109, 8, 10),
+        };
+        final String testInputFile = "InputCommentsIndentationCommentIsAtTheEndOfBlockFour.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsAtTheEndOfBlockFive() throws Exception {
+        final String[] expected = {
+            "61:1: " + getCheckMessage(MSG_KEY_SINGLE, 59, 0, 8),
+            "77:11: " + getCheckMessage(MSG_KEY_BLOCK, 73, 10, 8),
+            "87:11: " + getCheckMessage(MSG_KEY_BLOCK, 81, 10, 8),
+            "95:11: " + getCheckMessage(MSG_KEY_BLOCK, 91, 10, 8),
+            "103:11: " + getCheckMessage(MSG_KEY_BLOCK, 99, 10, 8),
+            "111:11: " + getCheckMessage(MSG_KEY_BLOCK, 107, 10, 8),
+        };
+        final String testInputFile = "InputCommentsIndentationCommentIsAtTheEndOfBlockFive.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsAtTheEndOfBlockSix() throws Exception {
+        final String[] expected = {
+            "26:11: " + getCheckMessage(MSG_KEY_SINGLE, 19, 10, 8),
+            "33:1: " + getCheckMessage(MSG_KEY_SINGLE, 30, 0, 8),
+            "39:1: " + getCheckMessage(MSG_KEY_SINGLE, 36, 0, 8),
+            "45:1: " + getCheckMessage(MSG_KEY_SINGLE, 43, 0, 8),
+            "52:5: " + getCheckMessage(MSG_KEY_SINGLE, 48, 4, 8),
+            "56:13: " + getCheckMessage(MSG_KEY_SINGLE, 55, 12, 8),
+            "62:1: " + getCheckMessage(MSG_KEY_SINGLE, 60, 0, 8),
+            "67:1: " + getCheckMessage(MSG_KEY_SINGLE, 66, 0, 8),
+            "82:1: " + getCheckMessage(MSG_KEY_SINGLE, 79, 0, 8),
+            "94:13: " + getCheckMessage(MSG_KEY_SINGLE, 92, 12, 8),
+        };
+        final String testInputFile = "InputCommentsIndentationCommentIsAtTheEndOfBlockSix.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsInsideSwitchBlockOne() throws Exception {
         final String[] expected = {
             "27:13: " + getCheckMessage(MSG_KEY_BLOCK, 28, 12, 16),
             "33:20: " + getCheckMessage(MSG_KEY_SINGLE, "32, 34", 19, "16, 12"),
@@ -103,20 +143,47 @@ public void testCommentIsInsideSwitchBlock() throws Exception {
             "67:23: " + getCheckMessage(MSG_KEY_SINGLE, 66, 22, 16),
             "76:15: " + getCheckMessage(MSG_KEY_SINGLE, "73, 77", 14, "12, 16"),
             "96:25: " + getCheckMessage(MSG_KEY_SINGLE, 97, 24, 20),
-            "121:16: " + getCheckMessage(MSG_KEY_SINGLE, "120, 122", 15, "17, 12"),
-            "133:9: " + getCheckMessage(MSG_KEY_SINGLE, 134, 8, 12),
-            "146:5: " + getCheckMessage(MSG_KEY_SINGLE, 147, 4, 8),
-            "165:19: " + getCheckMessage(MSG_KEY_SINGLE, "164, 166", 18, "16, 12"),
-            "208:5: " + getCheckMessage(MSG_KEY_SINGLE, "207, 209", 4, "12, 12"),
-            "211:23: " + getCheckMessage(MSG_KEY_SINGLE, "210, 214", 22, "16, 12"),
-            "212:21: " + getCheckMessage(MSG_KEY_SINGLE, "210, 214", 20, "16, 12"),
-            "213:18: " + getCheckMessage(MSG_KEY_SINGLE, "210, 214", 17, "16, 12"),
-            "237:7: " + getCheckMessage(MSG_KEY_SINGLE, "236, 238", 6, "12, 12"),
-            "284:12: " + getCheckMessage(MSG_KEY_BLOCK, "283, 287", 11, "16, 12"),
-            "289:12: " + getCheckMessage(MSG_KEY_SINGLE, "288, 290", 11, "16, 12"),
-            "319:1: " + getCheckMessage(MSG_KEY_SINGLE, "320", 0, "8"),
         };
-        final String testInputFile = "InputCommentsIndentationInSwitchBlock.java";
+        final String testInputFile = "InputCommentsIndentationInSwitchBlockOne.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsInsideSwitchBlockTwo() throws Exception {
+        final String[] expected = {
+            "18:25: " + getCheckMessage(MSG_KEY_SINGLE, 19, 24, 20),
+            "43:16: " + getCheckMessage(MSG_KEY_SINGLE, "42, 44", 15, "17, 12"),
+            "55:9: " + getCheckMessage(MSG_KEY_SINGLE, 56, 8, 12),
+            "68:5: " + getCheckMessage(MSG_KEY_SINGLE, 69, 4, 8),
+            "87:19: " + getCheckMessage(MSG_KEY_SINGLE, "86, 88", 18, "16, 12"),
+        };
+        final String testInputFile = "InputCommentsIndentationInSwitchBlockTwo.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsInsideSwitchBlockThree() throws Exception {
+        final String[] expected = {
+            "18:25: " + getCheckMessage(MSG_KEY_SINGLE, 19, 24, 20),
+            "45:5: " + getCheckMessage(MSG_KEY_SINGLE, "44, 46", 4, "12, 12"),
+            "48:23: " + getCheckMessage(MSG_KEY_SINGLE, "47, 51", 22, "16, 12"),
+            "49:21: " + getCheckMessage(MSG_KEY_SINGLE, "47, 51", 20, "16, 12"),
+            "50:18: " + getCheckMessage(MSG_KEY_SINGLE, "47, 51", 17, "16, 12"),
+            "74:7: " + getCheckMessage(MSG_KEY_SINGLE, "73, 75", 6, "12, 12"),
+        };
+        final String testInputFile = "InputCommentsIndentationInSwitchBlockThree.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCommentIsInsideSwitchBlockFour() throws Exception {
+        final String[] expected = {
+            "18:25: " + getCheckMessage(MSG_KEY_SINGLE, 19, 24, 20),
+            "34:12: " + getCheckMessage(MSG_KEY_BLOCK, "33, 37", 11, "16, 12"),
+            "39:12: " + getCheckMessage(MSG_KEY_SINGLE, "38, 40", 11, "16, 12"),
+            "69:1: " + getCheckMessage(MSG_KEY_SINGLE, "70", 0, "8"),
+        };
+        final String testInputFile = "InputCommentsIndentationInSwitchBlockFour.java";
         verifyWithInlineConfigParser(getPath(testInputFile), expected);
     }
 
@@ -136,7 +203,7 @@ public void testCommentIsInsideEmptyBlock() throws Exception {
     }
 
     @Test
-    public void testSurroundingCode() throws Exception {
+    public void testSurroundingCodeOne() throws Exception {
         final String[] expected = {
             "20:15: " + getCheckMessage(MSG_KEY_SINGLE, 21, 14, 12),
             "31:17: " + getCheckMessage(MSG_KEY_BLOCK, 32, 16, 12),
@@ -146,12 +213,20 @@ public void testSurroundingCode() throws Exception {
             "59:24: " + getCheckMessage(MSG_KEY_BLOCK, 61, 23, 36),
             "98:15: " + getCheckMessage(MSG_KEY_SINGLE, 99, 14, 8),
             "106:14: " + getCheckMessage(MSG_KEY_SINGLE, 108, 13, 8),
-            "116:34: " + getCheckMessage(MSG_KEY_SINGLE, 117, 33, 8),
-            "138:13: " + getCheckMessage(MSG_KEY_BLOCK, 139, 12, 8),
-            "144:5: " + getCheckMessage(MSG_KEY_BLOCK, 145, 4, 8),
-            "151:5: " + getCheckMessage(MSG_KEY_BLOCK, 149, 4, 8),
         };
-        final String testInputFile = "InputCommentsIndentationSurroundingCode.java";
+        final String testInputFile = "InputCommentsIndentationSurroundingCodeOne.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testSurroundingCodeTwo() throws Exception {
+        final String[] expected = {
+            "20:34: " + getCheckMessage(MSG_KEY_SINGLE, 21, 33, 8),
+            "42:13: " + getCheckMessage(MSG_KEY_BLOCK, 43, 12, 8),
+            "48:5: " + getCheckMessage(MSG_KEY_BLOCK, 49, 4, 8),
+            "55:5: " + getCheckMessage(MSG_KEY_BLOCK, 53, 4, 8),
+        };
+        final String testInputFile = "InputCommentsIndentationSurroundingCodeTwo.java";
         verifyWithInlineConfigParser(getPath(testInputFile), expected);
     }
 
@@ -171,22 +246,30 @@ public void testCheckOnlySingleLineComments() throws Exception {
             "105:14: " + getCheckMessage(MSG_KEY_SINGLE, 107, 13, 8),
             "115:34: " + getCheckMessage(MSG_KEY_SINGLE, 116, 33, 8),
         };
-        final String testInputFile = "InputCommentsIndentationSurroundingCode2.java";
+        final String testInputFile = "InputCommentsIndentationSurroundingCode2One.java";
         verifyWithInlineConfigParser(getPath(testInputFile), expected);
     }
 
     @Test
-    public void testCheckOnlyBlockComments() throws Exception {
+    public void testCheckOnlyBlockCommentsOne() throws Exception {
         final String[] expected = {
             "30:17: " + getCheckMessage(MSG_KEY_BLOCK, 31, 16, 12),
             "32:17: " + getCheckMessage(MSG_KEY_BLOCK, 34, 16, 12),
             "35:17: " + getCheckMessage(MSG_KEY_BLOCK, 38, 16, 12),
             "57:24: " + getCheckMessage(MSG_KEY_BLOCK, 59, 23, 36),
-            "133:13: " + getCheckMessage(MSG_KEY_BLOCK, 134, 12, 8),
-            "139:5: " + getCheckMessage(MSG_KEY_BLOCK, 140, 4, 8),
-            "146:5: " + getCheckMessage(MSG_KEY_BLOCK, 144, 4, 8),
         };
-        final String testInputFile = "InputCommentsIndentationSurroundingCode3.java";
+        final String testInputFile = "InputCommentsIndentationSurroundingCode3One.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testCheckOnlyBlockCommentsTwo() throws Exception {
+        final String[] expected = {
+            "40:13: " + getCheckMessage(MSG_KEY_BLOCK, 41, 12, 8),
+            "46:5: " + getCheckMessage(MSG_KEY_BLOCK, 47, 4, 8),
+            "53:5: " + getCheckMessage(MSG_KEY_BLOCK, 51, 4, 8),
+        };
+        final String testInputFile = "InputCommentsIndentationSurroundingCode3Two.java";
         verifyWithInlineConfigParser(getPath(testInputFile), expected);
     }
 
@@ -221,7 +304,7 @@ public void testJavadoc() throws Exception {
     }
 
     @Test
-    public void testMultiblockStructures() throws Exception {
+    public void testMultiblockStructuresOne() throws Exception {
         final String[] expected = {
             "19:9: " + getCheckMessage(MSG_KEY_SINGLE, 18, 8, 12),
             "25:17: " + getCheckMessage(MSG_KEY_SINGLE, "24, 26", 16, "12, 8"),
@@ -238,11 +321,19 @@ public void testMultiblockStructures() throws Exception {
             "103:9: " + getCheckMessage(MSG_KEY_SINGLE, 102, 8, 12),
             "109:1: " + getCheckMessage(MSG_KEY_SINGLE, "108, 110", 0, "12, 8"),
             "114:17: " + getCheckMessage(MSG_KEY_SINGLE, "113, 115", 16, "12, 8"),
-            "124:9: " + getCheckMessage(MSG_KEY_SINGLE, 123, 8, 12),
-            "130:17: " + getCheckMessage(MSG_KEY_SINGLE, "129, 131", 16, "12, 8"),
-            "135:1: " + getCheckMessage(MSG_KEY_SINGLE, "134, 136", 0, "12, 8"),
         };
-        final String testInputFile = "InputCommentsIndentationInMultiblockStructures.java";
+        final String testInputFile = "InputCommentsIndentationInMultiblockStructuresOne.java";
+        verifyWithInlineConfigParser(getPath(testInputFile), expected);
+    }
+
+    @Test
+    public void testMultiblockStructuresTwo() throws Exception {
+        final String[] expected = {
+            "20:9: " + getCheckMessage(MSG_KEY_SINGLE, 19, 8, 12),
+            "26:17: " + getCheckMessage(MSG_KEY_SINGLE, "25, 27", 16, "12, 8"),
+            "31:1: " + getCheckMessage(MSG_KEY_SINGLE, "30, 32", 0, "12, 8"),
+        };
+        final String testInputFile = "InputCommentsIndentationInMultiblockStructuresTwo.java";
         verifyWithInlineConfigParser(getPath(testInputFile), expected);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java
index fb656764e6f..67a6c076029 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -1121,9 +1121,20 @@ public void testInvalidNewKeywordWithForceStrictCondition() throws Exception {
         checkConfig.addProperty("tabWidth", "4");
         checkConfig.addProperty("throwsIndent", "8");
         final String[] expected = {
-            "23:17: " + getCheckMessage(MSG_ERROR, "new", 16, 24),
-            "24:21: " + getCheckMessage(MSG_CHILD_ERROR_MULTI, "object def", 20, "28, 32, 36"),
-            "25:17: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 16, "24, 28, 32"),
+            "21:12: " + getCheckMessage(MSG_ERROR, "]", 11, 12),
+            "25:5: " + getCheckMessage(MSG_ERROR, "[", 4, 12),
+            "32:17: " + getCheckMessage(MSG_ERROR, "new", 16, 24),
+            "33:21: " + getCheckMessage(MSG_CHILD_ERROR_MULTI, "object def", 20, "28, 32, 36"),
+            "34:17: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 16, "24, 28, 32"),
+            "37:36: " + getCheckMessage(MSG_ERROR, "+", 35, 16),
+            "41:35: " + getCheckMessage(MSG_ERROR, "]", 34, 16),
+            "45:36: " + getCheckMessage(MSG_ERROR, "42", 35, 16),
+            "49:36: " + getCheckMessage(MSG_ERROR, "+", 35, 16),
+            "50:36: " + getCheckMessage(MSG_ERROR, "+", 35, 16),
+            "55:21: " + getCheckMessage(MSG_ERROR, "1", 20, 16),
+            "59:13: " + getCheckMessage(MSG_ERROR, "fun2", 12, 16),
+            "78:11: " + getCheckMessage(MSG_ERROR, "Object", 10, 12),
+            "82:16: " + getCheckMessage(MSG_ERROR, "]", 15, 12),
         };
         verifyWarns(checkConfig,
             getPath("InputIndentationNewWithForceStrictCondition.java"), expected);
@@ -1277,7 +1288,7 @@ public void testInvalidArrayInitWithChecker()
             "110:15: " + getCheckMessage(MSG_CHILD_ERROR, "array initialization", 14, 12),
             "111:11: " + getCheckMessage(MSG_CHILD_ERROR, "array initialization", 10, 12),
             "112:7: " + getCheckMessage(MSG_ERROR_MULTI, "array initialization rcurly", 6, "8, 12"),
-            // following are tests for annotation array initialisation
+            // following are tests for annotation array initialization
             "120:13: " + getCheckMessage(MSG_CHILD_ERROR_MULTI, "annotation array initialization",
                 12, "16, 46, 48"),
             "124:15: " + getCheckMessage(MSG_CHILD_ERROR_MULTI, "annotation array initialization",
@@ -1389,7 +1400,7 @@ public void testInvalidArrayInitWithTrueStrictCondition()
             "110:15: " + getCheckMessage(MSG_CHILD_ERROR, "array initialization", 14, 12),
             "111:11: " + getCheckMessage(MSG_CHILD_ERROR, "array initialization", 10, 12),
             "112:7: " + getCheckMessage(MSG_ERROR_MULTI, "array initialization rcurly", 6, "8, 12"),
-            // following are tests for annotation array initialisation
+            // following are tests for annotation array initialization
             "120:13: " + getCheckMessage(MSG_CHILD_ERROR_MULTI, "annotation array initialization",
                 12, "16, 46, 48"),
             "124:15: " + getCheckMessage(MSG_CHILD_ERROR_MULTI, "annotation array initialization",
@@ -2257,13 +2268,13 @@ public void testAnonymousClassInMethodWithCurlyOnNewLine() throws Exception {
         checkConfig.addProperty("throwsIndent", "4");
         checkConfig.addProperty("arrayInitIndent", "4");
         final String[] expected = {
-            "40:19: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 18, "16, 20, 24"),
-            "42:15: " + getCheckMessage(MSG_ERROR, "new", 14, 16),
-            "48:15: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 14, "16, 20, 24"),
-            "60:19: " + getCheckMessage(MSG_ERROR_MULTI, "object def lcurly", 18, "16, 20, 24"),
-            "66:19: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 18, "16, 20, 24"),
-            "69:15: " + getCheckMessage(MSG_ERROR_MULTI, "object def lcurly", 14, "16, 20, 24"),
-            "75:15: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 14, "16, 20, 24"),
+            "38:19: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 18, "16, 20, 24"),
+            "40:15: " + getCheckMessage(MSG_ERROR, "new", 14, 16),
+            "46:15: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 14, "16, 20, 24"),
+            "58:19: " + getCheckMessage(MSG_ERROR_MULTI, "object def lcurly", 18, "16, 20, 24"),
+            "64:19: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 18, "16, 20, 24"),
+            "67:15: " + getCheckMessage(MSG_ERROR_MULTI, "object def lcurly", 14, "16, 20, 24"),
+            "73:15: " + getCheckMessage(MSG_ERROR_MULTI, "object def rcurly", 14, "16, 20, 24"),
         };
         verifyWarns(checkConfig,
             getPath("InputIndentationAnonymousClassInMethodCurlyOnNewLine.java"), expected);
@@ -2703,6 +2714,7 @@ public void testNewHandler() throws Exception {
             "12:1: " + getCheckMessage(MSG_ERROR, "(", 0, 12),
             "15:1: " + getCheckMessage(MSG_CHILD_ERROR, "new", 0, 8),
             "17:1: " + getCheckMessage(MSG_ERROR, "new lparen", 0, 8),
+            "25:1: " + getCheckMessage(MSG_ERROR, "=", 0, 8),
         };
         verifyWarns(checkConfig, getPath("InputIndentationNewHandler.java"), expected);
     }
@@ -2830,6 +2842,22 @@ public void testIndentationSwitchExpressionDeclaration() throws Exception {
             expected);
     }
 
+    @Test
+    public void testIndentationSwitchExpressionDeclarationLeftCurlyNewLine() throws Exception {
+        final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class);
+        checkConfig.addProperty("tabWidth", "4");
+        final String[] expected = {
+            "34:5: " + getCheckMessage(MSG_ERROR, "switch lcurly", 4, 8),
+            "42:5: " + getCheckMessage(MSG_ERROR, "switch lcurly", 4, 8),
+            "50:13: " + getCheckMessage(MSG_ERROR, "switch lcurly", 12, 8),
+            "58:13: " + getCheckMessage(MSG_ERROR, "switch lcurly", 12, 8),
+        };
+        verifyWarns(checkConfig,
+            getNonCompilablePath(
+                    "InputIndentationCheckSwitchExpressionDeclarationLCurlyNewLine.java"),
+            expected);
+    }
+
     @Test
     public void testIndentationRecords() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(IndentationCheck.class);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java
index 2316cfa97c1..3db51998bc1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,15 +24,12 @@
 import static com.puppycrawl.tools.checkstyle.JavadocDetailNodeParser.MSG_UNCLOSED_HTML_TAG;
 import static com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.MSG_JAVADOC_MISSED_HTML_CLOSE;
 import static com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.MSG_JAVADOC_WRONG_SINGLETON_TAG;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck.MSG_TAG_FORMAT;
 import static com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck.MSG_SUMMARY_FIRST_SENTENCE;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 import java.io.File;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.UUID;
 
 import org.itsallcode.io.Capturable;
 import org.itsallcode.junit.sysextensions.SystemErrGuard;
@@ -75,70 +72,75 @@ public void setUp(@SysErr Capturable systemErr) {
 
     @Test
     public void testJavadocTagsWithoutArgs() throws Exception {
-        final DefaultConfiguration checkconfig = createModuleConfig(TempCheck.class);
         final String[] expected = {
-            "14: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 4,
+            "16: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 4,
                     "no viable alternative at input '<EOF>'", "JAVADOC_TAG"),
-            "27: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 10,
+            "29: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 10,
                     "no viable alternative at input '<EOF>'", "JAVADOC_TAG"),
-            "33: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 7,
+            "35: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 7,
                     "no viable alternative at input '<EOF>'", "JAVADOC_TAG"),
-            "44: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 6,
+            "46: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 6,
                     "no viable alternative at input '<EOF>'", "JAVADOC_TAG"),
-            "66: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 13,
+            "68: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 13,
                     "mismatched input '}' expecting {LEADING_ASTERISK, WS, NEWLINE}",
                     "JAVADOC_INLINE_TAG"),
-            "75: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 19,
+            "78: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 19,
                     "no viable alternative at input '}'", "REFERENCE"),
         };
-        verify(checkconfig, getPath("InputAbstractJavadocJavadocTagsWithoutArgs.java"), expected);
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocJavadocTagsWithoutArgs.java"), expected);
     }
 
     @Test
     public void testNumberFormatException() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
         final String[] expected = {
-            "7: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 52,
+            "8: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 52,
                     "mismatched input ';' expecting MEMBER", "REFERENCE"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocNumberFormatException.java"), expected);
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNumberFormatException.java"), expected);
     }
 
     @Test
     public void testCustomTag() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAbstractJavadocCustomTag.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocCustomTag.java"), expected);
     }
 
     @Test
     public void testParsingErrors(@SysErr Capturable systemErr) throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
         final String[] expected = {
-            "8: " + getCheckMessage(MSG_JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
-            "13: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 35, "img"),
+            "9: " + getCheckMessage(MSG_JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
+            "16: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 35, "img"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocParsingErrors.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocParsingErrors.java"), expected);
         assertWithMessage("Error is unexpected")
             .that(systemErr.getCapturedData())
             .isEqualTo("");
     }
 
     @Test
-    public void testWithMultipleChecks() throws Exception {
+    public void testWithMultipleChecksOne() throws Exception {
         verifyWithInlineConfigParser(
-                getPath("InputAbstractJavadocCorrectParagraph.java"),
+                getPath("InputAbstractJavadocCorrectParagraphOne.java"),
+                CommonUtil.EMPTY_STRING_ARRAY);
+    }
+
+    @Test
+    public void testWithMultipleChecksTwo() throws Exception {
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocCorrectParagraphTwo.java"),
                 CommonUtil.EMPTY_STRING_ARRAY);
     }
 
     @Test
     public void testAntlrError(@SysErr Capturable systemErr) throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
         final String[] expected = {
-            "8: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 78,
+            "9: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 78,
                     "mismatched input '(' expecting <EOF>", "JAVADOC"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocInvalidAtSeeReference.java"), expected);
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocInvalidAtSeeReference.java"), expected);
         assertWithMessage("Error is unexpected")
             .that(systemErr.getCapturedData())
             .isEqualTo("");
@@ -147,70 +149,115 @@ public void testAntlrError(@SysErr Capturable systemErr) throws Exception {
     @Test
     public void testCheckReuseAfterParseErrorWithFollowingAntlrErrorInTwoFiles(
             @SysErr Capturable systemErr) throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
-        final Map<String, List<String>> expectedMessages = new LinkedHashMap<>(2);
-        expectedMessages.put(getPath("InputAbstractJavadocParsingErrors2.java"), asList(
-            "8: " + getCheckMessage(MSG_JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
-            "13: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 35, "img")
-        ));
-        expectedMessages.put(getPath("InputAbstractJavadocInvalidAtSeeReference2.java"),
-            singletonList("8: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 78,
-                    "mismatched input '(' expecting <EOF>", "JAVADOC")
-        ));
-        verify(createChecker(checkConfig), new File[] {
-            new File(getPath("InputAbstractJavadocParsingErrors2.java")),
-            new File(getPath("InputAbstractJavadocInvalidAtSeeReference2.java")), },
-                expectedMessages);
+        final String[] expectedMessagesForFile1 = {
+            "9: " + getCheckMessage(MSG_JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
+            "16: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 35, "img"),
+        };
+        verifyWithInlineConfigParser(getPath(
+                "InputAbstractJavadocParsingErrors2.java"), expectedMessagesForFile1);
+
+        final String[] expectedMessagesForFile2 = {
+            "9: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 78,
+                    "mismatched input '(' expecting <EOF>", "JAVADOC"),
+        };
+        verifyWithInlineConfigParser(getPath(
+                "InputAbstractJavadocInvalidAtSeeReference2.java"), expectedMessagesForFile2);
+
         assertWithMessage("Error is unexpected")
-            .that(systemErr.getCapturedData())
-            .isEqualTo("");
+                .that(systemErr.getCapturedData())
+                .isEqualTo("");
     }
 
     @Test
     public void testCheckReuseAfterParseErrorWithFollowingAntlrErrorInSingleFile()
             throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
         final String[] expected = {
-            "8: " + getCheckMessage(MSG_JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
-            "13: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 82,
+            "9: " + getCheckMessage(MSG_JAVADOC_MISSED_HTML_CLOSE, 4, "unclosedTag"),
+            "16: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR, 82,
                     "mismatched input '(' expecting <EOF>", "JAVADOC"),
         };
-        verify(checkConfig,
+        verifyWithInlineConfigParser(
             getPath("InputAbstractJavadocUnclosedTagAndInvalidAtSeeReference.java"), expected);
     }
 
     @Test
-    public void testPosition()
-            throws Exception {
+    public void testCache() throws Exception {
+        final String[] expected = {
+            "12: " + getCheckMessage(SummaryJavadocCheck.class, MSG_SUMMARY_FIRST_SENTENCE),
+        };
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocCache1.java"),
+            getPath("InputAbstractJavadocCache2.java"), expected);
+    }
+
+    @Test
+    public void testPositionOne() throws Exception {
         JavadocCatchCheck.clearCounter();
-        final DefaultConfiguration checkConfig = createModuleConfig(JavadocCatchCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAbstractJavadocPosition.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocPositionOne.java"), expected);
         assertWithMessage("Invalid number of javadocs")
             .that(JavadocCatchCheck.javadocsNumber)
-            .isEqualTo(65);
+            .isEqualTo(21);
     }
 
     @Test
-    public void testPositionWithSinglelineComments()
-            throws Exception {
+    public void testPositionTwo() throws Exception {
         JavadocCatchCheck.clearCounter();
-        final DefaultConfiguration checkConfig = createModuleConfig(JavadocCatchCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig,
-            getPath("InputAbstractJavadocPositionWithSinglelineComments.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocPositionTwo.java"), expected);
         assertWithMessage("Invalid number of javadocs")
             .that(JavadocCatchCheck.javadocsNumber)
-            .isEqualTo(65);
+            .isEqualTo(29);
     }
 
     @Test
-    public void testPositionOnlyComments()
-            throws Exception {
+    public void testPositionThree() throws Exception {
         JavadocCatchCheck.clearCounter();
-        final DefaultConfiguration checkConfig = createModuleConfig(JavadocCatchCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAbstractJavadocPositionOnlyComments.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocPositionThree.java"), expected);
+        assertWithMessage("Invalid number of javadocs")
+            .that(JavadocCatchCheck.javadocsNumber)
+            .isEqualTo(15);
+    }
+
+    @Test
+    public void testPositionWithSinglelineCommentsOne() throws Exception {
+        JavadocCatchCheck.clearCounter();
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocPositionWithSinglelineCommentsOne.java"), expected);
+        assertWithMessage("Invalid number of javadocs")
+            .that(JavadocCatchCheck.javadocsNumber)
+            .isEqualTo(21);
+    }
+
+    @Test
+    public void testPositionWithSinglelineCommentsTwo() throws Exception {
+        JavadocCatchCheck.clearCounter();
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocPositionWithSinglelineCommentsTwo.java"), expected);
+        assertWithMessage("Invalid number of javadocs")
+            .that(JavadocCatchCheck.javadocsNumber)
+            .isEqualTo(29);
+    }
+
+    @Test
+    public void testPositionWithSinglelineCommentsThree() throws Exception {
+        JavadocCatchCheck.clearCounter();
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocPositionWithSinglelineCommentsThree.java"), expected);
+        assertWithMessage("Invalid number of javadocs")
+            .that(JavadocCatchCheck.javadocsNumber)
+            .isEqualTo(15);
+    }
+
+    @Test
+    public void testPositionOnlyComments() throws Exception {
+        JavadocCatchCheck.clearCounter();
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocPositionOnlyComments.java"), expected);
         assertWithMessage("Invalid number of javadocs")
             .that(JavadocCatchCheck.javadocsNumber)
             .isEqualTo(0);
@@ -275,22 +322,18 @@ public int[] getDefaultJavadocTokens() {
     }
 
     @Test
-    public void testAcceptableTokensFail()
-            throws Exception {
-        final DefaultConfiguration checkConfig =
-            createModuleConfig(TokenIsNotInAcceptablesJavadocCheck.class);
-        checkConfig.addProperty("javadocTokens", "RETURN_LITERAL");
-
+    public void testAcceptableTokensFail() throws Exception {
         final String path = getPath("InputAbstractJavadocTokensFail.java");
         try {
             final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-            verify(checkConfig, path, expected);
+            verifyWithInlineConfigParser(path, expected);
             assertWithMessage("CheckstyleException is expected").fail();
         }
         catch (IllegalStateException ex) {
             final String expected = "Javadoc Token "
                     + "\"RETURN_LITERAL\" was not found in "
-                    + "Acceptable javadoc tokens list in check";
+                    + "Acceptable javadoc tokens list in check "
+                    + TokenIsNotInAcceptablesCheck.class.getName();
             assertWithMessage("Invalid exception, should start with: " + expected)
                     .that(ex.getMessage())
                     .startsWith(expected);
@@ -298,32 +341,27 @@ public void testAcceptableTokensFail()
     }
 
     @Test
-    public void testAcceptableTokensPass()
-            throws Exception {
-        final DefaultConfiguration checkConfig =
-            createModuleConfig(TokenIsNotInAcceptablesJavadocCheck.class);
-        checkConfig.addProperty("javadocTokens", "DEPRECATED_LITERAL");
-
+    public void testAcceptableTokensPass() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAbstractJavadocTokensPass.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocTokensPass.java"), expected);
     }
 
     @Test
     public void testRequiredTokenIsNotInDefaultTokens() throws Exception {
         final DefaultConfiguration checkConfig =
             createModuleConfig(RequiredTokenIsNotInDefaultsJavadocCheck.class);
-        final String pathToEmptyFile =
-                File.createTempFile("empty", ".java", temporaryFolder).getPath();
+        final String uniqueFileName = "empty_" + UUID.randomUUID() + ".java";
+        final File pathToEmptyFile = new File(temporaryFolder, uniqueFileName);
 
         try {
-            final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-            verify(checkConfig, pathToEmptyFile, expected);
+            execute(checkConfig, pathToEmptyFile.toString());
             assertWithMessage("CheckstyleException is expected").fail();
         }
         catch (IllegalStateException ex) {
             final String expected = "Javadoc Token \""
                     + JavadocTokenTypes.RETURN_LITERAL + "\" from required"
-                    + " javadoc tokens was not found in default javadoc tokens list in check";
+                    + " javadoc tokens was not found in default javadoc tokens list in check "
+                    + RequiredTokenIsNotInDefaultsJavadocCheck.class.getName();
             assertWithMessage("Invalid exception, should start with: " + expected)
                     .that(ex.getMessage())
                     .startsWith(expected);
@@ -331,12 +369,36 @@ public void testRequiredTokenIsNotInDefaultTokens() throws Exception {
     }
 
     @Test
-    public void testVisitLeaveToken()
-            throws Exception {
+    public void testVisitLeaveTokenOne() throws Exception {
+        JavadocVisitLeaveCheck.clearCounter();
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocLeaveTokenOne.java"), expected);
+        assertWithMessage("Javadoc visit count should be greater than zero")
+                .that(JavadocVisitLeaveCheck.visitCount)
+                .isGreaterThan(0);
+        assertWithMessage("Javadoc visit and leave count should be equal")
+            .that(JavadocVisitLeaveCheck.leaveCount)
+            .isEqualTo(JavadocVisitLeaveCheck.visitCount);
+    }
+
+    @Test
+    public void testVisitLeaveTokenTwo() throws Exception {
+        JavadocVisitLeaveCheck.clearCounter();
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocLeaveTokenTwo.java"), expected);
+        assertWithMessage("Javadoc visit count should be greater than zero")
+                .that(JavadocVisitLeaveCheck.visitCount)
+                .isGreaterThan(0);
+        assertWithMessage("Javadoc visit and leave count should be equal")
+            .that(JavadocVisitLeaveCheck.leaveCount)
+            .isEqualTo(JavadocVisitLeaveCheck.visitCount);
+    }
+
+    @Test
+    public void testVisitLeaveTokenThree() throws Exception {
         JavadocVisitLeaveCheck.clearCounter();
-        final DefaultConfiguration checkConfig = createModuleConfig(JavadocVisitLeaveCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAbstractJavadocLeaveToken.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocLeaveTokenThree.java"), expected);
         assertWithMessage("Javadoc visit count should be greater than zero")
                 .that(JavadocVisitLeaveCheck.visitCount)
                 .isGreaterThan(0);
@@ -347,159 +409,182 @@ public void testVisitLeaveToken()
 
     @Test
     public void testNoWsBeforeDescriptionInJavadocTags() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
         final String[] expected = {
-            "17: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "18: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     23, "mismatched input 'd' expecting <EOF>", "JAVADOC"),
-            "28: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "29: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     30, "mismatched input '-' expecting <EOF>", "JAVADOC"),
-            "36: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "37: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     39, "mismatched input '-' expecting <EOF>", "JAVADOC"),
-            "50: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "51: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     34, "mismatched input '-' expecting <EOF>", "JAVADOC"),
-            "60: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "61: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     31, "mismatched input '-' expecting <EOF>", "JAVADOC"),
-            "71: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "72: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     15, "mismatched input '-' expecting <EOF>", "JAVADOC"),
-            "80: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "81: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     32, "mismatched input '-' expecting <EOF>", "JAVADOC"),
-            "91: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "92: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     17, "mismatched input '<' expecting <EOF>", "JAVADOC"),
-            "98: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "99: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     34, "no viable alternative at input '-'", "JAVADOC_INLINE_TAG"),
-            "105: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "106: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     39, "no viable alternative at input '-'", "JAVADOC_INLINE_TAG"),
-            "113: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
+            "114: " + getCheckMessage(MSG_JAVADOC_PARSE_RULE_ERROR,
                     19, "no viable alternative at input '<'", "JAVADOC_INLINE_TAG"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags.java"),
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags.java"),
                 expected);
     }
 
     @Test
     public void testWrongSingletonTagInJavadoc() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(TempCheck.class);
         final String[] expected = {
-            "9: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "embed"),
-            "16: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "keygen"),
-            "23: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "SOURCE"),
-            "30: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "TRACK"),
-            "37: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "WBR"),
+            "10: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "embed"),
+            "17: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "keygen"),
+            "24: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "SOURCE"),
+            "31: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "TRACK"),
+            "38: " + getCheckMessage(MSG_JAVADOC_WRONG_SINGLETON_TAG, 9, "WBR"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocWrongSingletonTagInJavadoc.java"),
+        verifyWithInlineConfigParser(getPath("InputAbstractJavadocWrongSingletonTagInJavadoc.java"),
                 expected);
     }
 
     @Test
-    public void testNonTightHtmlTagIntolerantCheck() throws Exception {
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(NonTightHtmlTagIntolerantCheck.class);
-        checkConfig.addProperty("violateExecutionOnNonTightHtml", "true");
+    public void testNonTightHtmlTagIntolerantCheckOne() throws Exception {
         final String[] expected = {
-            "11: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "18: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "21: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "27: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "34: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
-            "42: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "63: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "81: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "91: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
-            "136: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "12: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "19: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "22: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "28: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "35: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
+            "54: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "64: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocNonTightHtmlTags.java"), expected);
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTagsOne.java"), expected);
     }
 
     @Test
-    public void testNonTightHtmlTagIntolerantCheckReportingNoViolation() throws Exception {
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(NonTightHtmlTagIntolerantCheck.class);
+    public void testNonTightHtmlTagIntolerantCheckTwo() throws Exception {
+        final String[] expected = {
+            "12: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "19: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "25: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "46: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "80: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTagsTwo.java"), expected);
+    }
+
+    @Test
+    public void testNonTightHtmlTagIntolerantCheckReportingNoViolationOne() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAbstractJavadocNonTightHtmlTagsNoViolation.java"),
-                expected);
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTagsNoViolationOne.java"), expected);
     }
 
     @Test
-    public void testNonTightHtmlTagIntolerantCheckVisitCount()
-            throws Exception {
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(NonTightHtmlTagIntolerantCheck.class);
-        checkConfig.addProperty("violateExecutionOnNonTightHtml", "true");
-        checkConfig.addProperty("reportVisitJavadocToken", "true");
+    public void testNonTightHtmlTagIntolerantCheckReportingNoViolationTwo() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTagsNoViolationTwo.java"), expected);
+    }
+
+    @Test
+    public void testNonTightHtmlTagIntolerantCheckVisitCountOne() throws Exception {
         final String[] expected = {
-            "12: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "19: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "22: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "28: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "35: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
-            "43: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "51:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "65: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "74:13: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "84: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "94: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
-            "114:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "121:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "125:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "142: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "13: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "20: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "23: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "29: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "36: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
+            "46:13: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "56: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "66: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocNonTightHtmlTagsVisitCount.java"),
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTagsVisitCountOne.java"),
                 expected);
     }
 
     @Test
-    public void testVisitCountForCheckAcceptingJavadocWithNonTightHtml()
-            throws Exception {
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(NonTightHtmlTagTolerantCheck.class);
-        checkConfig.addProperty("violateExecutionOnNonTightHtml", "true");
-        checkConfig.addProperty("reportVisitJavadocToken", "true");
+    public void testNonTightHtmlTagIntolerantCheckVisitCountTwo() throws Exception {
         final String[] expected = {
-            "10:4: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "11:4: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
             "13: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "13:4: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "14:4: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "14:39: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "24: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "24:9: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "24:13: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "28: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "28:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "33:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "34: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "34:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "34:25: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "41:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "41:22: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "42: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
-            "49:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "50:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "51: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "51:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "51:23: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "59:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "59:20: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "59:34: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "61: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
-            "61:16: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "61:21: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "71:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "73: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "73:22: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "80:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "81:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "84: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
-            "106:8: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "113: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
-            "113:9: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "113:13: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
-            "113:33: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
+            "20: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "27: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "35:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "BODY_TAG_START"),
+            "49: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "58:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "65:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "69:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "BODY_TAG_START"),
+            "86: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
         };
-        verify(checkConfig, getPath("InputAbstractJavadocNonTightHtmlTags2.java"), expected);
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTagsVisitCountTwo.java"),
+                expected);
     }
 
-    public static class TempCheck extends AbstractJavadocCheck {
+    @Test
+    public void testVisitCountForCheckAcceptingJavadocWithNonTightHtml() throws Exception {
+        final String[] expected = {
+            "11:4: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "BODY_TAG_START"),
+            "12:4: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "14: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "14:4: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "15:4: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "15:39: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "30: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "30:9: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "30:13: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "37: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "37:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "44:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "45: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "45:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "45:25: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "55:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "55:22: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "56: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
+            "65:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "66:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "67: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "67:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "67:23: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "78:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "BODY_TAG_START"),
+            "78:20: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "78:34: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "80: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "li"),
+            "80:16: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "80:21: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "96:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "98: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "98:22: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "107:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "108:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "111: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "tr"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTags2.java"), expected);
+    }
+
+    @Test
+    public void testVisitCountForCheckAcceptingJavadocWithNonTightHtml3() throws Exception {
+        final String[] expected = {
+            "29:8: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "36: " + getCheckMessage(MSG_UNCLOSED_HTML_TAG, "p"),
+            "36:9: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "P_TAG_START"),
+            "36:13: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "LI_TAG_START"),
+            "36:33: " + getCheckMessage(NonTightHtmlTagCheck.MSG_KEY, "BODY_TAG_START"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputAbstractJavadocNonTightHtmlTags3.java"), expected);
+    }
+
+    public static class ParseJavadocOnlyCheck extends AbstractJavadocCheck {
 
         @Override
         public int[] getDefaultJavadocTokens() {
@@ -514,7 +599,6 @@ public void visitJavadocToken(DetailNode ast) {
     }
 
     public static class JavadocCatchCheck extends AbstractJavadocCheck {
-
         private static int javadocsNumber;
 
         public static void clearCounter() {
@@ -567,7 +651,7 @@ public void visitJavadocToken(DetailNode ast) {
 
     }
 
-    public static class TokenIsNotInAcceptablesJavadocCheck extends AbstractJavadocCheck {
+    public static class TokenIsNotInAcceptablesCheck extends AbstractJavadocCheck {
 
         @Override
         public int[] getRequiredJavadocTokens() {
@@ -628,7 +712,10 @@ public void leaveJavadocToken(DetailNode ast) {
 
     }
 
-    public static class NonTightHtmlTagIntolerantCheck extends AbstractJavadocCheck {
+    public static class NonTightHtmlTagCheck extends AbstractJavadocCheck {
+        // extra variable to make it explicit in test expected array
+        // that message is from NonTightHtmlTagCheck
+        public static final String MSG_KEY = MSG_TAG_FORMAT;
 
         private boolean reportVisitJavadocToken;
 
@@ -648,7 +735,9 @@ public int[] getDefaultJavadocTokens() {
         @Override
         public void visitJavadocToken(DetailNode ast) {
             if (reportVisitJavadocToken) {
-                log(ast.getLineNumber(), ast.getColumnNumber(), MSG_SUMMARY_FIRST_SENTENCE);
+                // We reusing messages from JavadocTypeCheck
+                // it is not possible to use test specific bundle of messages
+                log(ast.getLineNumber(), ast.getColumnNumber(), MSG_TAG_FORMAT, ast.getText());
             }
         }
 
@@ -656,10 +745,12 @@ public void visitJavadocToken(DetailNode ast) {
         public boolean acceptJavadocWithNonTightHtml() {
             return false;
         }
-
     }
 
     public static class NonTightHtmlTagTolerantCheck extends AbstractJavadocCheck {
+        // extra variable to make it explicit in test expected array
+        // that message is from NonTightHtmlTagCheck
+        public static final String MSG_KEY = MSG_TAG_FORMAT;
 
         private boolean reportVisitJavadocToken;
 
@@ -679,10 +770,11 @@ public int[] getDefaultJavadocTokens() {
         @Override
         public void visitJavadocToken(DetailNode ast) {
             if (reportVisitJavadocToken) {
-                log(ast.getLineNumber(), ast.getColumnNumber(), MSG_SUMMARY_FIRST_SENTENCE);
+                // We reusing messages from JavadocTypeCheck
+                // it is not possible to use test specific bundle of messages
+                log(ast.getLineNumber(), ast.getColumnNumber(), MSG_TAG_FORMAT, ast.getText());
             }
         }
 
     }
-
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java
index a9303b6842a..60ab8f3d791 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckTest.java
index 59810cbcf66..573df198368 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckTest.java
index 69415eecf3a..1046a778101 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckTest.java
index 05cc4bdb709..cf4f5e56da9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
index 8867389b175..7708acdc6f4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckTest.java
index 602c77adf75..7024a51e3f5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckTest.java
index 2b3b7c118ad..3628cadae6f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java
index 021379b08d2..d28e4fc4b52 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImplTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java
index 13f4caa2b62..7ed89c0a4b9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java
index dadd7072d98..9310b572b3d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java
index 612864affd9..cdd8045d998 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,22 +71,19 @@ public void testGetAcceptableTokens() {
     public void testJavadocStyleDefaultSettingsOne()
             throws Exception {
         final String[] expected = {
-            "23: " + getCheckMessage(MSG_NO_PERIOD),
-            "48: " + getCheckMessage(MSG_NO_PERIOD),
-            "56:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
-                    "<b>This guy is missing end of bold tag // violation"),
-            "59:7: " + getCheckMessage(MSG_EXTRA_HTML, "</td>Extra tag"
-                    + " shouldn't be here // violation"),
-            "60:49: " + getCheckMessage(MSG_EXTRA_HTML, "</style> // violation"),
-            "61:19: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy. // violation"),
-            "65: " + getCheckMessage(MSG_NO_PERIOD),
-            "66:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "70: " + getCheckMessage(MSG_NO_PERIOD),
-            "71:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "75: " + getCheckMessage(MSG_NO_PERIOD),
-            "76:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code> // violation"),
-            "77: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
-            "92:39: " + getCheckMessage(MSG_EXTRA_HTML, "</img> // violation"),
+            "24: " + getCheckMessage(MSG_NO_PERIOD),
+            "50: " + getCheckMessage(MSG_NO_PERIOD),
+            "62:11: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "65:7: " + getCheckMessage(MSG_EXTRA_HTML, "</td>"),
+            "66:49: " + getCheckMessage(MSG_EXTRA_HTML, "</style>"),
+            "67:19: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy"),
+            "73: " + getCheckMessage(MSG_NO_PERIOD),
+            "74:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "80: " + getCheckMessage(MSG_NO_PERIOD),
+            "81:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "88: " + getCheckMessage(MSG_NO_PERIOD),
+            "89:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code>"),
+            "90: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
         };
 
         verifyWithInlineConfigParser(
@@ -97,9 +94,10 @@ public void testJavadocStyleDefaultSettingsOne()
     public void testJavadocStyleDefaultSettingsTwo()
             throws Exception {
         final String[] expected = {
-            "61:8: " + getCheckMessage(MSG_UNCLOSED_HTML, "<blockquote> // violation"),
-            "66: " + getCheckMessage(MSG_NO_PERIOD),
-            "98: " + getCheckMessage(MSG_NO_PERIOD),
+            "26:39: " + getCheckMessage(MSG_EXTRA_HTML, "</img>"),
+            "72:8: " + getCheckMessage(MSG_UNCLOSED_HTML, "<blockquote>"),
+            "77: " + getCheckMessage(MSG_NO_PERIOD),
+            "112:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string>"),
         };
 
         verifyWithInlineConfigParser(
@@ -110,7 +108,7 @@ public void testJavadocStyleDefaultSettingsTwo()
     public void testJavadocStyleDefaultSettingsThree()
             throws Exception {
         final String[] expected = {
-            "103:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string> // violation"),
+            "109: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -121,29 +119,38 @@ public void testJavadocStyleDefaultSettingsThree()
     public void testJavadocStyleDefaultSettingsFour()
             throws Exception {
         final String[] expected = {
-            "29:33: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code> // violation"),
-            "40: " + getCheckMessage(MSG_NO_PERIOD),
-            "46:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
-                                         "<b>Note:<b> it's unterminated tag.</p> // violation"),
-            "50: " + getCheckMessage(MSG_NO_PERIOD),
+            "30:33: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>"),
+            "42: " + getCheckMessage(MSG_NO_PERIOD),
+            "49:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
+                    "<b>Note:<b> it's unterminated tag.</p>"),
             "54: " + getCheckMessage(MSG_NO_PERIOD),
-            "61: " + getCheckMessage(MSG_NO_PERIOD),
-            "73: " + getCheckMessage(MSG_NO_PERIOD),
-            "86: " + getCheckMessage(MSG_NO_PERIOD),
+            "59: " + getCheckMessage(MSG_NO_PERIOD),
+            "67: " + getCheckMessage(MSG_NO_PERIOD),
+            "80: " + getCheckMessage(MSG_NO_PERIOD),
+            "94: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
             getPath("InputJavadocStyleDefaultSettingsFour.java"), expected);
     }
 
+    @Test
+    public void testJavadocStyleDefaultSettingsFive()
+            throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        verifyWithInlineConfigParser(
+            getPath("InputJavadocStyleDefaultSettingsFive.java"), expected);
+    }
+
     @Test
     public void testJavadocStyleFirstSentenceOne() throws Exception {
         final String[] expected = {
-            "23: " + getCheckMessage(MSG_NO_PERIOD),
-            "48: " + getCheckMessage(MSG_NO_PERIOD),
-            "65: " + getCheckMessage(MSG_NO_PERIOD),
-            "70: " + getCheckMessage(MSG_NO_PERIOD),
-            "75: " + getCheckMessage(MSG_NO_PERIOD),
+            "24: " + getCheckMessage(MSG_NO_PERIOD),
+            "50: " + getCheckMessage(MSG_NO_PERIOD),
+            "68: " + getCheckMessage(MSG_NO_PERIOD),
+            "74: " + getCheckMessage(MSG_NO_PERIOD),
+            "80: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -153,8 +160,8 @@ public void testJavadocStyleFirstSentenceOne() throws Exception {
     @Test
     public void testJavadocStyleFirstSentenceTwo() throws Exception {
         final String[] expected = {
-            "66: " + getCheckMessage(MSG_NO_PERIOD),
-            "99: " + getCheckMessage(MSG_NO_PERIOD),
+            "67: " + getCheckMessage(MSG_NO_PERIOD),
+            "101: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -173,11 +180,11 @@ public void testJavadocStyleFirstSentenceThree() throws Exception {
     public void testJavadocStyleFirstSentenceFour() throws Exception {
         final String[] expected = {
             "40: " + getCheckMessage(MSG_NO_PERIOD),
-            "50: " + getCheckMessage(MSG_NO_PERIOD),
-            "54: " + getCheckMessage(MSG_NO_PERIOD),
-            "61: " + getCheckMessage(MSG_NO_PERIOD),
-            "73: " + getCheckMessage(MSG_NO_PERIOD),
-            "86: " + getCheckMessage(MSG_NO_PERIOD),
+            "51: " + getCheckMessage(MSG_NO_PERIOD),
+            "56: " + getCheckMessage(MSG_NO_PERIOD),
+            "64: " + getCheckMessage(MSG_NO_PERIOD),
+            "77: " + getCheckMessage(MSG_NO_PERIOD),
+            "91: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -187,13 +194,13 @@ public void testJavadocStyleFirstSentenceFour() throws Exception {
     @Test
     public void testJavadocStyleFirstSentenceFormatOne() throws Exception {
         final String[] expected = {
-            "23: " + getCheckMessage(MSG_NO_PERIOD),
-            "33: " + getCheckMessage(MSG_NO_PERIOD),
-            "38: " + getCheckMessage(MSG_NO_PERIOD),
-            "48: " + getCheckMessage(MSG_NO_PERIOD),
-            "65: " + getCheckMessage(MSG_NO_PERIOD),
+            "24: " + getCheckMessage(MSG_NO_PERIOD),
+            "35: " + getCheckMessage(MSG_NO_PERIOD),
+            "41: " + getCheckMessage(MSG_NO_PERIOD),
+            "52: " + getCheckMessage(MSG_NO_PERIOD),
             "70: " + getCheckMessage(MSG_NO_PERIOD),
-            "75: " + getCheckMessage(MSG_NO_PERIOD),
+            "76: " + getCheckMessage(MSG_NO_PERIOD),
+            "82: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -203,8 +210,8 @@ public void testJavadocStyleFirstSentenceFormatOne() throws Exception {
     @Test
     public void testJavadocStyleFirstSentenceFormatTwo() throws Exception {
         final String[] expected = {
-            "66: " + getCheckMessage(MSG_NO_PERIOD),
-            "99: " + getCheckMessage(MSG_NO_PERIOD),
+            "74: " + getCheckMessage(MSG_NO_PERIOD),
+            "108: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -223,11 +230,11 @@ public void testJavadocStyleFirstSentenceFormatThree() throws Exception {
     public void testJavadocStyleFirstSentenceFormatFour() throws Exception {
         final String[] expected = {
             "40: " + getCheckMessage(MSG_NO_PERIOD),
-            "50: " + getCheckMessage(MSG_NO_PERIOD),
-            "54: " + getCheckMessage(MSG_NO_PERIOD),
-            "61: " + getCheckMessage(MSG_NO_PERIOD),
-            "73: " + getCheckMessage(MSG_NO_PERIOD),
-            "86: " + getCheckMessage(MSG_NO_PERIOD),
+            "51: " + getCheckMessage(MSG_NO_PERIOD),
+            "56: " + getCheckMessage(MSG_NO_PERIOD),
+            "64: " + getCheckMessage(MSG_NO_PERIOD),
+            "77: " + getCheckMessage(MSG_NO_PERIOD),
+            "91: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -237,17 +244,15 @@ public void testJavadocStyleFirstSentenceFormatFour() throws Exception {
     @Test
     public void testHtml1() throws Exception {
         final String[] expected = {
-            "55:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
-                "<b>This guy is missing end of bold tag // violation"),
-            "58:7: " + getCheckMessage(MSG_EXTRA_HTML, "</td>Extra tag "
-                + "shouldn't be here // violation"),
-            "59:49: " + getCheckMessage(MSG_EXTRA_HTML, "</style> // violation"),
-            "60:19: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy. // violation"),
-            "65:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "70:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "75:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code> // violation"),
-            "76: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
-            "91:39: " + getCheckMessage(MSG_EXTRA_HTML, "</img> // violation"),
+            "59:11: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "62:7: " + getCheckMessage(MSG_EXTRA_HTML, "</td>"),
+            "63:49: " + getCheckMessage(MSG_EXTRA_HTML, "</style>"),
+            "64:19: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy"),
+            "70:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "76:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "83:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code>"),
+            "84: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
+            "99:39: " + getCheckMessage(MSG_EXTRA_HTML, "</img>"),
         };
 
         verifyWithInlineConfigParser(
@@ -257,7 +262,7 @@ public void testHtml1() throws Exception {
     @Test
     public void testHtml2() throws Exception {
         final String[] expected = {
-            "67:8: " + getCheckMessage(MSG_UNCLOSED_HTML, "<blockquote> // violation"),
+            "68:8: " + getCheckMessage(MSG_UNCLOSED_HTML, "<blockquote>"),
         };
 
         verifyWithInlineConfigParser(
@@ -267,7 +272,7 @@ public void testHtml2() throws Exception {
     @Test
     public void testHtml3() throws Exception {
         final String[] expected = {
-            "102:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string> // violation"),
+            "103:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string>"),
         };
 
         verifyWithInlineConfigParser(
@@ -277,9 +282,8 @@ public void testHtml3() throws Exception {
     @Test
     public void testHtml4() throws Exception {
         final String[] expected = {
-            "28:33: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code> // violation"),
-            "45:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
-                    "<b>Note:<b> it's unterminated tag.</p> // violation"),
+            "29:33: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>"),
+            "47:11: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
         };
 
         verifyWithInlineConfigParser(
@@ -314,10 +318,11 @@ public void testOnInputWithNoJavadoc2() throws Exception {
     public void testScopePublic1()
             throws Exception {
         final String[] expected = {
-            "75: " + getCheckMessage(MSG_NO_PERIOD),
-            "76:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code> // violation"),
-            "77: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
+            "78: " + getCheckMessage(MSG_NO_PERIOD),
+            "79:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code>"),
+            "80: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePublic1.java"), expected);
     }
@@ -327,9 +332,10 @@ public void testScopePublic2()
             throws Exception {
         final String[] expected = {
             "83: " + getCheckMessage(MSG_EMPTY),
-            "101: " + getCheckMessage(MSG_EMPTY),
-            "106: " + getCheckMessage(MSG_NO_PERIOD),
+            "102: " + getCheckMessage(MSG_EMPTY),
+            "108: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePublic2.java"), expected);
     }
@@ -338,8 +344,9 @@ public void testScopePublic2()
     public void testScopePublic3()
             throws Exception {
         final String[] expected = {
-            "103:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string> // violation"),
+            "104:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string>"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePublic3.java"), expected);
     }
@@ -348,10 +355,11 @@ public void testScopePublic3()
     public void testScopePublic4()
             throws Exception {
         final String[] expected = {
-            "50: " + getCheckMessage(MSG_NO_PERIOD),
-            "54: " + getCheckMessage(MSG_NO_PERIOD),
-            "86: " + getCheckMessage(MSG_NO_PERIOD),
+            "51: " + getCheckMessage(MSG_NO_PERIOD),
+            "56: " + getCheckMessage(MSG_NO_PERIOD),
+            "89: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePublic4.java"), expected);
     }
@@ -360,12 +368,13 @@ public void testScopePublic4()
     public void testScopeProtected1()
             throws Exception {
         final String[] expected = {
-            "65: " + getCheckMessage(MSG_NO_PERIOD),
-            "66:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "75: " + getCheckMessage(MSG_NO_PERIOD),
-            "76:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code> // violation"),
-            "77: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
+            "67: " + getCheckMessage(MSG_NO_PERIOD),
+            "68:23: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "80: " + getCheckMessage(MSG_NO_PERIOD),
+            "81:31: " + getCheckMessage(MSG_EXTRA_HTML, "</code>"),
+            "82: " + getCheckMessage(MSG_INCOMPLETE_TAG, "    * should fail <"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopeProtected1.java"), expected);
     }
@@ -374,11 +383,12 @@ public void testScopeProtected1()
     public void testScopeProtected2()
             throws Exception {
         final String[] expected = {
-            "76: " + getCheckMessage(MSG_EMPTY),
-            "80: " + getCheckMessage(MSG_EMPTY),
-            "94: " + getCheckMessage(MSG_EMPTY),
-            "99: " + getCheckMessage(MSG_NO_PERIOD),
+            "83: " + getCheckMessage(MSG_EMPTY),
+            "87: " + getCheckMessage(MSG_EMPTY),
+            "102: " + getCheckMessage(MSG_EMPTY),
+            "108: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopeProtected2.java"), expected);
     }
@@ -387,8 +397,9 @@ public void testScopeProtected2()
     public void testScopeProtected3()
             throws Exception {
         final String[] expected = {
-            "103:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string> // violation"),
+            "104:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string>"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopeProtected3.java"), expected);
     }
@@ -397,10 +408,11 @@ public void testScopeProtected3()
     public void testScopeProtected4()
             throws Exception {
         final String[] expected = {
-            "50: " + getCheckMessage(MSG_NO_PERIOD),
-            "54: " + getCheckMessage(MSG_NO_PERIOD),
-            "86: " + getCheckMessage(MSG_NO_PERIOD),
+            "51: " + getCheckMessage(MSG_NO_PERIOD),
+            "56: " + getCheckMessage(MSG_NO_PERIOD),
+            "89: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopeProtected4.java"), expected);
     }
@@ -409,14 +421,15 @@ public void testScopeProtected4()
     public void testScopePackage1()
             throws Exception {
         final String[] expected = {
-            "65: " + getCheckMessage(MSG_NO_PERIOD),
-            "66:24: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "70: " + getCheckMessage(MSG_NO_PERIOD),
-            "71:32: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "75: " + getCheckMessage(MSG_NO_PERIOD),
-            "76:32: " + getCheckMessage(MSG_EXTRA_HTML, "</code> // violation"),
-            "77: " + getCheckMessage(MSG_INCOMPLETE_TAG, "     * should fail <"),
+            "67: " + getCheckMessage(MSG_NO_PERIOD),
+            "68:24: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "74: " + getCheckMessage(MSG_NO_PERIOD),
+            "75:32: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "82: " + getCheckMessage(MSG_NO_PERIOD),
+            "83:32: " + getCheckMessage(MSG_EXTRA_HTML, "</code>"),
+            "84: " + getCheckMessage(MSG_INCOMPLETE_TAG, "     * should fail <"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePackage1.java"), expected);
     }
@@ -425,12 +438,13 @@ public void testScopePackage1()
     public void testScopePackage2()
             throws Exception {
         final String[] expected = {
-            "76: " + getCheckMessage(MSG_EMPTY),
-            "80: " + getCheckMessage(MSG_EMPTY),
-            "85: " + getCheckMessage(MSG_EMPTY),
-            "94: " + getCheckMessage(MSG_EMPTY),
-            "99: " + getCheckMessage(MSG_NO_PERIOD),
+            "83: " + getCheckMessage(MSG_EMPTY),
+            "87: " + getCheckMessage(MSG_EMPTY),
+            "92: " + getCheckMessage(MSG_EMPTY),
+            "102: " + getCheckMessage(MSG_EMPTY),
+            "108: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePackage2.java"), expected);
     }
@@ -439,8 +453,9 @@ public void testScopePackage2()
     public void testScopePackage3()
             throws Exception {
         final String[] expected = {
-            "103:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string> // violation"),
+            "104:21: " + getCheckMessage(MSG_EXTRA_HTML, "</string>"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePackage3.java"), expected);
     }
@@ -449,12 +464,13 @@ public void testScopePackage3()
     public void testScopePackage4()
             throws Exception {
         final String[] expected = {
-            "50: " + getCheckMessage(MSG_NO_PERIOD),
-            "54: " + getCheckMessage(MSG_NO_PERIOD),
-            "61: " + getCheckMessage(MSG_NO_PERIOD),
-            "73: " + getCheckMessage(MSG_NO_PERIOD),
-            "86: " + getCheckMessage(MSG_NO_PERIOD),
+            "51: " + getCheckMessage(MSG_NO_PERIOD),
+            "56: " + getCheckMessage(MSG_NO_PERIOD),
+            "64: " + getCheckMessage(MSG_NO_PERIOD),
+            "77: " + getCheckMessage(MSG_NO_PERIOD),
+            "91: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleScopePackage4.java"), expected);
     }
@@ -473,8 +489,8 @@ public void testEmptyJavadoc2() throws Exception {
             "75: " + getCheckMessage(MSG_EMPTY),
             "79: " + getCheckMessage(MSG_EMPTY),
             "84: " + getCheckMessage(MSG_EMPTY),
-            "89: " + getCheckMessage(MSG_EMPTY),
-            "93: " + getCheckMessage(MSG_EMPTY),
+            "90: " + getCheckMessage(MSG_EMPTY),
+            "95: " + getCheckMessage(MSG_EMPTY),
         };
 
         verifyWithInlineConfigParser(
@@ -501,18 +517,17 @@ public void testEmptyJavadoc4() throws Exception {
     public void testExcludeScope1()
             throws Exception {
         final String[] expected = {
-            "23: " + getCheckMessage(MSG_NO_PERIOD),
-            "48: " + getCheckMessage(MSG_NO_PERIOD),
-            "56:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
-                    "<b>This guy is missing end of bold tag // violation"),
-            "59:7: " + getCheckMessage(MSG_EXTRA_HTML, "</td>Extra tag "
-                    + "shouldn't be here // violation"),
-            "60:49: " + getCheckMessage(MSG_EXTRA_HTML, "</style> // violation"),
-            "61:19: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy. // violation"),
-            "70: " + getCheckMessage(MSG_NO_PERIOD),
-            "71:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>should fail // violation"),
-            "92:39: " + getCheckMessage(MSG_EXTRA_HTML, "</img> // violation"),
+            "24: " + getCheckMessage(MSG_NO_PERIOD),
+            "50: " + getCheckMessage(MSG_NO_PERIOD),
+            "62:11: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "65:7: " + getCheckMessage(MSG_EXTRA_HTML, "</td>"),
+            "66:49: " + getCheckMessage(MSG_EXTRA_HTML, "</style>"),
+            "67:19: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy"),
+            "78: " + getCheckMessage(MSG_NO_PERIOD),
+            "79:31: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "100:39: " + getCheckMessage(MSG_EXTRA_HTML, "</img>"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleExcludeScope1.java"), expected);
     }
@@ -521,9 +536,10 @@ public void testExcludeScope1()
     public void testExcludeScope2()
             throws Exception {
         final String[] expected = {
-            "68:8: " + getCheckMessage(MSG_UNCLOSED_HTML, "<blockquote> // violation"),
-            "73: " + getCheckMessage(MSG_NO_PERIOD),
+            "69:8: " + getCheckMessage(MSG_UNCLOSED_HTML, "<blockquote>"),
+            "75: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleExcludeScope2.java"), expected);
     }
@@ -541,13 +557,14 @@ public void testExcludeScope3()
     public void testExcludeScope4()
             throws Exception {
         final String[] expected = {
-            "29:33: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code> // violation"),
-            "40: " + getCheckMessage(MSG_NO_PERIOD),
-            "46:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
-                    "<b>Note:<b> it's unterminated tag.</p> // violation"),
-            "61: " + getCheckMessage(MSG_NO_PERIOD),
-            "73: " + getCheckMessage(MSG_NO_PERIOD),
+            "30:33: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>"),
+            "42: " + getCheckMessage(MSG_NO_PERIOD),
+            "49:11: " + getCheckMessage(MSG_UNCLOSED_HTML,
+                    "<b>Note:<b> it's unterminated tag.</p>"),
+            "65: " + getCheckMessage(MSG_NO_PERIOD),
+            "78: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleExcludeScope4.java"), expected);
     }
@@ -567,7 +584,7 @@ public void packageInfoInheritDoc() throws Exception {
     @Test
     public void packageInfoInvalid() throws Exception {
         final String[] expected = {
-            "16: " + getCheckMessage(MSG_NO_PERIOD),
+            "17: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -629,8 +646,9 @@ public void packageInfoValid() throws Exception {
     public void testRestrictedTokenSet1()
             throws Exception {
         final String[] expected = {
-            "73: " + getCheckMessage(MSG_NO_PERIOD),
+            "74: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleRestrictedTokenSet1.java"), expected);
     }
@@ -657,9 +675,10 @@ public void testRestrictedTokenSet3()
     public void testRestrictedTokenSet4()
             throws Exception {
         final String[] expected = {
-            "59: " + getCheckMessage(MSG_NO_PERIOD),
-            "91: " + getCheckMessage(MSG_NO_PERIOD),
+            "53: " + getCheckMessage(MSG_NO_PERIOD),
+            "86: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleRestrictedTokenSet4.java"), expected);
     }
@@ -667,19 +686,17 @@ public void testRestrictedTokenSet4()
     @Test
     public void testJavadocStyleRecordsAndCompactCtors() throws Exception {
         final String[] expected = {
-            "23: " + getCheckMessage(MSG_NO_PERIOD),
-            "43: " + getCheckMessage(MSG_NO_PERIOD),
-            "52:16: " + getCheckMessage(MSG_UNCLOSED_HTML,
-                    "<b>This guy is missing end of bold tag // violation"),
-            "55:12: " + getCheckMessage(MSG_EXTRA_HTML, "</td>Extra tag "
-                    + "shouldn't be here // violation"),
-            "56:54: " + getCheckMessage(MSG_EXTRA_HTML, "</style> // violation"),
-            "58:24: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy. // violation"),
-            "70: " + getCheckMessage(MSG_NO_PERIOD),
-            "71:36: " + getCheckMessage(MSG_EXTRA_HTML, "</code> // violation"),
-            "72: " + getCheckMessage(MSG_INCOMPLETE_TAG, "         * should fail <"),
-            "87:37: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code> // violation"),
-            "102: " + getCheckMessage(MSG_NO_PERIOD),
+            "24: " + getCheckMessage(MSG_NO_PERIOD),
+            "45: " + getCheckMessage(MSG_NO_PERIOD),
+            "58:16: " + getCheckMessage(MSG_UNCLOSED_HTML, "<b>"),
+            "61:12: " + getCheckMessage(MSG_EXTRA_HTML, "</td>"),
+            "62:54: " + getCheckMessage(MSG_EXTRA_HTML, "</style>"),
+            "64:24: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>dummy"),
+            "79: " + getCheckMessage(MSG_NO_PERIOD),
+            "80:36: " + getCheckMessage(MSG_EXTRA_HTML, "</code>"),
+            "81: " + getCheckMessage(MSG_INCOMPLETE_TAG, "         * should fail <"),
+            "97:37: " + getCheckMessage(MSG_UNCLOSED_HTML, "<code>"),
+            "113: " + getCheckMessage(MSG_NO_PERIOD),
         };
 
         verifyWithInlineConfigParser(
@@ -708,8 +725,8 @@ public void testNeverEndingXmlCommentInsideJavadoc() throws Exception {
     public void testInterfaceMemberScopeIsPublic()
             throws Exception {
         final String[] expected = {
-            "20: " + getCheckMessage(MSG_EMPTY),
-            "23: " + getCheckMessage(MSG_EMPTY),
+            "21: " + getCheckMessage(MSG_EMPTY),
+            "25: " + getCheckMessage(MSG_EMPTY),
         };
 
         verifyWithInlineConfigParser(
@@ -721,9 +738,9 @@ public void testInterfaceMemberScopeIsPublic()
     public void testEnumCtorScopeIsPrivate()
             throws Exception {
         final String[] expected = {
-            "20: " + getCheckMessage(MSG_EMPTY),
-            "23: " + getCheckMessage(MSG_EMPTY),
-            "31: " + getCheckMessage(MSG_EMPTY),
+            "21: " + getCheckMessage(MSG_EMPTY),
+            "25: " + getCheckMessage(MSG_EMPTY),
+            "34: " + getCheckMessage(MSG_EMPTY),
         };
 
         verifyWithInlineConfigParser(
@@ -745,6 +762,7 @@ public void testJavadocTag() throws Exception {
             "11: " + getCheckMessage(MSG_NO_PERIOD),
             "15: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleDefault4.java"),
                 expected);
@@ -757,6 +775,7 @@ public void testJavadocTag2() throws Exception {
             "18:16: " + getCheckMessage(MSG_UNCLOSED_HTML,
                     "<AREA ALT=\"alt\" Coordination=\"100,0,200,50\" HREF=\"/href/\"> <"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleCheck1.java"),
                 expected);
@@ -767,6 +786,7 @@ public void testJavadocTag3() throws Exception {
         final String[] expected = {
             "21:4: " + getCheckMessage(MSG_EXTRA_HTML, "</body>"),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleCheck2.java"),
                 expected);
@@ -777,6 +797,7 @@ public void testJavadocStyleCheck3() throws Exception {
         final String[] expected = {
             "11: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleCheck3.java"),
                 expected);
@@ -787,6 +808,7 @@ public void testJavadocStyleCheck4() throws Exception {
         final String[] expected = {
             "12: " + getCheckMessage(MSG_NO_PERIOD),
         };
+
         verifyWithInlineConfigParser(
                 getPath("InputJavadocStyleCheck5.java"),
                 expected);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java
index 9a0cd9465fe..7f2424e9595 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java
index fb37eed5ca2..bb03f261997 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagInfoTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java
index a65dbb87d40..9ccec590c43 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
index b8efec622dc..26d4db28102 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -357,6 +357,35 @@ public void testJavadocTypeRecordComponents() throws Exception {
                 getNonCompilablePath("InputJavadocTypeRecordComponents.java"), expected);
     }
 
+    @Test
+    public void testJavadocTypeParamDescriptionWithAngularTags() throws Exception {
+        final String[] expected = {
+            "44:4: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "<P>"),
+            "46:1: " + getCheckMessage(MSG_MISSING_TAG, "@param <U>"),
+            "50:4: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "region"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputJavadocTypeParamDescriptionWithAngularTags.java"), expected);
+    }
+
+    @Test
+    public void testJavadocTypeRecordParamDescriptionWithAngularTags() throws Exception {
+        final String[] expected = {
+            "51:4: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "<P>"),
+            "53:1: " + getCheckMessage(MSG_MISSING_TAG, "@param <U>"),
+            "57:4: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "region"),
+            "60:1: " + getCheckMessage(MSG_MISSING_TAG, "@param a"),
+            "73:4: " + getCheckMessage(MSG_UNUSED_TAG, "@param", "e"),
+            "76:1: " + getCheckMessage(MSG_MISSING_TAG, "@param c"),
+        };
+
+        verifyWithInlineConfigParser(
+                getNonCompilablePath(
+                        "InputJavadocTypeRecordParamDescriptionWithAngularTags.java"),
+                expected);
+    }
+
     @Test
     public void testJavadocTypeRecordComponents2() throws Exception {
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java
index 79057d7dda7..7ce4a492260 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -123,7 +123,7 @@ public void testAnother4()
     }
 
     @Test
-    public void testScopes() throws Exception {
+    public void testJavadocVariableOnInnerClassFields() throws Exception {
         final String[] expected = {
             "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
@@ -141,30 +141,39 @@ public void testScopes() throws Exception {
             "51:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "52:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "53:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "63:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "64:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "65:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "66:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputJavadocVariableOnInnerClassFields.java"),
+               expected);
+    }
+
+    @Test
+    public void testJavadocVariableOnPublicInnerClassFields() throws Exception {
+        final String[] expected = {
+            "14:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "17:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "25:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "26:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "37:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "38:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "39:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "49:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "50:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "51:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "52:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "61:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "62:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "63:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "64:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "74:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "75:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "86:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "87:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "98:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "99:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "110:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "111:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "112:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "113:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "123:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
-                getPath("InputJavadocVariableNoJavadoc.java"),
+                getPath("InputJavadocVariableOnPublicInnerClassFields.java"),
                expected);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java
index 05b7f84d208..4326f0c7a7a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,10 +22,14 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.MSG_JAVADOC_MISSING;
 
+import java.io.File;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.utils.CheckUtilTest;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
 public class MissingJavadocMethodCheckTest extends AbstractModuleTestSupport {
@@ -313,7 +317,7 @@ public void testSetterGetterOff() throws Exception {
     }
 
     @Test
-    public void testSetterGetterOn() throws Exception {
+    public void testSetterGetterOnCheck() throws Exception {
         final String[] expected = {
             "30:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "35:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
@@ -455,4 +459,73 @@ public void testMinLineCount() throws Exception {
                 getNonCompilablePath("InputMissingJavadocMethod1.java"),
                 expected);
     }
+
+    @Test
+    public void testAnnotationField() throws Exception {
+        final String[] expected = {
+            "25:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "27:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputMissingJavadocMethodAnnotationField.java"),
+                expected);
+    }
+
+    @Test
+    public void testIsGetterMethod() throws Exception {
+        final File testFile =
+                new File(getPath("InputMissingJavadocMethodSetterGetter3.java"));
+        final DetailAST notGetterMethod =
+                CheckUtilTest.getNode(testFile, TokenTypes.METHOD_DEF);
+        final DetailAST getterMethod = notGetterMethod.getNextSibling().getNextSibling();
+
+        assertWithMessage("Invalid result: AST provided is getter method")
+                .that(MissingJavadocMethodCheck.isGetterMethod(getterMethod))
+                .isTrue();
+        assertWithMessage("Invalid result: AST provided is not getter method")
+                .that(MissingJavadocMethodCheck.isGetterMethod(notGetterMethod))
+                .isFalse();
+    }
+
+    @Test
+    public void testIsSetterMethod() throws Exception {
+        final File testFile =
+            new File(getPath("InputMissingJavadocMethodSetterGetter3.java"));
+        final DetailAST firstClassMethod =
+            CheckUtilTest.getNode(testFile, TokenTypes.METHOD_DEF);
+        final DetailAST setterMethod =
+            firstClassMethod.getNextSibling().getNextSibling().getNextSibling();
+        final DetailAST notSetterMethod = setterMethod.getNextSibling();
+
+        assertWithMessage("Invalid result: AST provided is not setter method")
+                .that(MissingJavadocMethodCheck.isSetterMethod(setterMethod))
+                .isTrue();
+        assertWithMessage("Invalid result: AST provided is not setter method")
+                .that(MissingJavadocMethodCheck.isSetterMethod(notSetterMethod))
+                .isFalse();
+    }
+
+    @Test
+    public void testSetterGetterOn() throws Exception {
+        final String[] expected = {
+            "20:5: " + getCheckMessage(MissingJavadocMethodCheck.class,
+                    MSG_JAVADOC_MISSING),
+            "24:5: " + getCheckMessage(MissingJavadocMethodCheck.class,
+                    MSG_JAVADOC_MISSING),
+            "29:5: " + getCheckMessage(MissingJavadocMethodCheck.class,
+                    MSG_JAVADOC_MISSING),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputMissingJavadocMethodSetterGetter4.java"), expected);
+    }
+
+    @Test
+    public void missingJavadoc() throws Exception {
+        final String[] expected = {
+            "13:5: " + getCheckMessage(MissingJavadocMethodCheck.class, MSG_JAVADOC_MISSING),
+        };
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputMissingJavadocMethodBasic.java"), expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckTest.java
index 24a36abf1bf..57172c83415 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckTest.java
index 08cc7255c1a..f13f19bf589 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -63,14 +63,41 @@ public void testGetAcceptableTokens() {
     }
 
     @Test
-    public void testTags() throws Exception {
+    public void testTagsOne() throws Exception {
         final String[] expected = {
             "14:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "308:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "333:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "44:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "69:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
-                getPath("InputMissingJavadocTypeTags.java"), expected);
+                getPath("InputMissingJavadocTypeTagsOne.java"), expected);
+    }
+
+    @Test
+    public void testTagsTwo() throws Exception {
+        final String[] expected = {
+            "20:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputMissingJavadocTypeTagsTwo.java"), expected);
+    }
+
+    @Test
+    public void testTagsThree() throws Exception {
+        final String[] expected = {
+            "20:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputMissingJavadocTypeTagsThree.java"), expected);
+    }
+
+    @Test
+    public void testTagsFour() throws Exception {
+        final String[] expected = {
+            "20:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputMissingJavadocTypeTagsFour.java"), expected);
     }
 
     @Test
@@ -150,21 +177,31 @@ public void testEclipse() throws Exception {
     }
 
     @Test
-    public void testScopes() throws Exception {
+    public void testScopesOne() throws Exception {
         final String[] expected = {
             "13:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "25:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "37:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "49:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "62:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "73:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "85:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "97:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "109:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "121:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
-                getPath("InputMissingJavadocTypeNoJavadoc1.java"),
+                getPath("InputMissingJavadocTypeNoJavadoc1One.java"),
+               expected);
+    }
+
+    @Test
+    public void testScopesTwo() throws Exception {
+        final String[] expected = {
+            "13:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "15:1: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "26:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "38:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "50:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "62:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "74:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputMissingJavadocTypeNoJavadoc1Two.java"),
                expected);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
index 2302a1e294c..94b7b8c233c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,10 +22,16 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck.MSG_KEY;
 
+import java.nio.charset.CodingErrorAction;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.TreeWalker;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 
 public class NonEmptyAtclauseDescriptionCheckTest
         extends AbstractModuleTestSupport {
@@ -95,4 +101,30 @@ public void testCheckTwo() throws Exception {
         };
         verifyWithInlineConfigParser(getPath("InputNonEmptyAtclauseDescriptionTwo.java"), expected);
     }
+
+    /**
+     * This tests that the check does not fail when the input file contains malformed characters
+     * for a particular charset. The test file contains the character {@code ü} which is not
+     * mappable to US-ASCII. It makes sure that malformed characters than cannot be mapped are
+     * replaced with the default replacement character using {@link CodingErrorAction#REPLACE}.
+     *
+     * @throws Exception exception
+     */
+    @SuppressForbidden
+    @Test
+    public void testDecoderOnMalformedInput() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        final DefaultConfiguration checkConfig =
+                createModuleConfig(NonEmptyAtclauseDescriptionCheck.class);
+
+        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
+        treeWalkerConfig.addChild(checkConfig);
+
+        final DefaultConfiguration checkerConfig = createRootConfig(treeWalkerConfig);
+        checkerConfig.addChild(treeWalkerConfig);
+        checkerConfig.addProperty("charset", "US-ASCII");
+
+        verify(checkerConfig,
+                getPath("InputNonEmptyAtclauseDescriptionDifferentCharset.java"), expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckTest.java
index 52bb7ebf3a4..55d99019cd6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
index 08a85616677..2d93654023d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java
index 9361872def0..fc11a82b503 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -306,11 +306,29 @@ public void testForbidden2() throws Exception {
 
     @Test
     public void testSummaryJavaDoc() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        verifyWithInlineConfigParser(
+                getPath("InputSummaryJavadoc1.java"), expected);
+    }
+
+    @Test
+    public void testSummaryJavaDoc2() throws Exception {
         final String[] expected = {
             "15: " + getCheckMessage(MSG_SUMMARY_JAVADOC),
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputSummaryJavadoc1.java"), expected);
+                getPath("InputSummaryJavadoc2.java"), expected);
+    }
+
+    @Test
+    public void testInheritDoc() throws Exception {
+        final String[] expected = {
+            "14: " + getCheckMessage(MSG_SUMMARY_FIRST_SENTENCE),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputSummaryJavadocInheritDoc.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java
index 4923f402557..54f1db054cb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -60,7 +60,7 @@ public void testTag() throws Exception {
         final String[] expected = {
             "15: " + getCheckMessage(MSG_WRITE_TAG, "@author", "Daniel Grenner"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTag.java"), expected);
+        verifyWithInlineConfigParserTwice(getPath("InputWriteTag.java"), expected);
     }
 
     @Test
@@ -68,7 +68,8 @@ public void testMissingFormat() throws Exception {
         final String[] expected = {
             "15: " + getCheckMessage(MSG_WRITE_TAG, "@author", "Daniel Grenner"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagMissingFormat.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagMissingFormat.java"), expected);
     }
 
     @Test
@@ -77,7 +78,8 @@ public void testTagIncomplete() throws Exception {
             "16: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete",
                 "This class needs more code..."),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagIncomplete.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagIncomplete.java"), expected);
     }
 
     @Test
@@ -86,7 +88,8 @@ public void testDoubleTag() throws Exception {
             "18: " + getCheckMessage(MSG_WRITE_TAG, "@doubletag", "first text"),
             "19: " + getCheckMessage(MSG_WRITE_TAG, "@doubletag", "second text"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagDoubleTag.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagDoubleTag.java"), expected);
     }
 
     @Test
@@ -94,7 +97,8 @@ public void testEmptyTag() throws Exception {
         final String[] expected = {
             "19: " + getCheckMessage(MSG_WRITE_TAG, "@emptytag", ""),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagEmptyTag.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagEmptyTag.java"), expected);
     }
 
     @Test
@@ -102,7 +106,8 @@ public void testMissingTag() throws Exception {
         final String[] expected = {
             "20: " + getCheckMessage(MSG_MISSING_TAG, "@missingtag"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagMissingTag.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagMissingTag.java"), expected);
     }
 
     @Test
@@ -112,7 +117,8 @@ public void testMethod() throws Exception {
                     "Add a constructor comment"),
             "36: " + getCheckMessage(MSG_WRITE_TAG, "@todo", "Add a comment"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagMethod.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagMethod.java"), expected);
     }
 
     @Test
@@ -120,19 +126,21 @@ public void testSeverity() throws Exception {
         final String[] expected = {
             "16: " + getCheckMessage(MSG_WRITE_TAG, "@author", "Daniel Grenner"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagSeverity.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagSeverity.java"), expected);
     }
 
     @Test
     public void testIgnoreMissing() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verifyWithInlineConfigParser(getPath("InputWriteTagIgnore.java"), expected);
+        verifyWithInlineConfigParserTwice(getPath("InputWriteTagIgnore.java"), expected);
     }
 
     @Test
     public void testRegularEx() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verifyWithInlineConfigParser(getPath("InputWriteTagRegularExpression.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagRegularExpression.java"), expected);
     }
 
     @Test
@@ -140,7 +148,8 @@ public void testRegularExError() throws Exception {
         final String[] expected = {
             "15: " + getCheckMessage(MSG_TAG_FORMAT, "@author", "ABC"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagExpressionError.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagExpressionError.java"), expected);
     }
 
     @Test
@@ -155,7 +164,8 @@ public void testEnumsAndAnnotations() throws Exception {
             "33: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete",
                     "This annotation field needs more code..."),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagEnumsAndAnnotations.java"), expected);
+        verifyWithInlineConfigParserTwice(
+                getPath("InputWriteTagEnumsAndAnnotations.java"), expected);
     }
 
     @Test
@@ -163,7 +173,7 @@ public void testNoJavadocs() throws Exception {
         final String[] expected = {
             "13: " + getCheckMessage(MSG_MISSING_TAG, "null"),
         };
-        verifyWithInlineConfigParser(getPath("InputWriteTagNoJavadoc.java"), expected);
+        verifyWithInlineConfigParserTwice(getPath("InputWriteTagNoJavadoc.java"), expected);
     }
 
     @Test
@@ -184,7 +194,7 @@ public void testWriteTagRecordsAndCompactCtors() throws Exception {
             "62: " + getCheckMessage(MSG_WRITE_TAG, "@incomplete",
                     "Failed to recognize 'record' introduced in Java 14."),
         };
-        verifyWithInlineConfigParser(
+        verifyWithInlineConfigParserTwice(
             getNonCompilablePath("InputWriteTagRecordsAndCompactCtors.java"), expected);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtilTest.java
index ef40901be07..f0584ed4de3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/BlockTagUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtilTest.java
index 503f24fc250..6b8e7a89b56 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/utils/InlineTagUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java
index e515d4044d1..c6802aec9e7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
index ed967dd8b6a..28211b1de68 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -72,7 +72,7 @@ public void test() throws Exception {
     @Test
     public void testExcludedPackageDirectPackages() throws Exception {
         final String[] expected = {
-            "30:1: " + getCheckMessage(MSG_KEY, 2, 0, "[AAClass, ABClass]"),
+            "28:1: " + getCheckMessage(MSG_KEY, 2, 0, "[BasicHttpContext, TlsCiphers]"),
         };
 
         verifyWithInlineConfigParser(
@@ -83,9 +83,9 @@ public void testExcludedPackageDirectPackages() throws Exception {
     @Test
     public void testExcludedPackageCommonPackages() throws Exception {
         final String[] expected = {
-            "28:1: " + getCheckMessage(MSG_KEY, 2, 0, "[AAClass, ABClass]"),
-            "32:5: " + getCheckMessage(MSG_KEY, 2, 0, "[BClass, CClass]"),
-            "38:1: " + getCheckMessage(MSG_KEY, 1, 0, "[CClass]"),
+            "28:1: " + getCheckMessage(MSG_KEY, 2, 0, "[BasicHttpContext, TlsCiphers]"),
+            "32:5: " + getCheckMessage(MSG_KEY, 2, 0, "[BasicClientTlsStrategy, CommandSupport]"),
+            "38:1: " + getCheckMessage(MSG_KEY, 1, 0, "[CommandSupport]"),
         };
         verifyWithInlineConfigParser(
                 getPath("InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java"),
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
index bcb1617ac8f..0e269583078 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -313,8 +313,8 @@ public void testClearStateImportedClassPackages() throws Exception {
                 .that(importAst.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, importAst.get(),
-                    "importedClassPackages",
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                    importAst.orElseThrow(), "importedClassPackages",
                     importedClssPackage -> ((Map<String, String>) importedClssPackage).isEmpty()))
                 .isTrue();
     }
@@ -339,7 +339,7 @@ public void testClearStateClassContexts() throws Exception {
                 .that(classDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.get(),
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.orElseThrow(),
                         "classesContexts",
                         classContexts -> ((Collection<?>) classContexts).size() == 1))
                 .isTrue();
@@ -365,10 +365,24 @@ public void testClearStatePackageName() throws Exception {
                 .that(packageDef.isPresent())
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, packageDef.get(),
-                        "packageName",
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                        packageDef.orElseThrow(), "packageName",
                         packageName -> ((String) packageName).isEmpty()))
                 .isTrue();
     }
 
+    /**
+     * Test [ClassName]::new expression. Such expression will be processed as a
+     * normal declaration of a new instance. We need to make sure this does not
+     *
+     * @throws Exception when code tested throws exception
+     */
+    @Test
+    public void testLambdaNew() throws Exception {
+        final String[] expected = {};
+        // no violation until #14787
+        verifyWithInlineConfigParser(
+                getPath("InputClassFanOutComplexityLambdaNew.java"), expected);
+    }
+
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
index 66a70003c8d..2b3a59d0935 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java
index f8709ddf1a5..ce1a56657f7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
index 30ac02fa8cd..61cf3af25bb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -174,7 +174,7 @@ public void testStatefulFieldsClearedOnBeginTree3() throws Exception {
                 .isTrue();
 
         assertWithMessage("State is not cleared on beginTree")
-                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, question.get(),
+                .that(TestUtil.isStatefulFieldClearedDuringBeginTree(check, question.orElseThrow(),
                         "processingTokenEnd", processingTokenEnd -> {
                             return TestUtil.<Integer>getInternalState(processingTokenEnd,
                                     "endLineNo") == 0
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java
index bdd2eabdf1c..d2b3399b39c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java
index f3bd633aa71..d559bd065bc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java
index 4ddd5d8a812..4a182943c19 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java
index af4601e7fef..39fc43f17d5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@
 
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck.MSG_KEY;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import org.junit.jupiter.api.Test;
 
@@ -135,7 +135,7 @@ public void testNestedClassConsInPublicInterfaceHasValidPublicModifier() throws
         };
 
         verifyWithInlineConfigParser(
-            getPath("InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java"),
+            getPath("InputRedundantModifierNestedClassInInt.java"),
             expected);
     }
 
@@ -166,9 +166,9 @@ public void testWrongTokenType() {
         final DetailAstImpl ast = new DetailAstImpl();
         ast.initialize(TokenTypes.LITERAL_NULL, "null");
 
-        final IllegalStateException exception = assertThrows(IllegalStateException.class, () -> {
-            obj.visitToken(ast);
-        }, "IllegalStateException was expected");
+        final IllegalStateException exception =
+                getExpectedThrowable(IllegalStateException.class,
+                        () -> obj.visitToken(ast), "IllegalStateException was expected");
 
         assertWithMessage("Expected and actual violation messages do not match")
                 .that(exception.getMessage())
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
index ffa882b4f2f..8f527cb74bc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java
index c2240540ad1..8de18fbd997 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOptionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOptionTest.java
index 5c74363368f..e139831c2a7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOptionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AccessModifierOptionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java
index 1c7d696b256..a3d195300ee 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java
index 56c63e9c195..ca0ca88408a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java
index 1d93603343f..eb9bd5aa6b9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckTest.java
index b28ee43c0a1..4ec9d78d889 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java
index b0c9645e168..be75bab620e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckTest.java
index 3b29fa8481e..aac903673f8 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java
index 559bea42cba..9568e3a2dcb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java
index bb6788cd6b7..db40f5613ca 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java
index 0285904ca93..3d27b3eeaa2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java
index 7e67eaea6a8..48201a9af31 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java
index 9ed7293f65e..740e19a2d4d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java
index 02a7647dd0f..24f9f04bfd8 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java
index 9b22892778d..512605076c3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckTest.java
index 910cbe51a6b..74147d76225 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckTest.java
index 9cd1fa5494f..239b216774f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckTest.java
index b3543f186fa..f754f7913e6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java
index 711cf3a2290..e3577538d63 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java
index e0ebb790ee0..96b469a5cf1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java
index 9aad9e05239..a48e8c0a304 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
-import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
 public class RegexpCheckTest extends AbstractModuleTestSupport {
@@ -64,13 +63,17 @@ public void testRequiredPass() throws Exception {
 
     @Test
     public void testRequiredFail() throws Exception {
-        final DefaultConfiguration checkConfig =
-            createModuleConfig(RegexpCheck.class);
-        checkConfig.addProperty("format", "This\\stext is not in the file");
         final String[] expected = {
-            "0: " + getCheckMessage(MSG_REQUIRED_REGEXP, "This\\stext is not in the file"),
+            "1: " + getCheckMessage(MSG_REQUIRED_REGEXP, "This\\stext is not in the file"),
         };
-        verify(checkConfig, getPath("InputRegexpSemantic2.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputRegexpSemantic2.java"), expected);
+    }
+
+    @Test
+    public void testDefault() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputRegexpCheckDefault.java"), expected);
     }
 
     @Test
@@ -138,7 +141,7 @@ public void testIllegalFailAboveErrorLimit() throws Exception {
     public void testMessagePropertyGood()
             throws Exception {
         final String[] expected = {
-            "77: " + getCheckMessage(MSG_ILLEGAL_REGEXP, "Bad line :("),
+            "78: " + getCheckMessage(MSG_ILLEGAL_REGEXP, "Bad line :("),
         };
         verifyWithInlineConfigParser(
                 getPath("InputRegexpSemantic9.java"), expected);
@@ -148,7 +151,7 @@ public void testMessagePropertyGood()
     public void testMessagePropertyBad()
             throws Exception {
         final String[] expected = {
-            "77: " + getCheckMessage(MSG_ILLEGAL_REGEXP, "System\\.(out)|(err)\\.print(ln)?\\("),
+            "78: " + getCheckMessage(MSG_ILLEGAL_REGEXP, "System\\.(out)|(err)\\.print(ln)?\\("),
         };
         verifyWithInlineConfigParser(
                 getPath("InputRegexpSemantic10.java"), expected);
@@ -158,7 +161,7 @@ public void testMessagePropertyBad()
     public void testMessagePropertyBad2()
             throws Exception {
         final String[] expected = {
-            "77: " + getCheckMessage(MSG_ILLEGAL_REGEXP, "System\\.(out)|(err)\\.print(ln)?\\("),
+            "78: " + getCheckMessage(MSG_ILLEGAL_REGEXP, "System\\.(out)|(err)\\.print(ln)?\\("),
         };
         verifyWithInlineConfigParser(
                 getPath("InputRegexpSemantic11.java"), expected);
@@ -167,7 +170,7 @@ public void testMessagePropertyBad2()
     @Test
     public void testIgnoreCaseTrue() throws Exception {
         final String[] expected = {
-            "77: " + getCheckMessage(MSG_ILLEGAL_REGEXP,
+            "78: " + getCheckMessage(MSG_ILLEGAL_REGEXP,
                     "(?i)SYSTEM\\.(OUT)|(ERR)\\.PRINT(LN)?\\("),
         };
         verifyWithInlineConfigParser(
@@ -177,7 +180,7 @@ public void testIgnoreCaseTrue() throws Exception {
     @Test
     public void testIgnoreCaseFalse() throws Exception {
         final String[] expectedTrue = {
-            "77: " + getCheckMessage(MSG_ILLEGAL_REGEXP,
+            "78: " + getCheckMessage(MSG_ILLEGAL_REGEXP,
                     "(?i)SYSTEM\\.(OUT)|(ERR)\\.PRINT(LN)?\\("),
         };
         verifyWithInlineConfigParser(
@@ -273,23 +276,17 @@ public void testIgnoreCommentsNoSpaces() throws Exception {
 
     @Test
     public void testOnFileStartingWithEmptyLine() throws Exception {
-        final DefaultConfiguration checkConfig = createModuleConfig(RegexpCheck.class);
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputRegexpStartingWithEmptyLine.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputRegexpStartingWithEmptyLine.java"), expected);
     }
 
     @Test
     public void testIgnoreCommentsCppStyleWithIllegalPatternFalse() throws Exception {
         // See if the comment is removed properly
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(RegexpCheck.class);
-        checkConfig.addProperty("format", "don't use trailing comments");
-        checkConfig.addProperty("illegalPattern", "false");
-        checkConfig.addProperty("ignoreComments", "true");
         final String[] expected = {
-            "0: " + getCheckMessage(MSG_REQUIRED_REGEXP, "don't use trailing comments"),
+            "1: " + getCheckMessage(MSG_REQUIRED_REGEXP, "don't use trailing comments"),
         };
-        verify(checkConfig, getPath("InputRegexpTrailingComment11.java"), expected);
+        verifyWithInlineConfigParser(getPath("InputRegexpTrailingComment11.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java
index 35d4d2dd3e5..31e560c897a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java
index f10cfa8b49f..71cd4a45968 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck.MSG_MATCH;
 import static com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck.MSG_MISMATCH;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import java.io.File;
 import java.util.Collections;
@@ -244,7 +244,7 @@ public void testException() throws Exception {
         final File file = new File(getPath("") + "\u0000" + File.separatorChar + "Test");
         final RegexpOnFilenameCheck check = new RegexpOnFilenameCheck();
         check.setFileNamePattern(Pattern.compile("BAD"));
-        final CheckstyleException ex = assertThrows(CheckstyleException.class,
+        final CheckstyleException ex = getExpectedThrowable(CheckstyleException.class,
                 () -> check.process(file, new FileText(file, Collections.emptyList())),
                 "CheckstyleException expected");
         assertWithMessage("Invalid exception message")
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java
index ee43026dbca..22012866071 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java
index 21637721848..4240610bf03 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java
index 4f0b9d26cfe..af5792dcf61 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java
index 6b58d456235..63d685375f0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java
index 004cfe41f23..15bd3bf984c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheckTest.java
index 324645b0504..75630d4dee8 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java
index fc4a8d0f5c1..2b44692ba58 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,9 +21,13 @@
 
 import static com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck.MSG_KEY;
 
+import java.nio.charset.CodingErrorAction;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 
 public class LineLengthCheckTest extends AbstractModuleTestSupport {
 
@@ -118,4 +122,27 @@ public void testLineLengthIgnoringImportStatements() throws Exception {
             getNonCompilablePath("InputLineLengthIgnoringImportStatements.java"), expected);
     }
 
+    /**
+     * This tests that the check does not fail when the file contains unmappable characters.
+     * Unmappable characters should be replaced with the default replacement character
+     * {@link CodingErrorAction#REPLACE}. For example, the 0x80 (hex.) character is unmappable
+     * in the IBM1098 charset.
+     *
+     * @throws Exception exception
+     */
+    @SuppressForbidden
+    @Test
+    public void testUnmappableCharacters() throws Exception {
+        final String[] expected = {
+            "4: " + getCheckMessage(MSG_KEY, 75, 238),
+        };
+
+        final DefaultConfiguration checkConfig = createModuleConfig(LineLengthCheck.class);
+        checkConfig.addProperty("max", "75");
+
+        final DefaultConfiguration checkerConfig = createRootConfig(checkConfig);
+        checkerConfig.addProperty("charset", "IBM1098");
+
+        verify(checkerConfig, getPath("InputLineLengthUnmappableCharacters.java"), expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java
index 0a7869ab05e..7bc133c412a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -78,22 +78,35 @@ public void testDefaults() throws Exception {
     }
 
     @Test
-    public void testThrees() throws Exception {
+    public void testThreesOne() throws Exception {
 
         final String[] expected = {
-            "15:1: " + getCheckMessage(MSG_PACKAGE_METHODS, 5, 3),
-            "15:1: " + getCheckMessage(MSG_PRIVATE_METHODS, 5, 3),
-            "15:1: " + getCheckMessage(MSG_PROTECTED_METHODS, 5, 3),
-            "15:1: " + getCheckMessage(MSG_PUBLIC_METHODS, 5, 3),
-            "15:1: " + getCheckMessage(MSG_MANY_METHODS, 20, 3),
-            "21:3: " + getCheckMessage(MSG_PUBLIC_METHODS, 5, 3),
-            "21:3: " + getCheckMessage(MSG_MANY_METHODS, 5, 3),
-            "57:3: " + getCheckMessage(MSG_PUBLIC_METHODS, 5, 3),
-            "57:3: " + getCheckMessage(MSG_MANY_METHODS, 5, 3),
+            "15:1: " + getCheckMessage(MSG_PACKAGE_METHODS, 4, 3),
+            "15:1: " + getCheckMessage(MSG_PRIVATE_METHODS, 4, 3),
+            "15:1: " + getCheckMessage(MSG_PROTECTED_METHODS, 4, 3),
+            "15:1: " + getCheckMessage(MSG_PUBLIC_METHODS, 4, 3),
+            "15:1: " + getCheckMessage(MSG_MANY_METHODS, 16, 3),
         };
 
         verifyWithInlineConfigParser(
-                getPath("InputMethodCount1.java"), expected);
+                getPath("InputMethodCount1One.java"), expected);
+    }
+
+    @Test
+    public void testThreesTwo() throws Exception {
+
+        final String[] expected = {
+            "14:1: " + getCheckMessage(MSG_PACKAGE_METHODS, 4, 3),
+            "14:1: " + getCheckMessage(MSG_PRIVATE_METHODS, 4, 3),
+            "14:1: " + getCheckMessage(MSG_MANY_METHODS, 8, 3),
+            "20:3: " + getCheckMessage(MSG_PROTECTED_METHODS, 4, 3),
+            "20:3: " + getCheckMessage(MSG_MANY_METHODS, 4, 3),
+            "50:3: " + getCheckMessage(MSG_PUBLIC_METHODS, 4, 3),
+            "50:3: " + getCheckMessage(MSG_MANY_METHODS, 4, 3),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputMethodCount1Two.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java
index db8c07ca327..20cecb8c4d5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -61,12 +61,19 @@ public void testGetAcceptableTokens() {
     }
 
     @Test
-    public void testIt() throws Exception {
+    public void testItOne() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputMethodLengthSimpleOne.java"), expected);
+    }
+
+    @Test
+    public void testItTwo() throws Exception {
         final String[] expected = {
-            "76:5: " + getCheckMessage(MSG_KEY, 20, 19, "longMethod"),
+            "16:5: " + getCheckMessage(MSG_KEY, 20, 19, "longMethod"),
         };
         verifyWithInlineConfigParser(
-                getPath("InputMethodLengthSimple.java"), expected);
+                getPath("InputMethodLengthSimpleTwo.java"), expected);
     }
 
     @Test
@@ -100,10 +107,17 @@ public void testCountEmpty() throws Exception {
     }
 
     @Test
-    public void testAbstract() throws Exception {
+    public void testAbstractOne() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getPath("InputMethodLengthModifierOne.java"), expected);
+    }
+
+    @Test
+    public void testAbstractTwo() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
         verifyWithInlineConfigParser(
-                getPath("InputMethodLengthModifier.java"), expected);
+                getPath("InputMethodLengthModifierTwo.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java
index 079a06be74e..1ac6b722b1e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -131,7 +131,7 @@ public void testClearState() throws Exception {
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
                 .that(
-                    TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.get(),
+                    TestUtil.isStatefulFieldClearedDuringBeginTree(check, classDef.orElseThrow(),
                             "currentDepth",
                             currentDepth -> ((Number) currentDepth).intValue() == 0))
                 .isTrue();
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java
index 2223ae577fc..31100f8917a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -123,4 +123,35 @@ public void testIgnoreOverriddenMethodsFalse()
                 getPath("InputParameterNumber2.java"), expected);
     }
 
+    @Test
+    public void testIgnoreAnnotatedBy() throws Exception {
+        final String[] expected = {
+            "23:10: " + getCheckMessage(MSG_KEY, 2, 3),
+            "30:10: " + getCheckMessage(MSG_KEY, 2, 4),
+            "35:14: " + getCheckMessage(MSG_KEY, 2, 3),
+            "43:9: " + getCheckMessage(MSG_KEY, 2, 4),
+            "58:30: " + getCheckMessage(MSG_KEY, 2, 3),
+            "62:29: " + getCheckMessage(MSG_KEY, 2, 3),
+            "77:34: " + getCheckMessage(MSG_KEY, 2, 4),
+            "97:10: " + getCheckMessage(MSG_KEY, 2, 3),
+            "106:14: " + getCheckMessage(MSG_KEY, 2, 3),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputParameterNumberIgnoreAnnotatedBy.java"), expected);
+    }
+
+    @Test
+    public void testIgnoreAnnotatedByFullyQualifiedClassName() throws Exception {
+        final String[] expected = {
+            "15:10: " + getCheckMessage(MSG_KEY, 2, 3),
+            "17:10: " + getCheckMessage(MSG_KEY, 2, 3),
+            "23:10: " + getCheckMessage(MSG_KEY, 2, 3),
+            "27:10: " + getCheckMessage(MSG_KEY, 2, 3),
+            "41:14: " + getCheckMessage(MSG_KEY, 2, 3),
+            "45:14: " + getCheckMessage(MSG_KEY, 2, 3),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java"),
+                expected);
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckTest.java
index 066552fe313..ffc7f8572b5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java
index d52d0a31fb7..0deb564ca8a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java
index 7594311868c..54803513d9e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java
index 649bef34234..cd733198fd4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java
index f6c256234e7..eef1430ade2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
index 84724ce8775..5c2d4027275 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,6 +71,7 @@ public void testDefault() throws Exception {
             "22:44: " + getCheckMessage(MSG_WS_PRECEDED, "<"),
             "22:44: " + getCheckMessage(MSG_WS_FOLLOWED, "<"),
             "22:54: " + getCheckMessage(MSG_WS_PRECEDED, ">"),
+            "22:54: " + getCheckMessage(MSG_WS_FOLLOWED, ">"),
             "23:14: " + getCheckMessage(MSG_WS_PRECEDED, "<"),
             "23:14: " + getCheckMessage(MSG_WS_FOLLOWED, "<"),
             "23:21: " + getCheckMessage(MSG_WS_PRECEDED, "<"),
@@ -85,6 +86,7 @@ public void testDefault() throws Exception {
             "23:70: " + getCheckMessage(MSG_WS_PRECEDED, ">"),
             "23:70: " + getCheckMessage(MSG_WS_FOLLOWED, ">"),
             "23:72: " + getCheckMessage(MSG_WS_PRECEDED, ">"),
+            "23:72: " + getCheckMessage(MSG_WS_FOLLOWED, ">"),
             "36:18: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "<"),
             "36:20: " + getCheckMessage(MSG_WS_ILLEGAL_FOLLOW, ">"),
             "48:22: " + getCheckMessage(MSG_WS_PRECEDED, "<"),
@@ -173,6 +175,103 @@ public void testGenericWhitespaceWithEmoji() throws Exception {
                 getPath("InputGenericWhitespaceWithEmoji.java"), expected);
     }
 
+    @Test
+    public void testBeforeCtorInvocation() throws Exception {
+        final String[] expected = {
+            "17:31: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "19:56: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "19:56: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "24:25: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "27:36: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "31:35: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "31:35: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "31:47: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "31:47: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "38:34: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "39:47: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "40:28: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "40:48: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "47:41: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "50:47: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "52:44: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputGenericWhitespaceBeforeCtorInvocation.java"), expected);
+    }
+
+    @Test
+    public void testAfterNew() throws Exception {
+        final String[] expected = {
+            "17:30: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "21:12: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "21:12: " + getCheckMessage(MSG_WS_NOT_PRECEDED, '<'),
+            "21:23: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "21:23: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "28:22: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "33:31: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "33:31: " + getCheckMessage(MSG_WS_NOT_PRECEDED, '<'),
+            "33:40: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "33:40: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "41:28: " + getCheckMessage(MSG_WS_NOT_PRECEDED, '<'),
+            "41:36: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "41:56: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "41:61: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "41:63: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "41:65: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "41:66: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "41:85: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "41:92: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputGenericWhitespaceAfterNew.java"), expected);
+    }
+
+    @Test
+    public void testBeforeRecordHeader() throws Exception {
+        final String[] expected = {
+            "17:20: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "18:20: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "18:20: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "18:24: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "18:24: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "30:27: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "30:38: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "30:80: " + getCheckMessage(MSG_WS_ILLEGAL_FOLLOW, '>'),
+            "36:38: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "43:44: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "43:69: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "49:21: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "49:64: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "49:66: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "56:63: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "56:80: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "62:36: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "62:61: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "67:49: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "73:26: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "73:51: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "73:64: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "80:26: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "80:34: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "80:55: " + getCheckMessage(MSG_WS_ILLEGAL_FOLLOW, '>'),
+            "91:25: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "91:44: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "91:47: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "91:61: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "91:71: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "91:73: " + getCheckMessage(MSG_WS_PRECEDED, '>'),
+            "101:25: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "101:58: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "108:25: " + getCheckMessage(MSG_WS_PRECEDED, '<'),
+            "108:32: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+            "108:46: " + getCheckMessage(MSG_WS_FOLLOWED, '<'),
+            "108:63: " + getCheckMessage(MSG_WS_FOLLOWED, '>'),
+        };
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputGenericWhitespaceBeforeRecordHeader.java"),
+                expected);
+    }
+
     /**
      * Checks if the private field {@code depth} is properly cleared during the
      * start of processing the next file in the check.
@@ -196,8 +295,8 @@ public void testClearState() throws Exception {
                 .isTrue();
         assertWithMessage("State is not cleared on beginTree")
                 .that(
-                    TestUtil.isStatefulFieldClearedDuringBeginTree(check, genericStart.get(),
-                            "depth",
+                    TestUtil.isStatefulFieldClearedDuringBeginTree(check,
+                            genericStart.orElseThrow(), "depth",
                             depth -> ((Number) depth).intValue() == 0))
                 .isTrue();
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java
index b6abfc3591b..119041ee18e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java
index 318fbb7c8bf..77ce6e9c38e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
index c00d8f61b9e..cd217ae395f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheckTest.java
index 73f9dce27d7..5f92b770883 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java
index a45f2cacafa..a2014ba059a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java
index ba91ca84977..f2dde275816 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
index 9145de12462..15667a21e0e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java
index 6de724a94a1..3c68b5b4d01 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheckTest.java
index 0ac253a33b4..ce5151e3634 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java
index c8a0da0020e..d43e9d2894b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java
index a903ef65c05..1c78efc9b9a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java
index 82c916038f7..0c88829402c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -260,6 +260,13 @@ public void testSwitchWhitespaceAround() throws Exception {
                 getPath("InputWhitespaceAroundSwitch.java"), expected);
     }
 
+    @Test
+    public void testSwitchExpressionWhitespaceAround() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("InputWhitespaceAroundSwitchExpressions.java"), expected);
+    }
+
     @Test
     public void testDoWhileWhitespaceAround() throws Exception {
         final String[] expected = {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterTest.java
index c629c991ebe..df13f334a16 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElementTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElementTest.java
index f8d8412e995..1457aa7d429 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElementTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElementTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElementTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElementTest.java
index bbee5791736..d63ce2cf104 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElementTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterElementTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElementTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElementTest.java
index 14765b07389..b8aa52747bd 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElementTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterElementTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java
index 48fae1cbdb7..ae81daee7d7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElementTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElementTest.java
index 196bc3e5c69..afac23c2808 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElementTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressFilterElementTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -286,8 +286,7 @@ public void testEquals() {
     public void testEqualsAndHashCode() {
         final EqualsVerifierReport ev = EqualsVerifier.forClass(SuppressFilterElement.class)
                 .usingGetClass()
-                .withIgnoredFields("fileRegexp", "checkRegexp", "messageRegexp", "columnFilter",
-                        "lineFilter")
+                .withIgnoredFields("columnFilter", "lineFilter")
                 .suppress(Warning.NONFINAL_FIELDS)
                 .report();
         assertWithMessage("Error: " + ev.getMessage())
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java
index 6a0efda78fe..267f7db168c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java
index 077dbd05ea5..9c171ebd094 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java
index ca5b41d3f16..aed3100cfed 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java
index 7eb0fbf50f6..4e635c77f30 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java
index 19ae666512a..2c58de16a5f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,24 +21,33 @@
 
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.JavaParser;
 import com.puppycrawl.tools.checkstyle.TreeWalker;
 import com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FileContents;
 import com.puppycrawl.tools.checkstyle.api.FileText;
+import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
+import com.puppycrawl.tools.checkstyle.api.TextBlock;
 import com.puppycrawl.tools.checkstyle.api.Violation;
 import com.puppycrawl.tools.checkstyle.checks.coding.IllegalCatchCheck;
 import com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck;
 import com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck;
+import com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck;
 import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -649,4 +658,52 @@ private static List<Comparable<Object>> getTagsAfterExecution(SuppressionComment
         return TestUtil.getInternalState(filter, "tags");
     }
 
+    @Test
+    public void testCachingByFileContentsInstance() throws Exception {
+
+        final File file = new File(getPath("InputSuppressionCommentFilterSuppressById6.java"));
+        final DetailAST rootAst = JavaParser.parseFile(file, JavaParser.Options.WITH_COMMENTS);
+        final String[] lines = {"//CSOFF", "//CSON"};
+        final FileContents fileContents = new FileContents(
+                new FileText(file, Arrays.asList(lines)));
+        for (int lineNo = 0; lineNo < lines.length; lineNo++) {
+            final int colNo = lines[lineNo].indexOf("//");
+            if (colNo >= 0) {
+                fileContents.reportSingleLineComment(lineNo + 1, colNo);
+            }
+        }
+
+        final FileContents mockedContents = mock();
+        final Map<Integer, TextBlock> returnValue = fileContents.getSingleLineComments();
+        when(mockedContents.getSingleLineComments())
+                .thenReturn(returnValue)
+                .thenThrow(new IllegalStateException("Second call is not allowed"));
+
+        final String[] args = {"line_length", "^[a-z][a-zA-Z0-9]*$"};
+        final Violation violation = new Violation(27, 9, 58,
+                "com.puppycrawl.tools.checkstyle.checks.naming.messages",
+                "name.invalidPattern",
+                args,
+                SeverityLevel.ERROR,
+                "ignore",
+                MemberNameCheck.class,
+                null);
+
+        final TreeWalkerAuditEvent event = new TreeWalkerAuditEvent(
+                mockedContents, file.getAbsolutePath(), violation, rootAst);
+
+        final SuppressionCommentFilter filter = new SuppressionCommentFilter();
+        filter.setOffCommentFormat(Pattern.compile("CSOFF"));
+        filter.setOnCommentFormat(Pattern.compile("CSON"));
+        filter.setCheckFormat("MemberNameCheck");
+        filter.finishLocalSetup();
+
+        assertWithMessage("should accept")
+                .that(filter.accept(event)).isTrue();
+        // due to caching in filter second execution should not do parsing of comments in file
+        // so exception is not expected
+        assertWithMessage("should accept")
+                .that(filter.accept(event)).isTrue();
+    }
+
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
index 4c1c352fba8..61b87fe92a5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,6 +28,7 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -168,14 +169,15 @@ public void testUseCacheLocalFileExternalResourceContentDoesNotChange() throws E
         filterConfig.addProperty("file", getPath("InputSuppressionFilterNone.xml"));
 
         final DefaultConfiguration checkerConfig = createRootConfig(filterConfig);
-        final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File cacheFile = new File(temporaryFolder, uniqueFileName);
         checkerConfig.addProperty("cacheFile", cacheFile.getPath());
 
-        final String filePath = File.createTempFile("file", ".java", temporaryFolder).getPath();
+        final File filePath = new File(temporaryFolder, uniqueFileName);
 
-        execute(checkerConfig, filePath);
+        execute(checkerConfig, filePath.toString());
         // One more time to use cache.
-        execute(checkerConfig, filePath);
+        execute(checkerConfig, filePath.toString());
     }
 
     @Test
@@ -200,13 +202,14 @@ public void testUseCacheRemoteFileExternalResourceContentDoesNotChange() throws
         firstFilterConfig.addProperty("file", urlForTest);
 
         final DefaultConfiguration firstCheckerConfig = createRootConfig(firstFilterConfig);
-        final File cacheFile = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName1 = "junit_" + UUID.randomUUID() + ".java";
+        final File cacheFile = new File(temporaryFolder, uniqueFileName1);
         firstCheckerConfig.addProperty("cacheFile", cacheFile.getPath());
 
-        final String pathToEmptyFile =
-                File.createTempFile("file", ".java", temporaryFolder).getPath();
+        final String uniqueFileName2 = "file_" + UUID.randomUUID() + ".java";
+        final File pathToEmptyFile = new File(temporaryFolder, uniqueFileName2);
 
-        execute(firstCheckerConfig, pathToEmptyFile);
+        execute(firstCheckerConfig, pathToEmptyFile.toString());
 
         // One more time to use cache.
         final DefaultConfiguration secondFilterConfig =
@@ -217,7 +220,7 @@ public void testUseCacheRemoteFileExternalResourceContentDoesNotChange() throws
         final DefaultConfiguration secondCheckerConfig = createRootConfig(secondFilterConfig);
         secondCheckerConfig.addProperty("cacheFile", cacheFile.getPath());
 
-        execute(secondCheckerConfig, pathToEmptyFile);
+        execute(secondCheckerConfig, pathToEmptyFile.toString());
     }
 
     private static boolean isConnectionAvailableAndStable(String url) throws Exception {
@@ -286,4 +289,32 @@ public void testXpathSuppression() throws Exception {
                     expected, suppressed);
         }
     }
+
+    @Test
+    public void testSuppression2() throws Exception {
+        final String pattern = "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$";
+        final String[] expected = {
+            "19:29: " + getCheckMessage(ConstantNameCheck.class,
+                                        MSG_INVALID_PATTERN, "bad_name", pattern),
+        };
+        final String[] suppressed = {
+            "19:29: " + getCheckMessage(ConstantNameCheck.class,
+                                        MSG_INVALID_PATTERN, "bad_name", pattern),
+
+        };
+        verifyFilterWithInlineConfigParser(getPath("InputSuppressionFilter7.java"),
+                                           expected, removeSuppressed(expected, suppressed));
+    }
+
+    @Test
+    public void testSuppression3() throws Exception {
+        final String pattern = "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$";
+        final String[] expected = {
+            "19:29: " + getCheckMessage(ConstantNameCheck.class,
+                                        MSG_INVALID_PATTERN, "bad_name", pattern),
+        };
+        final String[] suppressed = CommonUtil.EMPTY_STRING_ARRAY;
+        verifyFilterWithInlineConfigParser(getPath("InputSuppressionFilter8.java"),
+                                           expected, removeSuppressed(expected, suppressed));
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilterTest.java
index ed0b4582d57..d972f0fa6a2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java
index 06e53e77fa8..b8abfe5399b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -233,4 +233,45 @@ public void testXpathSuppression() throws Exception {
                     expected, removeSuppressed(expected, suppressed));
         }
     }
+
+    @Test
+    public void testXpathSuppression2() throws Exception {
+        final String pattern = "[^a-zA-z0-9]*";
+        final String[] expected = {
+            "18:14: " + getCheckMessage(IllegalTokenTextCheck.class, MSG_KEY, pattern),
+        };
+
+        final String[] suppressed = {
+            "18:14: " + getCheckMessage(IllegalTokenTextCheck.class, MSG_KEY, pattern),
+        };
+
+        verifyFilterWithInlineConfigParser(getPath("InputSuppressionXpathFilter5.java"),
+                                           expected, removeSuppressed(expected, suppressed));
+    }
+
+    @Test
+    public void testXpathSuppression3() throws Exception {
+        final String pattern = "[^a-zA-z0-9]*";
+        final String[] expected = {
+            "18:14: " + getCheckMessage(IllegalTokenTextCheck.class, MSG_KEY, pattern),
+        };
+
+        final String[] suppressed = {
+            "18:14: " + getCheckMessage(IllegalTokenTextCheck.class, MSG_KEY, pattern),
+        };
+
+        verifyFilterWithInlineConfigParser(getPath("InputSuppressionXpathFilter6.java"),
+                                           expected, removeSuppressed(expected, suppressed));
+    }
+
+    @Test
+    public void testXpathSuppression4() throws Exception {
+        final String[] suppressed = {
+            "20:29: " + getCheckMessage(ConstantNameCheck.class,
+                                        MSG_INVALID_PATTERN, "bad_name", PATTERN),
+        };
+        verifyFilterWithInlineConfigParser(getPath("InputSuppressionXpathFilter7.java"),
+                                           ALL_MESSAGES,
+                                           removeSuppressed(ALL_MESSAGES, suppressed));
+    }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilterTest.java
index d4ea5b90ddc..d85219fb914 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,11 +26,13 @@
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.JavaParser;
 import com.puppycrawl.tools.checkstyle.TreeWalkerAuditEvent;
 import com.puppycrawl.tools.checkstyle.api.FileContents;
 import com.puppycrawl.tools.checkstyle.api.FileText;
@@ -400,6 +402,55 @@ public void testDecideById() throws Exception {
                 expected, removeSuppressed(expected, suppressed));
     }
 
+    /**
+     * This test is required to cover pitest mutation
+     * for reset of 'file' field in SuppressionXpathSingleFilter.
+     * This not possible to reproduce by natural execution of Checkstyle
+     * as config is never changed in runtime.
+     * Projects that use us by api can reproduce this case.
+     * We need to allow users to reset module property to default state.
+     *
+     * @throws Exception when there is problem to load Input file
+     */
+    @Test
+    public void testUpdateFilterSettingsInRunTime() throws Exception {
+        final File file = new File(getPath("InputSuppressionXpathSingleFilterComplexQuery.java"));
+
+        final SuppressionXpathSingleFilter filter = new SuppressionXpathSingleFilter();
+        filter.setChecks("MagicNumber");
+        filter.finishLocalSetup();
+
+        final Violation violation = new Violation(27, 21, TokenTypes.NUM_DOUBLE, "",
+                        "", null, null, null,
+                        MagicNumberCheck.class, null);
+
+        final FileContents fileContents =
+                new FileContents(new FileText(file, StandardCharsets.UTF_8.name()));
+
+        final TreeWalkerAuditEvent ev = new TreeWalkerAuditEvent(fileContents, file.getName(),
+                violation, JavaParser.parseFile(file, JavaParser.Options.WITHOUT_COMMENTS));
+
+        assertWithMessage("match ia expected as 'files' is defaulted")
+                .that(filter.accept(ev))
+                .isFalse();
+
+        // set non-default value for files
+        filter.setFiles(Pattern.quote(file.getPath() + ".never.match"));
+        filter.finishLocalSetup();
+
+        assertWithMessage("no match is expected due to weird value in 'files'")
+                .that(filter.accept(ev))
+                .isTrue();
+
+        // reset files to default value of filter
+        filter.setFiles(null);
+        filter.finishLocalSetup();
+
+        assertWithMessage("match ia expected as 'files' is defaulted")
+                .that(filter.accept(ev))
+                .isFalse();
+    }
+
     private static SuppressionXpathSingleFilter createSuppressionXpathSingleFilter(
             String files, String checks, String message, String moduleId, String query) {
         final SuppressionXpathSingleFilter filter = new SuppressionXpathSingleFilter();
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
index 10b830dbfc8..09b8cd64f93 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElementTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElementTest.java
index db3aa6453d4..308d4d5dce3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElementTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/XpathFilterElementTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -351,8 +351,7 @@ public void testEqualsAndHashCode() throws Exception {
                 xpathEvaluator.createExpression("//METHOD_DEF"),
                 xpathEvaluator.createExpression("//VARIABLE_DEF"))
                 .usingGetClass()
-                .withIgnoredFields("fileRegexp", "checkRegexp", "messageRegexp",
-                    "xpathExpression", "isEmptyConfig")
+                .withIgnoredFields("xpathExpression", "isEmptyConfig")
                 .report();
         assertWithMessage("Error: " + ev.getMessage())
                 .that(ev.isSuccessful())
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java
index 4d34181d501..d67079ce00d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerTest.java
index eadb7cdf748..13fc47794e9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/EmbeddedNullCharTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/EmbeddedNullCharTest.java
index cec879f6d6d..be4d6904e85 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/EmbeddedNullCharTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/EmbeddedNullCharTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJava14LexerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJava14LexerTest.java
index 369da20d680..bb3a6ae07cf 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJava14LexerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJava14LexerTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java
index ad79c508249..f0bc432cc45 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -27,6 +27,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.antlr.v4.runtime.VocabularyImpl;
@@ -43,6 +44,23 @@
  */
 public class GeneratedJavaTokenTypesTest {
 
+    /**
+     * The following tokens are not declared in the lexer's 'tokens' block,
+     * they will always appear last in the list of symbolic names provided
+     * by the vocabulary. They are not part of the public API and are only
+     * used as components of parser rules.
+     */
+    private static final List<String> INTERNAL_TOKENS = List.of(
+            "DECIMAL_LITERAL_LONG",
+            "DECIMAL_LITERAL",
+            "HEX_LITERAL_LONG",
+            "HEX_LITERAL",
+            "OCT_LITERAL_LONG",
+            "OCT_LITERAL",
+            "BINARY_LITERAL_LONG",
+            "BINARY_LITERAL"
+    );
+
     /**
      * <p>
      * New tokens must be added onto the end of the list with new numbers, and
@@ -73,6 +91,9 @@ public void testTokenNumbering() {
         assertWithMessage(message)
             .that(JavaLanguageLexer.COMPILATION_UNIT)
             .isEqualTo(1);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.PLACEHOLDER1)
+            .isEqualTo(2);
         assertWithMessage(message)
             .that(JavaLanguageLexer.NULL_TREE_LOOKAHEAD)
             .isEqualTo(3);
@@ -715,17 +736,51 @@ public void testTokenNumbering() {
         assertWithMessage(message)
              .that(JavaLanguageLexer.RECORD_PATTERN_COMPONENTS)
              .isEqualTo(216);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.STRING_TEMPLATE_BEGIN)
+            .isEqualTo(217);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.STRING_TEMPLATE_MID)
+            .isEqualTo(218);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.STRING_TEMPLATE_END)
+            .isEqualTo(219);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.STRING_TEMPLATE_CONTENT)
+            .isEqualTo(220);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.EMBEDDED_EXPRESSION_BEGIN)
+            .isEqualTo(221);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.EMBEDDED_EXPRESSION)
+            .isEqualTo(222);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.EMBEDDED_EXPRESSION_END)
+            .isEqualTo(223);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.LITERAL_UNDERSCORE)
+            .isEqualTo(224);
+        assertWithMessage(message)
+            .that(JavaLanguageLexer.UNNAMED_PATTERN_DEF)
+            .isEqualTo(225);
+
+        final Set<String> modeNames = Set.of(JavaLanguageLexer.modeNames);
+        final Set<String> channelNames = Set.of(JavaLanguageLexer.channelNames);
 
         final int tokenCount = (int) Arrays.stream(JavaLanguageLexer.class.getDeclaredFields())
                 .filter(GeneratedJavaTokenTypesTest::isPublicStaticFinalInt)
+                .filter(field -> !modeNames.contains(field.getName()))
+                .filter(field -> !channelNames.contains(field.getName()))
+                .filter(field -> !INTERNAL_TOKENS.contains(field.getName()))
                 .count();
 
-        // Read JavaDoc before changing count below
+        // Read JavaDoc before changing count below, the count should be equal to
+        // the number of the last token asserted above.
         assertWithMessage("all tokens must be added to list in"
                         + " 'GeneratedJavaTokenTypesTest' and verified"
                         + " that their old numbering didn't change")
             .that(tokenCount)
-            .isEqualTo(228);
+            .isEqualTo(225);
     }
 
     /**
@@ -740,27 +795,13 @@ public void testTokenHasBeenAddedToTokensBlockInLexerGrammar() {
         final String[] nullableSymbolicNames = vocabulary.getSymbolicNames();
         final List<String> allTokenNames = Arrays.stream(nullableSymbolicNames)
                 .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-
-        // Since the following tokens are not declared in the 'tokens' block,
-        // they will always appear last in the list of symbolic names provided
-        // by the vocabulary.
-        final List<String> unusedTokenNames = List.of(
-                // reserved keywords that are not part of the language
-                "LITERAL_CONST", "LITERAL_GOTO",
-
-                // Lexer tokens that are not part of our API (they are used as components of
-                // parser rules, but the token name is changed).
-                "DECIMAL_LITERAL_LONG", "DECIMAL_LITERAL", "HEX_LITERAL_LONG",
-                "HEX_LITERAL", "OCT_LITERAL_LONG", "OCT_LITERAL", "BINARY_LITERAL_LONG",
-                "BINARY_LITERAL"
-        );
+                .collect(Collectors.toUnmodifiableList());
 
         // Get the starting index of the sublist of tokens, or -1 if sublist
         // is not present.
         final int lastIndexOfSublist =
-                Collections.lastIndexOfSubList(allTokenNames, unusedTokenNames);
-        final int expectedNumberOfUsedTokens = allTokenNames.size() - unusedTokenNames.size();
+                Collections.lastIndexOfSubList(allTokenNames, INTERNAL_TOKENS);
+        final int expectedNumberOfUsedTokens = allTokenNames.size() - INTERNAL_TOKENS.size();
         final String message = "New tokens must be added to the 'tokens' block in the"
                 + " lexer grammar.";
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/HexFloatsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/HexFloatsTest.java
index d9e9cb87b46..0f939824fee 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/HexFloatsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/HexFloatsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java14RecordsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java14RecordsTest.java
index dd4cec591c9..4976b148883 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java14RecordsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java14RecordsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7DiamondTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7DiamondTest.java
index cbd95ef1dd3..1d965134107 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7DiamondTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7DiamondTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7MultiCatchTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7MultiCatchTest.java
index 9bf15314917..b567af7189b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7MultiCatchTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7MultiCatchTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7NumericalLiteralsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7NumericalLiteralsTest.java
index d0011e5dfd5..849b2d10aa5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7NumericalLiteralsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7NumericalLiteralsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7StringSwitchTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7StringSwitchTest.java
index 2cdcc7c729c..8b173aecc17 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7StringSwitchTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7StringSwitchTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7TryWithResourcesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7TryWithResourcesTest.java
index c0f812b4690..65eba8a4e57 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7TryWithResourcesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java7TryWithResourcesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java
index e2cc9a279c0..993e5889c01 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/LineCommentAtTheEndOfFileTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/LineCommentAtTheEndOfFileTest.java
index bb7bd3e1e77..d3ff284b4d2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/LineCommentAtTheEndOfFileTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/LineCommentAtTheEndOfFileTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/MultiDimensionalArraysInGenericsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/MultiDimensionalArraysInGenericsTest.java
index 35084aa499a..64b705bc13c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/MultiDimensionalArraysInGenericsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/MultiDimensionalArraysInGenericsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/UnicodeEscapeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/UnicodeEscapeTest.java
index 4c15f9a3ad2..f80bf86585a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/UnicodeEscapeTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/UnicodeEscapeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/VarargTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/VarargTest.java
index 6575318d5d0..1f8740a84a5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/VarargTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/VarargTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Antlr4AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Antlr4AstRegressionTest.java
index a14ae24576c..8bf6204571e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Antlr4AstRegressionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Antlr4AstRegressionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Java17AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Java17AstRegressionTest.java
index bf43e2160e8..728d8a0d2b8 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Java17AstRegressionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/antlr4/Java17AstRegressionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/AllBlockCommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/AllBlockCommentsTest.java
deleted file mode 100644
index 3f834cccd6e..00000000000
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/AllBlockCommentsTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////
-// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.puppycrawl.tools.checkstyle.grammar.comments;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.junit.jupiter.api.Test;
-
-import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
-import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.internal.utils.CheckUtil;
-import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
-
-public class AllBlockCommentsTest extends AbstractModuleTestSupport {
-
-    private static final Set<String> ALL_COMMENTS = new LinkedHashSet<>();
-
-    private static String lineSeparator;
-
-    @Override
-    protected String getPackageLocation() {
-        return "com/puppycrawl/tools/checkstyle/grammar/comments";
-    }
-
-    @Test
-    public void testAllBlockComments() throws Exception {
-        final DefaultConfiguration checkConfig =
-                createModuleConfig(BlockCommentListenerCheck.class);
-        final String path = getPath("InputFullOfBlockComments.java");
-        lineSeparator = CheckUtil.getLineSeparatorForFile(path, StandardCharsets.UTF_8);
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
-        verify(checkConfig, path, expected);
-        assertWithMessage("All comments should be empty")
-            .that(ALL_COMMENTS)
-            .isEmpty();
-    }
-
-    public static class BlockCommentListenerCheck extends AbstractCheck {
-
-        @Override
-        public boolean isCommentNodesRequired() {
-            return true;
-        }
-
-        @Override
-        public int[] getDefaultTokens() {
-            return getAcceptableTokens();
-        }
-
-        @Override
-        public int[] getAcceptableTokens() {
-            return new int[] {TokenTypes.BLOCK_COMMENT_BEGIN};
-        }
-
-        @Override
-        public int[] getRequiredTokens() {
-            return getAcceptableTokens();
-        }
-
-        @Override
-        public void init() {
-            ALL_COMMENTS.addAll(Arrays.asList("0", "1", "2", "3", "4", "5",
-                    "6", "7", "8", "9", "10", "11", "12", "13", "14", "15",
-                    "16", "17", "18", "19", "20",
-                    lineSeparator + "21" + lineSeparator,
-                    "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32",
-                    "33", "34", "35", "36", "37", "38", "  39  ", "40", "41",
-                    "42", "43", "44", "45", "46", "47", "48", "49", "50",
-                    "51", "52", "53", "54", "55", "56", "57", "58", "59",
-                    "60", "61"));
-        }
-
-        @Override
-        public void visitToken(DetailAST ast) {
-            final String commentContent = ast.getFirstChild().getText();
-            assertWithMessage("Unexpected comment: %s", commentContent)
-                    .that(ALL_COMMENTS.remove(commentContent))
-                    .isTrue();
-        }
-
-    }
-
-}
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/AllSinglelineCommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/AllSinglelineCommentsTest.java
deleted file mode 100644
index 6dbd277c4b2..00000000000
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/AllSinglelineCommentsTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////
-// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.puppycrawl.tools.checkstyle.grammar.comments;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.nio.charset.StandardCharsets;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.junit.jupiter.api.Test;
-
-import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
-import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.internal.utils.CheckUtil;
-
-public class AllSinglelineCommentsTest extends AbstractModuleTestSupport {
-
-    private static final Set<String> ALL_COMMENTS = new LinkedHashSet<>();
-
-    private static String lineSeparator;
-
-    @Override
-    protected String getPackageLocation() {
-        return "com/puppycrawl/tools/checkstyle/grammar/comments";
-    }
-
-    @Test
-    public void testAllSinglelineComments() throws Exception {
-        final DefaultConfiguration checkConfig =
-            createModuleConfig(SinglelineCommentListenerCheck.class);
-        final String path = getPath("InputFullOfSinglelineComments.java");
-        lineSeparator = CheckUtil.getLineSeparatorForFile(path, StandardCharsets.UTF_8);
-        execute(checkConfig, path);
-        assertWithMessage("All comments should be empty")
-            .that(ALL_COMMENTS)
-            .isEmpty();
-    }
-
-    public static class SinglelineCommentListenerCheck extends AbstractCheck {
-
-        @Override
-        public boolean isCommentNodesRequired() {
-            return true;
-        }
-
-        @Override
-        public int[] getDefaultTokens() {
-            return getAcceptableTokens();
-        }
-
-        @Override
-        public int[] getAcceptableTokens() {
-            return new int[] {TokenTypes.SINGLE_LINE_COMMENT};
-        }
-
-        @Override
-        public int[] getRequiredTokens() {
-            return getAcceptableTokens();
-        }
-
-        @Override
-        public void init() {
-            final int lines = 63;
-            for (int i = 0; i < lines; i++) {
-                ALL_COMMENTS.add(i + lineSeparator);
-            }
-            ALL_COMMENTS.add(String.valueOf(lines));
-        }
-
-        @Override
-        public void visitToken(DetailAST ast) {
-            final String commentContent = ast.getFirstChild().getText();
-            assertWithMessage("Unexpected comment: %s", commentContent)
-                    .that(ALL_COMMENTS.remove(commentContent))
-                    .isTrue();
-        }
-
-    }
-
-}
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/CommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/CommentsTest.java
index 3c143dec277..bcca198f6bd 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/CommentsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/comments/CommentsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -46,6 +46,20 @@ public void testCompareExpectedTreeWithInput2() throws Exception {
                 JavaParser.Options.WITH_COMMENTS);
     }
 
+    @Test
+    public void testInputFullOfBlockComments() throws Exception {
+        verifyAst(getPath("InputFullOfBlockCommentsAst.txt"),
+                    getPath("InputFullOfBlockComments.java"),
+                JavaParser.Options.WITH_COMMENTS);
+    }
+
+    @Test
+    public void testInputFullOfSinglelineComments() throws Exception {
+        verifyAst(getPath("InputFullOfSinglelineCommentsAst.txt"),
+                    getPath("InputFullOfSinglelineComments.java"),
+                JavaParser.Options.WITH_COMMENTS);
+    }
+
     @Test
     public void testToString() {
         final Comment comment = new Comment(new String[] {"value"}, 1, 2, 3);
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java
index 2a28115ed3a..9b03718f67f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java19/Java19AstRegressionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java20/Java20AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java20/Java20AstRegressionTest.java
index 14fd38bf2a6..7b57ca021e0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java20/Java20AstRegressionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java20/Java20AstRegressionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java21/Java21AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java21/Java21AstRegressionTest.java
new file mode 100644
index 00000000000..0b13380d500
--- /dev/null
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java21/Java21AstRegressionTest.java
@@ -0,0 +1,155 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+import static org.junit.Assert.assertThrows;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractTreeTestSupport;
+import com.puppycrawl.tools.checkstyle.JavaParser;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+
+public class Java21AstRegressionTest extends AbstractTreeTestSupport {
+
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/grammar/java21";
+    }
+
+    @Test
+    public void testBasicStringTemplate() throws Exception {
+        verifyAst(
+                getNonCompilablePath(
+                        "ExpectedStringTemplateBasic.txt"),
+                getNonCompilablePath(
+                        "InputStringTemplateBasic.java"));
+    }
+
+    /**
+     * The purpose of this test is to exercise the
+     * {@link com.puppycrawl.tools.checkstyle.grammar.CompositeLexerContextCache}:
+     * getting some curly brace contexts on the stack, making sure that each
+     * element in the stack has some depth. This ensures that we can handle
+     * many nested curly braces within an embedded template expression.
+     *
+     * @throws Exception upon failure
+     */
+    @Test
+    public void testStringTemplateNested() throws Exception {
+        verifyAst(
+                getNonCompilablePath(
+                        "ExpectedStringTemplateNested.txt"),
+                getNonCompilablePath(
+                        "InputStringTemplateNested.java"));
+    }
+
+    /**
+     * Test for tabs instead of spaces in the input file.
+     * All node columns are -3 when compared to the above test. This is
+     * because the input file has tabs instead of spaces. '\t' is
+     * one character vs. four spaces.
+     */
+    @Test
+    public void testBasicStringTemplateWithTabs() throws Exception {
+        verifyAst(
+                getNonCompilablePath(
+                        "ExpectedStringTemplateBasicWithTabs.txt"),
+                getNonCompilablePath(
+                        "InputStringTemplateBasicWithTabs.java"));
+    }
+
+    @Test
+    public void testUnnamedVariableBasic() throws Exception {
+        verifyAst(
+                getNonCompilablePath(
+                        "ExpectedUnnamedVariableBasic.txt"),
+                getNonCompilablePath(
+                        "InputUnnamedVariableBasic.java"));
+    }
+
+    @Test
+    public void testUnnamedVariableSwitch() throws Exception {
+        verifyAst(
+                getNonCompilablePath(
+                        "ExpectedUnnamedVariableSwitch.txt"),
+                getNonCompilablePath(
+                        "InputUnnamedVariableSwitch.java"));
+    }
+
+    @Test
+    public void testTextBlockConsecutiveEscapes() throws Exception {
+        verifyAst(
+                getNonCompilablePath(
+                        "ExpectedTextBlockConsecutiveEscapes.txt"),
+                getNonCompilablePath(
+                        "InputTextBlockConsecutiveEscapes.java"));
+    }
+
+    @Test
+    public void testStringTemplateMultiLineWithComments() throws Exception {
+        verifyAst(
+                getNonCompilablePath(
+                        "ExpectedStringTemplateMultiLineWithComments.txt"),
+                getNonCompilablePath(
+                        "InputStringTemplateMultiLineWithComments.java"),
+                JavaParser.Options.WITH_COMMENTS
+        );
+    }
+
+    /**
+     * Unusual test case, but important to prevent regressions. We need to
+     * make sure that we only consume legal escapes in text blocks, and
+     * don't unintentionally parse something that should be an
+     * escape as regular text.
+     *
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testTextBlockParsingFail() throws Exception {
+        final File file =
+                new File(getNonCompilablePath("InputTextBlockParsingFail.java.fail"));
+
+        final Throwable throwable =
+                assertThrows("Exception should be thrown due to parsing failure.",
+                        CheckstyleException.class,
+                        () -> JavaParser.parseFile(file, JavaParser.Options.WITHOUT_COMMENTS)
+                );
+
+        final String incorrectThrowableCauseMessage =
+                "Cause of CheckstyleException should be IllegalStateException.";
+
+        assertWithMessage(incorrectThrowableCauseMessage)
+                .that(throwable.getCause())
+                .isInstanceOf(IllegalStateException.class);
+
+        final String incorrectParsingFailureMessage =
+                "Message of IllegalStateException should contain the parsing failure.";
+
+        assertWithMessage(incorrectParsingFailureMessage)
+                .that(throwable.getCause().getMessage())
+                .contains("13:14: mismatched input '}\\n"
+                        + "            ' expecting TEXT_BLOCK_LITERAL_END");
+
+    }
+}
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationTest.java
index 8d831c6ef5a..d874793e22e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationsOnArrayTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationsOnArrayTest.java
index e3f6a74fe87..50903ad6e4b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationsOnArrayTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/AnnotationsOnArrayTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/DefaultMethodsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/DefaultMethodsTest.java
index 6323420f28e..0443a417f15 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/DefaultMethodsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/DefaultMethodsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/LambdaTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/LambdaTest.java
index f95bce6fdf6..f7881455126 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/LambdaTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/LambdaTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/MethodReferencesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/MethodReferencesTest.java
index c0866cb92a7..f01b4c0c850 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/MethodReferencesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/MethodReferencesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/ReceiverParameterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/ReceiverParameterTest.java
index 345658c09cb..c4e79a02ee2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/ReceiverParameterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/ReceiverParameterTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/TypeUseAnnotationsOnQualifiedTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/TypeUseAnnotationsOnQualifiedTypesTest.java
index 87306283426..7152d8d9c59 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/TypeUseAnnotationsOnQualifiedTypesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/java8/TypeUseAnnotationsOnQualifiedTypesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocTokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocTokenTypesTest.java
index 34147a91f79..45dedf4a383 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocTokenTypesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocTokenTypesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java
index ba6fe906f92..b5fc7cc5c89 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/JavadocParseTreeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditorTest.java
index c9440025613..d3c950ee47f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java
index 381157cb62e..9f8c1d23171 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java
index f84cd3b71fd..8390005e13d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.gui;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -211,7 +211,7 @@ private void verifyCorrectTestDataInFrameModel() throws IOException {
 
     @Test
     public void testShouldAcceptDirectory() {
-        final File directory = mock(File.class);
+        final File directory = mock();
         when(directory.isDirectory()).thenReturn(true);
         assertWithMessage("MainFrame should accept directory")
                 .that(MainFrameModel.shouldAcceptFile(directory))
@@ -228,7 +228,7 @@ public void testShouldAcceptFile() throws IOException {
 
     @Test
     public void testShouldNotAcceptNonJavaFile() {
-        final File nonJavaFile = mock(File.class);
+        final File nonJavaFile = mock();
         when(nonJavaFile.isDirectory()).thenReturn(false);
         when(nonJavaFile.getName()).thenReturn(FILE_NAME_NON_JAVA);
         assertWithMessage("MainFrame should not accept non-Java file")
@@ -247,11 +247,11 @@ public void testShouldNotAcceptNonExistentFile() throws IOException {
     @Test
     public void testOpenFileForUnknownParseMode() throws IOException {
         final File javaFile = new File(getPath(FILE_NAME_TEST_DATA));
-        final ParseMode mock = mock(ParseMode.class);
+        final ParseMode mock = mock();
         model.setParseMode(mock);
-        final IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> {
-            model.openFile(javaFile);
-        });
+        final IllegalArgumentException ex =
+                getExpectedThrowable(IllegalArgumentException.class,
+                        () -> model.openFile(javaFile));
         assertWithMessage("Invalid error message")
                 .that(ex)
                 .hasMessageThat()
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java
index 1dd74545a60..0d3f2081fe4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java
index 9425363aaaa..8b86fe915fd 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java
index ccbf3d012cd..a93df7e39fb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java
index b79747296a9..19311df3287 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java
index 9d79f5db3b4..d5baa5c2b86 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/TreeTableTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java
index a23aae30f0e..dc541ddb573 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -85,14 +85,14 @@ public class AllChecksTest extends AbstractModuleTestSupport {
 
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NoWhitespaceBefore", Stream.of(
                 // we use GenericWhitespace for this behavior
-                "GENERIC_START", "GENERIC_END").collect(Collectors.toSet()));
+                "GENERIC_START", "GENERIC_END").collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("AbbreviationAsWordInName", Stream.of(
                 // enum values should be uppercase, we use EnumValueNameCheck instead
-                "ENUM_CONSTANT_DEF").collect(Collectors.toSet()));
+                "ENUM_CONSTANT_DEF").collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("FinalLocalVariable", Stream.of(
                 // we prefer all parameters be effectively final as to not damage readability
                 // we use ParameterAssignmentCheck to enforce this
-                "PARAMETER_DEF").collect(Collectors.toSet()));
+                "PARAMETER_DEF").collect(Collectors.toUnmodifiableSet()));
         // we have no need to block these specific tokens
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("IllegalToken",
                 Stream.of("LITERAL_SUPER", "LITERAL_ASSERT", "ENUM_CONSTANT_DEF",
@@ -134,24 +134,25 @@ public class AllChecksTest extends AbstractModuleTestSupport {
                         "RECORD_COMPONENTS", "RECORD_COMPONENT_DEF", "COMPACT_CTOR_DEF",
                         "TEXT_BLOCK_LITERAL_BEGIN", "TEXT_BLOCK_CONTENT", "TEXT_BLOCK_LITERAL_END",
                         "LITERAL_YIELD", "SWITCH_RULE")
-                        .collect(Collectors.toSet()));
+                        .collect(Collectors.toUnmodifiableSet()));
         // we have no need to block specific token text
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("IllegalTokenText",
                 Stream.of("NUM_DOUBLE", "NUM_FLOAT", "NUM_INT", "NUM_LONG", "IDENT",
-                    "COMMENT_CONTENT", "STRING_LITERAL", "CHAR_LITERAL", "TEXT_BLOCK_CONTENT")
-                    .collect(Collectors.toSet()));
+                    "COMMENT_CONTENT", "STRING_LITERAL", "CHAR_LITERAL", "TEXT_BLOCK_CONTENT",
+                    "STRING_TEMPLATE_CONTENT")
+                    .collect(Collectors.toUnmodifiableSet()));
         // we do not use this check as it is deprecated
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("WriteTag",
                 Stream.of("ENUM_CONSTANT_DEF", "METHOD_DEF", "CTOR_DEF",
                     "ANNOTATION_FIELD_DEF", "RECORD_DEF", "COMPACT_CTOR_DEF")
-                    .collect(Collectors.toSet()));
+                    .collect(Collectors.toUnmodifiableSet()));
         // state of the configuration when test was made until reason found in
         // https://github.com/checkstyle/checkstyle/issues/3730
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("AnnotationLocation",
                 Stream.of("CLASS_DEF", "CTOR_DEF", "ENUM_DEF", "INTERFACE_DEF",
                         "METHOD_DEF", "VARIABLE_DEF",
                         "RECORD_DEF", "COMPACT_CTOR_DEF")
-                        .collect(Collectors.toSet()));
+                        .collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NoLineWrap", Stream.of(
                 // method/constructor declaration could be long due to "parameters/exceptions", it
                 // is ok to be not strict there
@@ -159,43 +160,44 @@ public class AllChecksTest extends AbstractModuleTestSupport {
                 // type declaration could be long due to "extends/implements", it is ok to
                 // be not strict there
                 "CLASS_DEF", "ENUM_DEF", "INTERFACE_DEF", "RECORD_DEF")
-                .collect(Collectors.toSet()));
+                .collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NoWhitespaceAfter", Stream.of(
                 // whitespace after is preferred
-                "TYPECAST", "LITERAL_SYNCHRONIZED").collect(Collectors.toSet()));
+                "TYPECAST", "LITERAL_SYNCHRONIZED").collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("SeparatorWrap", Stream.of(
                 // needs context to decide what type of parentheses should be separated or not
                 // which this check does not provide
-                "LPAREN", "RPAREN").collect(Collectors.toSet()));
+                "LPAREN", "RPAREN").collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NeedBraces", Stream.of(
                 // we prefer no braces here as it looks unusual even though they help avoid sharing
                 // scope of variables
-                "LITERAL_DEFAULT", "LITERAL_CASE").collect(Collectors.toSet()));
+                "LITERAL_DEFAULT", "LITERAL_CASE").collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("FinalParameters", Stream.of(
                 // we prefer these to be effectively final as to not damage readability
-                "FOR_EACH_CLAUSE", "LITERAL_CATCH").collect(Collectors.toSet()));
+                "FOR_EACH_CLAUSE", "LITERAL_CATCH").collect(Collectors.toUnmodifiableSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("WhitespaceAround", Stream.of(
                 // we prefer no spaces on one side or both for these tokens
                 "ARRAY_INIT",
                 "ELLIPSIS",
                 // these are covered by GenericWhitespaceCheck
-                "WILDCARD_TYPE", "GENERIC_END", "GENERIC_START").collect(Collectors.toSet()));
+                "WILDCARD_TYPE", "GENERIC_END", "GENERIC_START")
+            .collect(Collectors.toUnmodifiableSet()));
 
         // google
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("AnnotationLocation", Stream.of(
                 // state of the configuration when test was made until reason found in
                 // https://github.com/checkstyle/checkstyle/issues/3730
                 "ANNOTATION_DEF", "ANNOTATION_FIELD_DEF", "ENUM_CONSTANT_DEF", "PACKAGE_DEF")
-                .collect(Collectors.toSet()));
+                .collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("AbbreviationAsWordInName", Stream.of(
                 // enum values should be uppercase
-                "ENUM_CONSTANT_DEF").collect(Collectors.toSet()));
+                "ENUM_CONSTANT_DEF").collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NoLineWrap", Stream.of(
                 // method declaration could be long due to "parameters/exceptions", it is ok to
                 // be not strict there
                 "METHOD_DEF", "CTOR_DEF", "CLASS_DEF", "ENUM_DEF", "INTERFACE_DEF", "RECORD_DEF",
                 "COMPACT_CTOR_DEF")
-                .collect(Collectors.toSet()));
+                .collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("SeparatorWrap", Stream.of(
                 // location could be any to allow writing expressions for indexes evaluation
                 // on new line, see https://github.com/checkstyle/checkstyle/issues/3752
@@ -208,10 +210,11 @@ public class AllChecksTest extends AbstractModuleTestSupport {
                 "SEMI",
                 // needs context to decide what type of parentheses should be separated or not
                 // which this check does not provide
-                "LPAREN", "RPAREN").collect(Collectors.toSet()));
+                "LPAREN", "RPAREN").collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NeedBraces", Stream.of(
                 // google doesn't require or prevent braces on these
-                "LAMBDA", "LITERAL_DEFAULT", "LITERAL_CASE").collect(Collectors.toSet()));
+                "LAMBDA", "LITERAL_DEFAULT", "LITERAL_CASE")
+            .collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("EmptyBlock", Stream.of(
                 // google doesn't specifically mention empty braces at the start of a case/default
                 "LITERAL_DEFAULT", "LITERAL_CASE",
@@ -222,7 +225,7 @@ public class AllChecksTest extends AbstractModuleTestSupport {
                 // state of the configuration when test was made until
                 // https://github.com/checkstyle/checkstyle/issues/4121
                 "INSTANCE_INIT", "LITERAL_DO", "LITERAL_FOR", "LITERAL_SYNCHRONIZED",
-                "LITERAL_WHILE", "STATIC_INIT").collect(Collectors.toSet()));
+                "LITERAL_WHILE", "STATIC_INIT").collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("WhitespaceAround", Stream.of(
                 //  allowed via '4.8.3 Arrays'
                 "ARRAY_INIT",
@@ -230,12 +233,18 @@ public class AllChecksTest extends AbstractModuleTestSupport {
                 "ELLIPSIS",
                 // google prefers no spaces on one side or both for these tokens
                 "GENERIC_START", "GENERIC_END", "WILDCARD_TYPE")
-                .collect(Collectors.toSet()));
+                .collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("IllegalTokenText", Stream.of(
-                // all other java tokens and text are allowed
-                "NUM_DOUBLE", "NUM_FLOAT", "NUM_INT", "NUM_LONG", "IDENT",
-                "COMMENT_CONTENT", "STRING_LITERAL", "CHAR_LITERAL", "TEXT_BLOCK_CONTENT")
-                .collect(Collectors.toSet()));
+                // numerical types should not be included
+                "NUM_DOUBLE", "NUM_FLOAT", "NUM_INT", "NUM_LONG",
+                // identifiers are covered by other checks
+                "IDENT",
+                // comments should be skipped as nobody write in octal or unicode code style
+                "COMMENT_CONTENT",
+                // until #14291
+                "TEXT_BLOCK_CONTENT", "STRING_TEMPLATE_CONTENT"
+                )
+                .collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("OperatorWrap", Stream.of(
                 // specifically allowed via '4.5.1 Where to break' because the following are
                 // assignment operators and they are allowed to break before or after the symbol
@@ -244,19 +253,19 @@ public class AllChecksTest extends AbstractModuleTestSupport {
                 "MOD_ASSIGN",
                 // COLON token ignored in check config, explained in
                 // https://github.com/checkstyle/checkstyle/issues/4122
-                "COLON").collect(Collectors.toSet()));
+                "COLON").collect(Collectors.toUnmodifiableSet()));
         GOOGLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NoWhitespaceBefore", Stream.of(
                 // google uses GenericWhitespace for this behavior
                 "GENERIC_START", "GENERIC_END",
                 // whitespace is necessary between a type annotation and ellipsis
                 // according '4.6.2 Horizontal whitespace point 9'
-                "ELLIPSIS").collect(Collectors.toSet()));
+                "ELLIPSIS").collect(Collectors.toUnmodifiableSet()));
         INTERNAL_MODULES = Definitions.INTERNAL_MODULES.stream()
                 .map(moduleName -> {
                     final String[] packageTokens = moduleName.split("\\.");
                     return packageTokens[packageTokens.length - 1];
                 })
-                .collect(Collectors.toSet());
+                .collect(Collectors.toUnmodifiableSet());
     }
 
     @Override
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java
index b56df57fc21..4cffe24690d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -144,9 +144,7 @@ private static void verifyInputFile(Map<String, List<String>> allTests, File fil
             }
 
             // until https://github.com/checkstyle/checkstyle/issues/5105
-            if (!path.contains(File.separatorChar + "grammar" + File.separatorChar)
-                    && !path.contains(File.separatorChar + "foo" + File.separatorChar)
-                    && !path.contains(File.separatorChar + "bar" + File.separatorChar)) {
+            if (shouldSkipFileProcessing(path)) {
                 String fileName = file.getName();
                 final boolean skipFileNaming = shouldSkipInputFileNameCheck(path, fileName);
 
@@ -204,6 +202,20 @@ && checkInputMatchCorrectFileStructure(classes, folderPath, skipFileNaming,
                 .isTrue();
     }
 
+    /**
+     * Checks if the file processing should be skipped based on the path.
+     *
+     * @param path The path to check for skip conditions.
+     * @return true if file processing should be skipped, false otherwise.
+     */
+    private static boolean shouldSkipFileProcessing(String path) {
+        return !path.contains(File.separatorChar + "grammar" + File.separatorChar)
+                && !path.contains(File.separatorChar + "foo" + File.separatorChar)
+                && !path.contains(File.separatorChar + "bar" + File.separatorChar)
+                && !path.contains(File.separator + "abc" + File.separatorChar)
+                && !path.contains(File.separator + "zoo" + File.separatorChar);
+    }
+
     private static void verifyHasProductionFile(Map<String, List<String>> allTests, File file) {
         if (file.isFile()) {
             final String fileName = file.getName().replace("Test.java", ".java");
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitCyclesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitCyclesCheckTest.java
deleted file mode 100644
index 358b223f41a..00000000000
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitCyclesCheckTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////
-// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.puppycrawl.tools.checkstyle.internal;
-
-import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import com.tngtech.archunit.core.domain.JavaClasses;
-import com.tngtech.archunit.core.importer.ClassFileImporter;
-import com.tngtech.archunit.core.importer.ImportOption;
-import com.tngtech.archunit.lang.ArchRule;
-import com.tngtech.archunit.library.freeze.FreezingArchRule;
-
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13544")
-public class ArchUnitCyclesCheckTest {
-
-    /**
-     * This test checks that
-     * <a href="https://www.archunit.org/userguide/html/000_Index.html#_slices">slices</a> should
-     * be free of
-     * <a href="https://www.archunit.org/userguide/html/000_Index.html#_cycle_checks">cycles</a>.
-     * In this particular test, each slice is a different package. Currently the violations from
-     * this test are frozen using
-     * <a href="https://www.archunit.org/userguide/html/000_Index.html#_freezing_arch_rules">
-     * FreezingArchRule</a>.
-     *
-     * <p>Whenever a new cycle is introduced or removed, the test will pass successfully but the
-     * frozen violations will be updated. It is highly recommended to avoid new cycles and, it
-     * is preferred to remove them. In both cases commit the changes for further discussion.
-     *
-     * <p>The frozen violations are present in {@code config/archunit-store} directory.
-     */
-    @Test
-    public void testSlicesShouldBeFreeOfCycles() {
-        final JavaClasses importedClasses = new ClassFileImporter()
-            .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
-            .importPackages("com.puppycrawl.tools.checkstyle");
-
-        final ArchRule slicesShouldBeFreeOfCycles = FreezingArchRule.freeze(
-            slices()
-            .matching("com.puppycrawl.tools.checkstyle.(**)")
-            .should().beFreeOfCycles());
-
-        slicesShouldBeFreeOfCycles.check(importedClasses);
-    }
-}
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitSuperClassTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitSuperClassTest.java
index 1dd057a2a2c..f044bbd233f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitSuperClassTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitSuperClassTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
@@ -44,7 +43,6 @@
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13544")
 public class ArchUnitSuperClassTest {
 
     /**
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitTest.java
index 5c17db6d805..ff69cbceab1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.tngtech.archunit.core.domain.JavaClasses;
@@ -35,7 +34,6 @@
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.EvaluationResult;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13544")
 public class ArchUnitTest {
 
     /**
@@ -47,6 +45,12 @@ public class ArchUnitTest {
         "Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.lang"
             + ".String)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil"
             + ".EMPTY_STRING_ARRAY>",
+        "Constructor <com.puppycrawl.tools.checkstyle.api.Violation.<init>(int, int, int, int,"
+            + " java.lang.String, java.lang.String, [Ljava.lang.Object;,"
+            + " com.puppycrawl.tools.checkstyle.api.SeverityLevel, java.lang.String,"
+            + " java.lang.Class, java.lang.String)> calls method"
+            + " <com.puppycrawl.tools.checkstyle.utils.UnmodifiableCollectionUtil.copyOfArray"
+            + "([Ljava.lang.Object;, int)>",
         "Constructor <com.puppycrawl.tools.checkstyle.api.FileText.<init>(java.io.File, java.util"
             + ".List)> gets field <com.puppycrawl.tools.checkstyle.utils.CommonUtil"
             + ".EMPTY_STRING_ARRAY>",
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java
index 1ba553b1495..c75f439a6ac 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -99,12 +99,12 @@ public void validateCliUsageSection() throws Exception {
         final Set<String> shortParamsMain = commandLine.getCommandSpec().options()
                         .stream()
                         .map(OptionSpec::shortestName)
-                        .collect(Collectors.toSet());
+                        .collect(Collectors.toUnmodifiableSet());
         final Set<String> longParamsMain = commandLine.getCommandSpec().options()
                         .stream()
                         .map(OptionSpec::longestName)
                         .filter(names -> names.length() != 2)
-                        .collect(Collectors.toSet());
+                        .collect(Collectors.toUnmodifiableSet());
 
         assertWithMessage("Short parameters in Main.java and cmdline"
                 + ".xml.vm should match")
@@ -140,7 +140,7 @@ private static Set<String> getListById(Node subSection, String id) {
             result = XmlUtil.getChildrenElements(node)
                     .stream()
                     .map(Node::getTextContent)
-                    .collect(Collectors.toSet());
+                    .collect(Collectors.toUnmodifiableSet());
         }
         return result;
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
index b5609141f91..3c3b815e0ce 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -319,7 +319,7 @@ private static List<RevCommit> getCommitsByCounter(
         final Spliterator<RevCommit> spliterator =
             Spliterators.spliteratorUnknownSize(previousCommitsIterator, Spliterator.ORDERED);
         return StreamSupport.stream(spliterator, false).limit(PREVIOUS_COMMITS_TO_CHECK_COUNT)
-            .collect(Collectors.toList());
+            .collect(Collectors.toUnmodifiableList());
     }
 
     private static List<RevCommit> getCommitsByLastCommitAuthor(
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java
index b5c673e910c..cb453d57d53 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -219,7 +219,7 @@ public boolean test(JavaClass input) {
      */
     private static final Map<String, ModuleDetails> MODULE_DETAILS_MAP =
         XmlMetaReader.readAllModulesIncludingThirdPartyIfAny().stream()
-            .collect(Collectors.toMap(ModuleDetails::getFullQualifiedName,
+            .collect(Collectors.toUnmodifiableMap(ModuleDetails::getFullQualifiedName,
                                       Function.identity()));
 
     /**
@@ -378,7 +378,7 @@ public void check(JavaField item, ConditionEvents events) {
                 final String message = String
                     .format(Locale.ROOT, "Field <%s> should %s in %s",
                             item.getFullName(), getDescription(),
-                            item.getSourceCodeLocation().toString());
+                            item.getSourceCodeLocation());
                 events.add(SimpleConditionEvent.violated(item, message));
             }
         }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java
index af0edbc9c62..3b6f27faa54 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -27,14 +27,10 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -63,13 +59,14 @@
 import com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyOption;
 import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderOption;
 import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationOption;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck;
 import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;
 import com.puppycrawl.tools.checkstyle.checks.whitespace.PadOption;
 import com.puppycrawl.tools.checkstyle.checks.whitespace.WrapOption;
 import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 import com.puppycrawl.tools.checkstyle.internal.utils.XdocUtil;
 import com.puppycrawl.tools.checkstyle.internal.utils.XmlUtil;
-import com.puppycrawl.tools.checkstyle.utils.CheckUtil;
+import com.puppycrawl.tools.checkstyle.site.PropertiesMacro;
 import com.puppycrawl.tools.checkstyle.utils.JavadocUtil;
 import com.puppycrawl.tools.checkstyle.utils.ScopeUtil;
 import com.puppycrawl.tools.checkstyle.utils.TokenUtil;
@@ -104,197 +101,6 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
             .put("WrapOption", WrapOption.class)
             .put("PARAM_LITERAL", int[].class).build();
 
-    private static final Set<String> NON_BASE_TOKEN_PROPERTIES = Collections.unmodifiableSet(
-        Arrays.stream(new String[] {
-            "AtclauseOrder - target",
-            "DescendantToken - limitedTokens",
-            "IllegalType - memberModifiers",
-            "MagicNumber - constantWaiverParentToken",
-            "MultipleStringLiterals - ignoreOccurrenceContext",
-        }).collect(Collectors.toSet()));
-
-    // We skip validation of examples section on modules that have this section generated
-    // until https://github.com/checkstyle/checkstyle/issues/13429
-    private static final Set<String> MODULES_EXAMPLES_TO_SKIP = Set.of(
-        "EmptyForInitializerPad",
-        "EmptyForIteratorPad",
-        "EmptyLineSeparator",
-        "FileTabCharacter",
-        "GenericWhitespace",
-        "MethodParamPad",
-        "NoLineWrap",
-        "NoWhitespaceAfter",
-        "NoWhitespaceBefore",
-        "NoWhitespaceBeforeCaseDefaultColon",
-        "OperatorWrap",
-        "ParenPad",
-        "SeparatorWrap",
-        "SingleSpaceSeparator",
-        "TypecastParenPad",
-        "WhitespaceAround",
-        "InnerAssignment",
-        "MagicNumber",
-        "MatchXpath",
-        "MissingCtor",
-        "MissingSwitchDefault",
-        "ModifiedControlVariable",
-        "MultipleStringLiterals",
-        "MultipleVariableDeclarations",
-        "NestedForDepth",
-        "NestedIfDepth",
-        "NestedTryDepth",
-        "NoArrayTrailingComma",
-        "NoClone",
-        "BeforeExecutionExclusionFileFilter",
-        "NoEnumTrailingComma",
-        "NoFinalizer",
-        "OneStatementPerLine",
-        "OverloadMethodsDeclarationOrder",
-        "PackageDeclaration",
-        "ParameterAssignment",
-        "RequireThis",
-        "ReturnCount",
-        "SimplifyBooleanExpression",
-        "SimplifyBooleanReturn",
-        "StringLiteralEquality",
-        "SuperClone",
-        "SuperFinalize",
-        "UnnecessaryParentheses",
-        "UnnecessarySemicolonAfterOuterTypeDeclaration",
-        "UnnecessarySemicolonAfterTypeMemberDeclaration",
-        "UnnecessarySemicolonInEnumeration",
-        "UnnecessarySemicolonInTryWithResources",
-        "UnusedLocalVariable",
-        "VariableDeclarationUsageDistance",
-        "ArrayTrailingComma",
-        "AvoidDoubleBraceInitialization",
-        "AvoidInlineConditionals",
-        "AvoidNoArgumentSuperConstructorCall",
-        "CovariantEquals",
-        "DeclarationOrder",
-        "DefaultComesLast",
-        "EmptyStatement",
-        "EqualsAvoidNull",
-        "EqualsHashCode",
-        "ExplicitInitialization",
-        "FallThrough",
-        "FinalLocalVariable",
-        "HiddenField",
-        "IllegalCatch",
-        "IllegalInstantiation",
-        "IllegalThrows",
-        "IllegalToken",
-        "IllegalTokenText",
-        "IllegalType",
-        "ClassMemberImpliedModifier",
-        "InterfaceMemberImpliedModifier",
-        "ModifierOrder",
-        "RedundantModifier",
-        "AnonInnerLength",
-        "ExecutableStatementCount",
-        "FileLength",
-        "LambdaBodyLength",
-        "LineLength",
-        "MethodCount",
-        "MethodLength",
-        "OuterTypeNumber",
-        "ParameterNumber",
-        "RecordComponentNumber",
-        "AnnotationLocation",
-        "AnnotationOnSameLine",
-        "AnnotationUseStyle",
-        "MissingDeprecated",
-        "MissingOverride",
-        "SuppressWarnings",
-        "PackageAnnotation",
-        "SuppressWarningsHolder",
-        "Regexp",
-        "RegexpMultiline",
-        "RegexpOnFilename",
-        "RegexpSingleline",
-        "RegexpSinglelineJava",
-        "WhitespaceAfter",
-        "InnerTypeLast",
-        "InterfaceIsType",
-        "MutableException",
-        "OneTopLevelClass",
-        "ThrowsCount",
-        "VisibilityModifier",
-        "BooleanExpressionComplexity",
-        "ClassDataAbstractionCoupling",
-        "ClassFanOutComplexity",
-        "CyclomaticComplexity",
-        "JavaNCSS",
-        "NPathComplexity",
-        "ArrayTypeStyle",
-        "AvoidEscapedUnicodeCharacters",
-        "CommentsIndentation",
-        "DescendantToken",
-        "FinalParameters",
-        "Header",
-        "RegexpHeader",
-        "Indentation",
-        "NewlineAtEndOfFile",
-        "NoCodeInFile",
-        "OrderedProperties",
-        "OuterTypeFilename",
-        "TodoComment",
-        "AvoidStarImport",
-        "AvoidStaticImport",
-        "CustomImportOrder",
-        "IllegalImport",
-        "ImportControl",
-        "ImportOrder",
-        "RedundantImport",
-        "UnusedImports",
-        "TrailingComment",
-        "Translation",
-        "UncommentedMain",
-        "UniqueProperties",
-        "UpperEll",
-        "AtclauseOrder",
-        "InvalidJavadocPosition",
-        "JavadocBlockTagLocation",
-        "JavadocContentLocation",
-        "JavadocMethod",
-        "JavadocMissingLeadingAsterisk",
-        "JavadocMissingWhitespaceAfterAsterisk",
-        "JavadocPackage",
-        "JavadocParagraph",
-        "JavadocStyle",
-        "JavadocTagContinuationIndentation",
-        "JavadocType",
-        "JavadocVariable",
-        "MissingJavadocMethod",
-        "MissingJavadocPackage",
-        "MissingJavadocType",
-        "NonEmptyAtclauseDescription",
-        "RequireEmptyLineBeforeBlockTagGroup",
-        "SingleLineJavadoc",
-        "SummaryJavadoc",
-        "WriteTag",
-        "AbbreviationAsWordInName",
-        "AbstractClassName",
-        "CatchParameterName",
-        "ClassTypeParameterName",
-        "ConstantName",
-        "IllegalIdentifierName",
-        "InterfaceTypeParameterName",
-        "LambdaParameterName",
-        "LocalFinalVariableName",
-        "LocalVariableName",
-        "MemberName",
-        "MethodName",
-        "MethodTypeParameterName",
-        "PackageName",
-        "ParameterName",
-        "PatternVariableName",
-        "RecordComponentName",
-        "RecordTypeParameterName",
-        "StaticVariableName",
-        "TypeName"
-    );
-
     private static final List<List<Node>> CHECK_PROPERTIES = new ArrayList<>();
     private static final Map<String, String> CHECK_PROPERTY_DOC = new HashMap<>();
     private static final Map<String, String> CHECK_TEXT = new HashMap<>();
@@ -320,9 +126,10 @@ public void setUp() throws Exception {
     /**
      * Validates check javadocs and xdocs for consistency.
      *
-     * @noinspection JUnitTestMethodWithNoAssertions
+     * @noinspection JUnitTestMethodWithNoAssertions, TestMethodWithoutAssertion
      * @noinspectionreason JUnitTestMethodWithNoAssertions - asserts in callstack,
      *      but not in this method
+     * @noinspectionreason TestMethodWithoutAssertion - until issue #14625
      */
     @Test
     public void testAllCheckSectionJavaDocs() throws Exception {
@@ -552,7 +359,7 @@ private static String getDefaultValueOfType(String propertyName,
 
     private static String getValidationType(boolean isPropertyTokenType, String propertyName) {
         String result = null;
-        if (NON_BASE_TOKEN_PROPERTIES.contains(checkName + " - " + propertyName)) {
+        if (PropertiesMacro.NON_BASE_TOKEN_PROPERTIES.contains(checkName + " - " + propertyName)) {
             result = " Validation type is {@code tokenTypesSet}.";
         }
         else if (isPropertyTokenType) {
@@ -827,16 +634,11 @@ private static void visitClass(DetailAST node) {
             }
 
             if (ScopeUtil.isInScope(node, Scope.PUBLIC)) {
-                String expected = CHECK_TEXT.get("Description")
+                final String expected = CHECK_TEXT.get("Description")
                         + CHECK_TEXT.computeIfAbsent("Rule Description", unused -> "")
                         + CHECK_TEXT.computeIfAbsent("Notes", unused -> "")
-                        + CHECK_TEXT.computeIfAbsent("Properties", unused -> "");
-
-                if (!MODULES_EXAMPLES_TO_SKIP.contains(checkName)) {
-                    expected += CHECK_TEXT.get("Examples");
-                }
-
-                expected += CHECK_TEXT.get("Parent Module")
+                        + CHECK_TEXT.computeIfAbsent("Properties", unused -> "")
+                        + CHECK_TEXT.get("Parent Module")
                         + violationMessagesText + " @since "
                         + CHECK_TEXT.get("since");
 
@@ -880,7 +682,7 @@ private static void visitMethod(DetailAST node, DetailAST parentNode) {
 
         /**
          * Returns whether an AST represents a setter method. This is similar to
-         * {@link CheckUtil#isSetterMethod(DetailAST)} except this doesn't care
+         * {@link MissingJavadocMethodCheck#isSetterMethod(DetailAST)} except this doesn't care
          * about the number of children in the method.
          *
          * @param ast the AST to check with.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java
index dce3c9db1ca..92a304412fe 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java
index bf7ad2c2085..11ca27e53c0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -244,7 +244,10 @@ public void testAllChecksPresentOnAvailableChecksPage() throws Exception {
 
         CheckUtil.getSimpleNames(CheckUtil.getCheckstyleChecks())
             .stream()
-            .filter(checkName -> !"JavadocMetadataScraper".equals(checkName))
+            .filter(checkName -> {
+                return !"JavadocMetadataScraper".equals(checkName)
+                    && !"ClassAndPropertiesSettersJavadocScraper".equals(checkName);
+            })
             .forEach(checkName -> {
                 if (!isPresent(availableChecks, checkName)) {
                     assertWithMessage(
@@ -583,9 +586,10 @@ public void testAllCheckSections() throws Exception {
     /**
      * Validates xml check documentation section.
      *
-     * @noinspection JUnitTestMethodWithNoAssertions
+     * @noinspection JUnitTestMethodWithNoAssertions, TestMethodWithoutAssertion
      * @noinspectionreason JUnitTestMethodWithNoAssertions -asserts in callstack,
      *      but not in this method
+     * @noinspectionreason TestMethodWithoutAssertion - until issue #14625
      */
     @Test
     public void testAllCheckSectionsEx() throws Exception {
@@ -797,6 +801,8 @@ private static void validatePropertySection(String fileName, String sectionName,
                 .that(table.getNodeName())
                 .isEqualTo("table");
 
+            validatePropertySectionPropertiesOrder(fileName, sectionName, table, properties);
+
             validatePropertySectionProperties(fileName, sectionName, table, instance,
                     properties);
         }
@@ -807,6 +813,43 @@ private static void validatePropertySection(String fileName, String sectionName,
             .isEmpty();
     }
 
+    private static void validatePropertySectionPropertiesOrder(String fileName, String sectionName,
+                                                               Node table, Set<String> properties) {
+        final Set<Node> rows = XmlUtil.getChildrenElements(table);
+        final List<String> orderedPropertyNames = new ArrayList<>(properties);
+        final List<String> tablePropertyNames = new ArrayList<>();
+
+        // javadocTokens and tokens should be last
+        if (orderedPropertyNames.contains("javadocTokens")) {
+            orderedPropertyNames.remove("javadocTokens");
+            orderedPropertyNames.add("javadocTokens");
+        }
+        if (orderedPropertyNames.contains("tokens")) {
+            orderedPropertyNames.remove("tokens");
+            orderedPropertyNames.add("tokens");
+        }
+
+        rows
+            .stream()
+            // First row is header row
+            .skip(1)
+            .forEach(row -> {
+                final List<Node> columns = new ArrayList<>(XmlUtil.getChildrenElements(row));
+                assertWithMessage(fileName + " section '" + sectionName
+                        + "' should have the requested columns")
+                    .that(columns)
+                    .hasSize(5);
+
+                final String propertyName = columns.get(0).getTextContent();
+                tablePropertyNames.add(propertyName);
+            });
+
+        assertWithMessage(fileName + " section '" + sectionName
+                + "' should have properties in the requested order")
+            .that(tablePropertyNames)
+            .isEqualTo(orderedPropertyNames);
+    }
+
     private static void fixCapturedProperties(String sectionName, Object instance, Class<?> clss,
             Set<String> properties) {
         // remove global properties that don't need documentation
@@ -954,6 +997,11 @@ private static void validatePropertySectionPropertyEx(String fileName, String se
                         fileName, sectionName, propertyName)
                 .that(columns.get(1).getTextContent().trim())
                 .isNotEmpty();
+        assertWithMessage("%s section '%s' should have a description for %s"
+                        + " that starts with uppercase character",
+                        fileName, sectionName, propertyName)
+                .that(Character.isUpperCase(columns.get(1).getTextContent().trim().charAt(0)))
+                .isTrue();
 
         final String actualTypeName = columns.get(2).getTextContent().replace("\n", "")
                 .replace("\r", "").replaceAll(" +", " ").trim();
@@ -967,18 +1015,10 @@ private static void validatePropertySectionPropertyEx(String fileName, String se
         final Class<?> fieldClass = getFieldClass(fileName, sectionName, instance, field,
                 propertyName);
 
-        final String expectedTypeName;
-        // SuppressWarningsHolder#aliasList is backed by a static (upper case) property.
-        if ("SuppressWarningsHolder".equals(sectionName) && "aliasList".equals(propertyName)) {
-            expectedTypeName = "String[] in a format of comma separated attribute=value entries. "
-                + "The attribute is the fully qualified name of the Check and value is its alias.";
-        }
-        else {
-            expectedTypeName = Optional.ofNullable(field)
+        final String expectedTypeName = Optional.ofNullable(field)
                 .map(nonNullField -> nonNullField.getAnnotation(XdocsPropertyType.class))
                 .map(propertyType -> propertyType.value().getDescription())
                 .orElse(fieldClass.getSimpleName());
-        }
         final String expectedValue = getModulePropertyExpectedValue(sectionName, propertyName,
                 field, fieldClass, instance);
 
@@ -1125,7 +1165,8 @@ else if ("Checker".equals(sectionName) && "charset".equals(propertyName)) {
                 result = "UTF-8";
             }
             else if ("charset".equals(propertyName)) {
-                result = "the charset property of the parent Checker module";
+                result = "the charset property of the parent"
+                    + " <a href=\"https://checkstyle.org/config.html#Checker\">Checker</a> module";
             }
             else if ("PropertyCacheFile".equals(fieldClass.getSimpleName())) {
                 result = "null (no cache file)";
@@ -1369,7 +1410,7 @@ private static Set<String> getListById(Node subSection, String id) {
             result = XmlUtil.getChildrenElements(node)
                     .stream()
                     .map(Node::getTextContent)
-                    .collect(Collectors.toSet());
+                    .collect(Collectors.toUnmodifiableSet());
         }
         return result;
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsUrlTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsUrlTest.java
index f03d9a4c0c7..38c77cbb24d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsUrlTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsUrlTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -76,7 +76,7 @@ private static Map<String, List<String>> getXdocsMap() throws IOException {
                     return AbstractCheck.class.isAssignableFrom(clazz)
                             || AbstractFileSetCheck.class.isAssignableFrom(clazz);
                 })
-                .collect(Collectors.toSet());
+                .collect(Collectors.toUnmodifiableSet());
         for (Class<?> check : treeWalkerOrFileSetCheckSet) {
             final String checkName = check.getSimpleName();
             if (!TREE_WORKER.equals(checkName)) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java
index 86e7e55833b..b62bf9d36de 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -90,44 +90,20 @@ public class XpathRegressionTest extends AbstractModuleTestSupport {
     // Checks that allowed to have no XPath IT Regression Testing
     // till https://github.com/checkstyle/checkstyle/issues/6207
     private static final Set<String> MISSING_CHECK_NAMES = Set.of(
-            "BooleanExpressionComplexity",
-            "CatchParameterName",
             "ClassDataAbstractionCoupling",
             "ClassFanOutComplexity",
             "ClassTypeParameterName",
             "DescendantToken",
             "DesignForExtension",
-            "EqualsHashCode",
-            "ExecutableStatementCount",
-            "FinalLocalVariable",
-            "FinalParameters",
             "HideUtilityClassConstructor",
-            "IllegalInstantiation",
-            "IllegalTokenText",
-            "InnerAssignment",
-            "InnerTypeLast",
             "InterfaceTypeParameterName",
-            "JavaNCSS",
-            "LocalFinalVariableName",
             "LocalVariableName",
-            "MagicNumber",
-            "MethodLength",
-            "MethodTypeParameterName",
             "ModifiedControlVariable",
-            "MultipleStringLiterals",
             "MutableException",
-            "PackageName",
-            "ParameterAssignment",
-            "ParameterNumber",
             "RedundantModifier",
             "SeparatorWrap",
-            "SimplifyBooleanExpression",
-            "StaticVariableName",
-            "SuperClone",
             "SuperFinalize",
-            "SuppressWarnings",
-            "VisibilityModifier"
-    );
+            "SuppressWarnings");
 
     // Modules that will never have xpath support ever because they not report violations
     private static final Set<String> NO_VIOLATION_MODULES = Set.of(
@@ -155,7 +131,8 @@ private static Set<String> getSimpleCheckNames() {
     private static Map<String, String> getAllowedDirectoryAndChecks() {
         return SIMPLE_CHECK_NAMES
             .stream()
-            .collect(Collectors.toMap(id -> id.toLowerCase(Locale.ENGLISH), Function.identity()));
+            .collect(Collectors.toUnmodifiableMap(
+                id -> id.toLowerCase(Locale.ENGLISH), Function.identity()));
     }
 
     private static Set<String> getInternalModules() {
@@ -164,7 +141,7 @@ private static Set<String> getInternalModules() {
                 final String[] packageTokens = moduleName.split("\\.");
                 return packageTokens[packageTokens.length - 1];
             })
-            .collect(Collectors.toSet());
+            .collect(Collectors.toUnmodifiableSet());
     }
 
     @BeforeEach
@@ -285,7 +262,7 @@ public void validateInputFiles() throws Exception {
     }
 
     private static void validateInputDirectory(Path checkDir) throws IOException {
-        final Pattern pattern = Pattern.compile("^SuppressionXpathRegression(.+)\\.java$");
+        final Pattern pattern = Pattern.compile("^InputXpath(.+)\\.java$");
         final String check = ALLOWED_DIRECTORY_AND_CHECKS.get(checkDir.toFile().getName());
 
         try (DirectoryStream<Path> inputPaths = Files.newDirectoryStream(checkDir)) {
@@ -294,7 +271,8 @@ private static void validateInputDirectory(Path checkDir) throws IOException {
                 if (filename.endsWith("java")) {
                     final Matcher matcher = pattern.matcher(filename);
                     assertWithMessage(
-                              "Invalid input file '" + inputPath + "', expected pattern:" + pattern)
+                              "Invalid input file '" + inputPath
+                              + "', expected pattern:" + pattern)
                             .that(matcher.matches())
                             .isTrue();
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckerStub.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckerStub.java
index bcdf2a9dd75..97ab84fd513 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckerStub.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckerStub.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskLogStub.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskLogStub.java
index 52155b668f3..fbb3a3adceb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskLogStub.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskLogStub.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskStub.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskStub.java
index d75c656df74..80e5e63008c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskStub.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/CheckstyleAntTaskStub.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugAuditAdapter.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugAuditAdapter.java
index 1c2e75851ab..cbbb8b8e3eb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugAuditAdapter.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugAuditAdapter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugFilter.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugFilter.java
index d7baf1e5091..545a3994db1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugFilter.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/DebugFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/MessageLevelPair.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/MessageLevelPair.java
index 6c18b890d3e..8aaaf65766e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/MessageLevelPair.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/MessageLevelPair.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestBeforeExecutionFileFilter.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestBeforeExecutionFileFilter.java
index f12211023d4..0201b319e48 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestBeforeExecutionFileFilter.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestBeforeExecutionFileFilter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestFileSetCheck.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestFileSetCheck.java
index f0e70d2e44e..4712fc7f473 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestFileSetCheck.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestFileSetCheck.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestLoggingReporter.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestLoggingReporter.java
index 06a2ff249e1..1291f9dbedb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestLoggingReporter.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestLoggingReporter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestRootModuleChecker.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestRootModuleChecker.java
index 0c5a8254c6b..a58d8722fd9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestRootModuleChecker.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/TestRootModuleChecker.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/AuditEventUtFormatter.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/AuditEventUtFormatter.java
index de1ced6f7f8..d2ac6380de3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/AuditEventUtFormatter.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/AuditEventUtFormatter.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/BriefUtLogger.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/BriefUtLogger.java
index 4a2c8bd1216..1a22154fa9d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/BriefUtLogger.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/BriefUtLogger.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CheckUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CheckUtil.java
index ef28d693202..a0f91513b0e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CheckUtil.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CheckUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -151,7 +151,7 @@ public static Set<Class<?>> getCheckstyleChecks() throws IOException {
         final String packageName = "com.puppycrawl.tools.checkstyle";
         return getCheckstyleModulesRecursive(packageName, loader).stream()
                 .filter(ModuleReflectionUtil::isCheckstyleTreeWalkerCheck)
-                .collect(Collectors.toSet());
+                .collect(Collectors.toUnmodifiableSet());
     }
 
     /**
@@ -183,7 +183,7 @@ private static Set<Class<?>> getCheckstyleModulesRecursive(
                 .map(ClassPath.ClassInfo::load)
                 .filter(ModuleReflectionUtil::isCheckstyleModule)
                 .filter(CheckUtil::isFromAllowedPackages)
-                .collect(Collectors.toSet());
+                .collect(Collectors.toUnmodifiableSet());
     }
 
     /**
@@ -195,7 +195,8 @@ private static Set<Class<?>> getCheckstyleModulesRecursive(
     private static boolean isFromAllowedPackages(Class<?> cls) {
         final String canonicalName = cls.getCanonicalName();
         return !canonicalName.startsWith("com.puppycrawl.tools.checkstyle.packageobjectfactory")
-            && !canonicalName.startsWith("com.puppycrawl.tools.checkstyle.internal.testmodules");
+            && !canonicalName.startsWith("com.puppycrawl.tools.checkstyle.internal.testmodules")
+            && !canonicalName.startsWith("com.puppycrawl.tools.checkstyle.site");
     }
 
     /**
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CloseAndFlushTestByteArrayOutputStream.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CloseAndFlushTestByteArrayOutputStream.java
index 98e9ceef0c5..6d80fe3dd46 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CloseAndFlushTestByteArrayOutputStream.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/CloseAndFlushTestByteArrayOutputStream.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/ConfigurationUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/ConfigurationUtil.java
index 6d8de5566ed..6f0b9e03fc2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/ConfigurationUtil.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/ConfigurationUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/TestUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/TestUtil.java
index 2fcd51824de..6db2052dfde 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/TestUtil.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/TestUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,8 @@
 
 package com.puppycrawl.tools.checkstyle.internal.utils;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -34,6 +36,8 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.function.Executable;
+
 import com.puppycrawl.tools.checkstyle.AbstractAutomaticBean;
 import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
 import com.puppycrawl.tools.checkstyle.PackageObjectFactory;
@@ -378,4 +382,30 @@ public static <T> Class<T> getInnerClassType(Class<?> declaringClass, String nam
         return (Class<T>) Class.forName(declaringClass.getName() + "$" + name);
     }
 
+    /**
+     * Executes the provided executable and expects it to throw an exception of the specified type.
+     *
+     * @param expectedType the class of the expected exception type.
+     * @param executable the executable to be executed
+     * @param message the message to be used in case of assertion failure.
+     * @return the expected exception thrown by the executable.
+     */
+    public static <T extends Throwable> T getExpectedThrowable(Class<T> expectedType,
+                                                               Executable executable,
+                                                               String message) {
+        return assertThrows(expectedType, executable, message);
+    }
+
+    /**
+     *  Executes the provided executable and expects it to throw an exception of the specified type.
+     *
+     * @param expectedType the class of the expected exception type.
+     * @param executable the executable to be executed
+     * @return the expected exception thrown by the executable.
+     */
+    public static <T extends Throwable> T getExpectedThrowable(Class<T> expectedType,
+                                                               Executable executable) {
+        return assertThrows(expectedType, executable);
+    }
+
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocGenerator.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocGenerator.java
index 82b6fa362e5..d5f0bc5c259 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocGenerator.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocGenerator.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,9 @@
 import java.io.File;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.Set;
 
 import org.apache.maven.doxia.parser.Parser;
@@ -53,12 +55,12 @@ public static void generateXdocContent() throws Exception {
         for (Path path : templatesFilePaths) {
             final String pathToFile = path.toString();
             final File inputFile = new File(pathToFile);
-            final File outputFile = new File(pathToFile.replace(".template", ""));
-
+            final File tempFile = File.createTempFile(pathToFile.replace(".template", ""), "");
+            tempFile.deleteOnExit();
             final XdocsTemplateSinkFactory sinkFactory = (XdocsTemplateSinkFactory)
                     plexus.lookup(SinkFactory.ROLE, XDOCS_TEMPLATE_HINT);
-            final Sink sink = sinkFactory.createSink(outputFile.getParentFile(),
-                    outputFile.getName(), String.valueOf(StandardCharsets.UTF_8));
+            final Sink sink = sinkFactory.createSink(tempFile.getParentFile(),
+                    tempFile.getName(), String.valueOf(StandardCharsets.UTF_8));
             final XdocsTemplateParser parser = (XdocsTemplateParser)
                     plexus.lookup(Parser.ROLE, XDOCS_TEMPLATE_HINT);
             try (Reader reader = ReaderFactory.newReader(inputFile,
@@ -68,6 +70,9 @@ public static void generateXdocContent() throws Exception {
             finally {
                 sink.close();
             }
+            final File outputFile = new File(pathToFile.replace(".template", ""));
+            final StandardCopyOption copyOption = StandardCopyOption.REPLACE_EXISTING;
+            Files.copy(tempFile.toPath(), outputFile.toPath(), copyOption);
         }
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java
index 21c81eb8525..181617b31b0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XdocUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -65,7 +65,7 @@ public static Set<Path> getXdocsFilePaths() throws IOException {
                             && (path.toString().endsWith(".xml")
                             || path.toString().endsWith(".xml.vm"));
                 })) {
-            return stream.collect(Collectors.toSet());
+            return stream.collect(Collectors.toUnmodifiableSet());
         }
     }
 
@@ -84,7 +84,7 @@ public static Set<Path> getXdocsTemplatesFilePaths() throws IOException {
                     return attr.isRegularFile()
                             && path.toString().endsWith(".xml.template");
                 })) {
-            return stream.collect(Collectors.toSet());
+            return stream.collect(Collectors.toUnmodifiableSet());
         }
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XmlUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XmlUtil.java
index a7c51e45e99..59e3282de4c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XmlUtil.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XmlUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XpathIteratorUtil.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XpathIteratorUtil.java
index 4367479c132..4d99fd6a545 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XpathIteratorUtil.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/utils/XpathIteratorUtil.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java
index 0bcadf40695..e1296df35bb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/meta/JavadocMetadataScraperTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java
index 8edc5defa5d..5d17a70c8d6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/meta/MetadataGeneratorUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,7 +47,8 @@ public final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport {
     private final Set<String> modulesContainingNoMetadataFile = Set.of(
             "Checker",
             "TreeWalker",
-            "JavadocMetadataScraper"
+            "JavadocMetadataScraper",
+            "ClassAndPropertiesSettersJavadocScraper"
     );
 
     @Override
@@ -78,8 +79,8 @@ public void testMetadataFilesGenerationAllFiles(@SystemOutGuard.SysOut Capturabl
 
         final String[] expectedErrorMessages = {
             "31: " + getCheckMessage(MSG_DESC_MISSING, "AbstractSuperCheck"),
-            "44: " + getCheckMessage(MSG_DESC_MISSING, "AbstractHeaderCheck"),
-            "42: " + getCheckMessage(MSG_DESC_MISSING, "AbstractJavadocCheck"),
+            "43: " + getCheckMessage(MSG_DESC_MISSING, "AbstractHeaderCheck"),
+            "43: " + getCheckMessage(MSG_DESC_MISSING, "AbstractJavadocCheck"),
             "45: " + getCheckMessage(MSG_DESC_MISSING, "AbstractClassCouplingCheck"),
             "26: " + getCheckMessage(MSG_DESC_MISSING, "AbstractAccessControlNameCheck"),
             "30: " + getCheckMessage(MSG_DESC_MISSING, "AbstractNameCheck"),
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java
index 9944f71ad4b..f117d9c4d93 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReaderTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -40,20 +40,20 @@ protected String getPackageLocation() {
 
     @Test
     public void test() {
-        assertThat(XmlMetaReader.readAllModulesIncludingThirdPartyIfAny()).hasSize(200);
+        assertThat(XmlMetaReader.readAllModulesIncludingThirdPartyIfAny()).hasSize(201);
     }
 
     @Test
     public void testDuplicatePackage() {
         assertThat(XmlMetaReader
                     .readAllModulesIncludingThirdPartyIfAny("com.puppycrawl.tools.checkstyle.meta"))
-                .hasSize(200);
+                .hasSize(201);
     }
 
     @Test
     public void testBadPackage() {
         assertThat(XmlMetaReader.readAllModulesIncludingThirdPartyIfAny("DOES.NOT.EXIST"))
-                .hasSize(200);
+                .hasSize(201);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java
index 6758c748efc..2681a365052 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java
index cc10b8d8dcc..fa8bd7f456e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -47,7 +47,7 @@ public void testPrivateConstr() throws Exception {
     public void testJavaDocsRecognition() throws Exception {
         final List<BlockCommentPositionTestMetadata> metadataList = Arrays.asList(
                 new BlockCommentPositionTestMetadata("InputBlockCommentPositionOnClass.java",
-                        BlockCommentPosition::isOnClass, 3),
+                        BlockCommentPosition::isOnClass, 4),
                 new BlockCommentPositionTestMetadata("InputBlockCommentPositionOnMethod.java",
                         BlockCommentPosition::isOnMethod, 6),
                 new BlockCommentPositionTestMetadata("InputBlockCommentPositionOnField.java",
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtilTest.java
index d3bedf261f4..20297357dc3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,8 +20,8 @@
 package com.puppycrawl.tools.checkstyle.utils;
 
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.isUtilsClassHasPrivateConstructor;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.io.IOException;
@@ -89,7 +89,7 @@ public void testPropertyChainingPropertyNotFound() throws Exception {
         final String message = "Undefined property reference expected.";
 
         final CheckstyleException exception =
-            assertThrows(CheckstyleException.class,
+            getExpectedThrowable(CheckstyleException.class,
                 () -> ChainedPropertyUtil.getResolvedProperties(properties));
 
         assertWithMessage(message)
@@ -107,7 +107,7 @@ public void testPropertyChainingRecursiveUnresolvable() throws Exception {
         final String message = "Undefined property reference expected.";
 
         final CheckstyleException exception =
-            assertThrows(CheckstyleException.class,
+            getExpectedThrowable(CheckstyleException.class,
                 () -> ChainedPropertyUtil.getResolvedProperties(properties));
 
         assertWithMessage(message)
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java
index a29ab23530f..b197c2140e6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,6 @@
 import static com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck.MSG_MULTIPLE;
 import static com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck.MSG_KEY;
 import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck.MSG_EXPECTED_TAG;
-import static com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck.MSG_JAVADOC_MISSING;
 import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.findTokenInAstByPredicate;
 import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.isUtilsClassHasPrivateConstructor;
 
@@ -46,7 +45,6 @@
 import com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck;
 import com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck;
 import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck;
-import com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck;
 import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;
 
 public class CheckUtilTest extends AbstractModuleTestSupport {
@@ -185,34 +183,6 @@ public void testIsNonVoidMethod() throws Exception {
                 .isFalse();
     }
 
-    @Test
-    public void testIsGetterMethod() throws Exception {
-        final DetailAST notGetterMethod = getNodeFromFile(TokenTypes.METHOD_DEF);
-        final DetailAST getterMethod = notGetterMethod.getNextSibling().getNextSibling();
-
-        assertWithMessage("Invalid result: AST provided is getter method")
-                .that(CheckUtil.isGetterMethod(getterMethod))
-                .isTrue();
-        assertWithMessage("Invalid result: AST provided is not getter method")
-                .that(CheckUtil.isGetterMethod(notGetterMethod))
-                .isFalse();
-    }
-
-    @Test
-    public void testIsSetterMethod() throws Exception {
-        final DetailAST firstClassMethod = getNodeFromFile(TokenTypes.METHOD_DEF);
-        final DetailAST setterMethod =
-                firstClassMethod.getNextSibling().getNextSibling().getNextSibling();
-        final DetailAST notSetterMethod = setterMethod.getNextSibling();
-
-        assertWithMessage("Invalid result: AST provided is setter method")
-                .that(CheckUtil.isSetterMethod(setterMethod))
-                .isTrue();
-        assertWithMessage("Invalid result: AST provided is not setter method")
-                .that(CheckUtil.isSetterMethod(notSetterMethod))
-                .isFalse();
-    }
-
     @Test
     public void testGetAccessModifierFromModifiersToken() throws Exception {
         final DetailAST interfaceDef = getNodeFromFile(TokenTypes.INTERFACE_DEF);
@@ -422,29 +392,6 @@ public void testJavaDocMethod2() throws Exception {
                 getPath("InputCheckUtil5.java"), expected);
     }
 
-    @Test
-    public void testSetterGetterOn() throws Exception {
-        final String[] expected = {
-            "20:5: " + getCheckMessage(MissingJavadocMethodCheck.class,
-                    MSG_JAVADOC_MISSING),
-            "24:5: " + getCheckMessage(MissingJavadocMethodCheck.class,
-                    MSG_JAVADOC_MISSING),
-            "29:5: " + getCheckMessage(MissingJavadocMethodCheck.class,
-                    MSG_JAVADOC_MISSING),
-        };
-        verifyWithInlineConfigParser(
-                getPath("InputCheckUtil9.java"), expected);
-    }
-
-    @Test
-    public void missingJavadoc() throws Exception {
-        final String[] expected = {
-            "13:5: " + getCheckMessage(MissingJavadocMethodCheck.class, MSG_JAVADOC_MISSING),
-        };
-        verifyWithInlineConfigParser(
-                getNonCompilablePath("InputCheckUtil1.java"), expected);
-    }
-
     @Test
     public void testJavadoc() throws Exception {
         final String[] expected = {
@@ -460,6 +407,26 @@ private DetailAST getNodeFromFile(int type) throws Exception {
             JavaParser.Options.WITH_COMMENTS), type);
     }
 
+    /**
+     * Retrieves the AST node from a specific file based on the specified token type.
+     *
+     * @param type The token type to search for in the file.
+     *             This parameter determines the type of AST node to retrieve.
+     * @param file The file from which the AST node should be retrieved.
+     * @return The AST node associated with the specified token type from the given file.
+     * @throws Exception If there's an issue reading or parsing the file.
+     */
+    public static DetailAST getNode(File file, int type) throws Exception {
+        return getNode(JavaParser.parseFile(file, JavaParser.Options.WITH_COMMENTS), type);
+    }
+
+    /**
+     * Temporary java doc.
+     *
+     * @param root of type DetailAST
+     * @param type of type int
+     * @return call to get() from node
+     */
     private static DetailAST getNode(DetailAST root, int type) {
         final Optional<DetailAST> node = findTokenInAstByPredicate(root,
             ast -> ast.getType() == type);
@@ -468,7 +435,6 @@ private static DetailAST getNode(DetailAST root, int type) {
             .that(node.isPresent())
             .isTrue();
 
-        return node.get();
+        return node.orElseThrow();
     }
-
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtilTest.java
index 25da95ea3d2..2711080cea3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java
index 39d9d8cda32..306c3816120 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -156,6 +156,10 @@ public void testFileExtensions() {
         assertWithMessage("Invalid file extension")
                 .that(CommonUtil.matchesFileExtension(javaFile, fileExtensions))
                 .isTrue();
+        final File invalidJavaFile = new File("file,java");
+        assertWithMessage("Invalid file extension")
+                .that(CommonUtil.matchesFileExtension(invalidJavaFile, fileExtensions))
+                .isFalse();
         final File emptyExtensionFile = new File("file.");
         assertWithMessage("Invalid file extension")
                 .that(CommonUtil.matchesFileExtension(emptyExtensionFile, ""))
@@ -197,7 +201,7 @@ public void testBaseClassNameForSimpleName() {
 
     @Test
     public void testRelativeNormalizedPath() {
-        final String relativePath = CommonUtil.relativizeAndNormalizePath("/home", "/home/test");
+        final String relativePath = CommonUtil.relativizePath("/home", "/home/test");
 
         assertWithMessage("Invalid relative path")
             .that(relativePath)
@@ -206,7 +210,7 @@ public void testRelativeNormalizedPath() {
 
     @Test
     public void testRelativeNormalizedPathWithNullBaseDirectory() {
-        final String relativePath = CommonUtil.relativizeAndNormalizePath(null, "/tmp");
+        final String relativePath = CommonUtil.relativizePath(null, "/tmp");
 
         assertWithMessage("Invalid relative path")
             .that(relativePath)
@@ -219,7 +223,7 @@ public void testRelativeNormalizedPathWithDenormalizedBaseDirectory() throws IOE
         final String absoluteFilePath = sampleAbsolutePath + "/SampleFile.java";
         final String basePath = sampleAbsolutePath + PATH_DENORMALIZER;
 
-        final String relativePath = CommonUtil.relativizeAndNormalizePath(basePath,
+        final String relativePath = CommonUtil.relativizePath(basePath,
             absoluteFilePath);
 
         assertWithMessage("Invalid relative path")
@@ -487,7 +491,7 @@ public void testGetUriByFilenameFindsAbsoluteResourceOnClasspath() throws Except
         final URI uri = CommonUtil.getUriByFilename(filename);
 
         final Properties properties = System.getProperties();
-        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toString(),
+        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toASCIIString(),
             new PropertiesExpander(properties));
         assertWithMessage("Unexpected config name!")
             .that(config.getName())
@@ -501,7 +505,7 @@ public void testGetUriByFilenameFindsRelativeResourceOnClasspath() throws Except
         final URI uri = CommonUtil.getUriByFilename(filename);
 
         final Properties properties = System.getProperties();
-        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toString(),
+        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toASCIIString(),
             new PropertiesExpander(properties));
         assertWithMessage("Unexpected config name!")
             .that(config.getName())
@@ -527,10 +531,10 @@ public void testGetUriByFilenameFindsResourceRelativeToRootClasspath() throws Ex
                 "com/puppycrawl/tools/checkstyle/utils/"
                         + getPackageLocation() + "/InputCommonUtilTest_resource.txt";
         assertWithMessage("URI is relative to package " + uriRelativeToPackage)
-            .that(uri.toString())
+            .that(uri.toASCIIString())
             .doesNotContain(uriRelativeToPackage);
         final String content = IOUtils.toString(uri.toURL(), StandardCharsets.UTF_8);
-        assertWithMessage("Content mismatches for: " + uri)
+        assertWithMessage("Content mismatches for: " + uri.toASCIIString())
             .that(content)
             .startsWith("good");
     }
@@ -542,7 +546,7 @@ public void testGetUriByFilenameClasspathPrefixLoadConfig() throws Exception {
         final URI uri = CommonUtil.getUriByFilename(filename);
 
         final Properties properties = System.getProperties();
-        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toString(),
+        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toASCIIString(),
             new PropertiesExpander(properties));
         assertWithMessage("Unexpected config name!")
             .that(config.getName())
@@ -556,7 +560,7 @@ public void testGetUriByFilenameFindsRelativeResourceOnClasspathPrefix() throws
         final URI uri = CommonUtil.getUriByFilename(filename);
 
         final Properties properties = System.getProperties();
-        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toString(),
+        final Configuration config = ConfigurationLoader.loadConfiguration(uri.toASCIIString(),
             new PropertiesExpander(properties));
         assertWithMessage("Unexpected config name!")
             .that(config.getName())
@@ -574,7 +578,7 @@ public void testIsCodePointWhitespace() {
 
     @Test
     public void testLoadSuppressionsUriSyntaxException() throws Exception {
-        final URL configUrl = mock(URL.class);
+        final URL configUrl = mock();
         when(configUrl.toURI()).thenThrow(URISyntaxException.class);
         try (MockedStatic<CommonUtil> utilities =
                      mockStatic(CommonUtil.class, CALLS_REAL_METHODS)) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/FilterUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/FilterUtilTest.java
index 767b6ad21b3..5ff74631a41 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/FilterUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/FilterUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,7 @@
 import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.isUtilsClassHasPrivateConstructor;
 
 import java.io.File;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -41,7 +42,9 @@ public void testIsProperUtilsClass() throws ReflectiveOperationException {
 
     @Test
     public void testExistingFile() throws Exception {
-        final File file = File.createTempFile("junit", null, temporaryFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File file = new File(temporaryFolder, uniqueFileName);
+        file.createNewFile();
         assertWithMessage("Suppression file exists")
                 .that(FilterUtil.isFileExists(file.getPath()))
                 .isTrue();
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java
index 7c7633e3da1..8b15669de5a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtilTest.java
index c15a02c77e8..a928b876c1d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,10 +20,14 @@
 package com.puppycrawl.tools.checkstyle.utils;
 
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.puppycrawl.tools.checkstyle.PackageObjectFactory.BASE_PACKAGE;
 import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.isUtilsClassHasPrivateConstructor;
 
 import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 
@@ -75,6 +79,21 @@ public void testIsCheckstyleModule() {
                 .isTrue();
     }
 
+    /**
+     * This test case is designed to verify the behavior of getCheckstyleModules method.
+     * It is provided with a package name that does not contain any checkstyle modules.
+     * It ensures that ModuleReflectionUtil.getCheckstyleModules is returning an empty set.
+     */
+    @Test
+    public void testGetCheckStyleModules() throws IOException {
+        final ClassLoader classLoader = ClassLoader.getSystemClassLoader();
+        final Set<String> packages = Collections.singleton(BASE_PACKAGE + ".checks.javadoc.utils");
+
+        assertWithMessage("specified package has no checkstyle modules")
+                .that(ModuleReflectionUtil.getCheckstyleModules(packages, classLoader))
+                .isEmpty();
+    }
+
     @Test
     public void testIsValidCheckstyleClass() {
         assertWithMessage("Should return true when valid checkstyle class is passed")
@@ -365,6 +384,13 @@ protected InvalidNonDefaultConstructorClass(int data) {
             method(data);
         }
 
+        /**
+         * Method has tail recursive call.
+         *
+         * @param data of int type.
+         * @noinspection TailRecursion
+         * @noinspectionreason TailRecursion - until issue #14814
+         */
         public final void method(int data) {
             field++;
             if (data > 0) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ParserUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ParserUtilTest.java
index 5c375694a2e..4283c5c8b13 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ParserUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ParserUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java
index d311fd593bd..ba7e26685f0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java
index fb963038490..577d8bc851d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -228,7 +228,7 @@ public void testGetTokenTypesTotalNumber() {
 
         assertWithMessage("Invalid token total number")
             .that(tokenTypesTotalNumber)
-            .isEqualTo(188);
+            .isEqualTo(195);
     }
 
     @Test
@@ -238,10 +238,10 @@ public void testGetAllTokenIds() {
 
         assertWithMessage("Invalid token length")
             .that(allTokenIds.length)
-            .isEqualTo(188);
+            .isEqualTo(195);
         assertWithMessage("invalid sum")
             .that(sum)
-            .isEqualTo(19595);
+            .isEqualTo(21142);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/utils/XpathUtilTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/utils/XpathUtilTest.java
index 09ce04be06e..84397829486 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/XpathUtilTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/XpathUtilTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.List;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -100,7 +101,8 @@ public void testGetValue() {
     @Test
     public void testPrintXpathNotComment() throws Exception {
         final String fileContent = "class Test { public void method() {int a = 5;}}";
-        final File file = File.createTempFile("junit", null, tempFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File file = new File(tempFolder, uniqueFileName);
         Files.write(file.toPath(), fileContent.getBytes(StandardCharsets.UTF_8));
         final String expected = addEndOfLine(
             "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]",
@@ -120,7 +122,8 @@ public void testPrintXpathNotComment() throws Exception {
     @Test
     public void testPrintXpathComment() throws Exception {
         final String fileContent = "class Test { /* comment */ }";
-        final File file = File.createTempFile("junit", null, tempFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File file = new File(tempFolder, uniqueFileName);
         Files.write(file.toPath(), fileContent.getBytes(StandardCharsets.UTF_8));
         final String expected = addEndOfLine(
             "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]",
@@ -137,7 +140,8 @@ public void testPrintXpathComment() throws Exception {
     @Test
     public void testPrintXpathTwo() throws Exception {
         final String fileContent = "class Test { public void method() {int a = 5; int b = 5;}}";
-        final File file = File.createTempFile("junit", null, tempFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File file = new File(tempFolder, uniqueFileName);
         Files.write(file.toPath(), fileContent.getBytes(StandardCharsets.UTF_8));
         final String expected = addEndOfLine(
             "COMPILATION_UNIT -> COMPILATION_UNIT [1:0]",
@@ -165,7 +169,8 @@ public void testPrintXpathTwo() throws Exception {
     @Test
     public void testInvalidXpath() throws IOException {
         final String fileContent = "class Test { public void method() {int a = 5; int b = 5;}}";
-        final File file = File.createTempFile("junit", null, tempFolder);
+        final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
+        final File file = new File(tempFolder, uniqueFileName);
         Files.write(file.toPath(), fileContent.getBytes(StandardCharsets.UTF_8));
         final String invalidXpath = "\\//CLASS_DEF"
                 + "//METHOD_DEF//VARIABLE_DEF//IDENT";
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNodeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNodeTest.java
index 0a8dd8c4eda..323c4621440 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNodeTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/AttributeNodeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package com.puppycrawl.tools.checkstyle.xpath;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static com.puppycrawl.tools.checkstyle.internal.utils.TestUtil.getExpectedThrowable;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -68,7 +68,7 @@ public void testCompareOrder() {
     @Test
     public void testGetDepth() {
         final UnsupportedOperationException exception =
-            assertThrows(UnsupportedOperationException.class, attributeNode::getDepth);
+            getExpectedThrowable(UnsupportedOperationException.class, attributeNode::getDepth);
         assertWithMessage("Invalid exception message")
             .that(exception)
             .hasMessageThat()
@@ -98,7 +98,7 @@ public void testGetAttributeValue() {
     @Test
     public void testGetChildren() {
         final UnsupportedOperationException exception =
-            assertThrows(UnsupportedOperationException.class, attributeNode::getChildren);
+            getExpectedThrowable(UnsupportedOperationException.class, attributeNode::getChildren);
         assertWithMessage("Invalid exception message")
             .that(exception)
             .hasMessageThat()
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java
index 0a07ab75eab..0fd7aa1404d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java
index 5e89ce5b888..3ee6bb33513 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/RootNodeTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractPathTestSupport;
+import com.puppycrawl.tools.checkstyle.DetailAstImpl;
 import com.puppycrawl.tools.checkstyle.JavaParser;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
@@ -110,6 +111,24 @@ public void testGetColumnNumber() {
             .isEqualTo(0);
     }
 
+    /*
+     * This test exists to cover pitest mutation.
+     * It is impossible to create RootNode that does not have column as 0.
+     * Test exists until https://github.com/checkstyle/checkstyle/issues/4997
+     */
+    @Test
+    public void testNonRealGetColumnNumber() {
+        final DetailAstImpl nonRealNode = new DetailAstImpl();
+        nonRealNode.setType(TokenTypes.PACKAGE_DEF);
+        nonRealNode.setLineNo(555);
+        nonRealNode.setColumnNo(888);
+
+        final RootNode nonRealRootNode = new RootNode(nonRealNode);
+        assertWithMessage("Invalid column number")
+            .that(nonRealRootNode.getColumnNumber())
+            .isEqualTo(888);
+    }
+
     @Test
     public void testGetLocalPart() {
         assertWithMessage("Invalid local part")
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java
index 93fc7f96741..8df386cf26d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java
index 5a065434d6f..76d23b4531b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIteratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIteratorTest.java
index 9ab1042998c..1b0464e71cd 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIteratorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/DescendantIteratorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIteratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIteratorTest.java
index aeaf0ed2cbb..0d8f153dce9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIteratorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/FollowingIteratorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIteratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIteratorTest.java
index ac3f3dec86f..39deafede06 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIteratorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/PrecedingIteratorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIteratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIteratorTest.java
index 6cc424354a7..5c0bdf6d4b2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIteratorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseDescendantIteratorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIteratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIteratorTest.java
index 0737d189817..5338a9f1ddc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIteratorTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/iterators/ReverseListIteratorTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterTextBlocksEscapesAreOneChar.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterTextBlocksEscapesAreOneChar.java
index c7fc8c6d8c6..adb947c8a48 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterTextBlocksEscapesAreOneChar.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterTextBlocksEscapesAreOneChar.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 
 public class InputAstTreeStringPrinterTextBlocksEscapesAreOneChar {
 String emptyTextBlock = """
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationRecordsAndCompactCtors.java
index 51afee811d4..c35356a7635 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationRecordsAndCompactCtors.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 public class InputAnnotationLocationRecordsAndCompactCtors {
@@ -42,7 +42,7 @@ record MyInnerRecord(){
      *
      * @return
      */
-    @SuppressWarnings("deprecation") // ok
+    @SuppressWarnings("deprecation")
     public record MyRecord6() {
         record MyInnerRecord () {
             // violation below 'Annotation 'SuppressWarnings' should be alone on line.'
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineRecordsAndCompactCtors.java
index 194bba5110b..2d35a7c0c22 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineRecordsAndCompactCtors.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
 
 public class InputAnnotationOnSameLineRecordsAndCompactCtors {
@@ -23,7 +23,7 @@ public record MyRecord2() {
             record MyRecord3() {
     }
 
-    @SuppressWarnings("deprecation") public record MyRecord4() { // ok
+    @SuppressWarnings("deprecation") public record MyRecord4() {
         @SuppressWarnings("deprecation") // violation
         public MyRecord4 {
         }
@@ -43,7 +43,7 @@ record MyInnerRecord() {
      */
     @SuppressWarnings("deprecation") // violation
     public record MyRecord6() {
-        record MyInnerRecord() {@SuppressWarnings("Annotation")public MyInnerRecord {} // ok
+        record MyInnerRecord() {@SuppressWarnings("Annotation")public MyInnerRecord {}
         }
     }
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java
index fb0643db9aa..bdc20a5e9b8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java
@@ -12,7 +12,7 @@
 
 public class InputAnnotationUseStyleWithTrailingComma
 {
-    @Test(value={(false) ? "" : "foo",}, more={(true) ? "" : "bar",}) // ok
+    @Test(value={(false) ? "" : "foo",}, more={(true) ? "" : "bar",})
     /**
 
     */
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsRecords.java
index a4567497f77..70d80f7b450 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsRecords.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.annotation.suppresswarnings;
 
 import java.lang.annotation.Documented;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersEscapedS.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersEscapedS.java
index e3ffc29d2cf..1e85a9832e8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersEscapedS.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersEscapedS.java
@@ -8,12 +8,12 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
 
 public class InputAvoidEscapedUnicodeCharactersEscapedS {
-    String value1 = "\u03bc\t"; // ok
-    String value2 = "\u03bc\s"; // ok
+    String value1 = "\u03bc\t";
+    String value2 = "\u03bc\s";
     String value3 = "\u03bc\s not all escaped chars"; // violation
     String value31 = "\u03bc\n not all escaped chars"; // violation
     String value4 = """
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocks.java
index 23a9b050777..a00e17b77ab 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocks.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
 
 public class InputAvoidEscapedUnicodeCharactersTextBlocks {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocksAllowByComment.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocksAllowByComment.java
index 3dfec746f07..40f69e43d71 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocksAllowByComment.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersTextBlocksAllowByComment.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
 
 public class InputAvoidEscapedUnicodeCharactersTextBlocksAllowByComment {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSwitchExpressions.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSwitchExpressions.java
index e104cc87262..293cb6577de 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSwitchExpressions.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSwitchExpressions.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock;
 
 public class InputEmptyBlockSwitchExpressions {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestRecordsAndCompactCtors.java
index 99b3a7078f1..1593228c2bf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestRecordsAndCompactCtors.java
@@ -11,7 +11,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 import org.w3c.dom.Node;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressions.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressions.java
index 7632875746d..862e98515a0 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressions.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressions.java
@@ -11,7 +11,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 public class InputLeftCurlyTestSwitchExpressions {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressionsNewLine.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressionsNewLine.java
index c91422a778b..afb7a25bb0a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressionsNewLine.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestSwitchExpressionsNewLine.java
@@ -11,7 +11,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 // violation below ''{' at column 57 should be on a new line'
 public class InputLeftCurlyTestSwitchExpressionsNewLine {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpression.java
index 2d5e829e39e..5a19e3ad405 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpression.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
 public class InputNeedBracesTestSwitchExpression {
@@ -77,7 +77,7 @@ int howMany4(Nums k) {
             case FOUR -> {
                 yield 99;
             }
-            default -> throw new IllegalStateException("Not a Nums"); // ok
+            default -> throw new IllegalStateException("Not a Nums");
 
         };
     }
@@ -96,19 +96,19 @@ int howMany5(Nums k) {
 
     void howMany6(Nums k) {
         switch (k) {
-            case ONE: System.out.println("case two"); // ok
-            case TWO, THREE: System.out.println("case two"); // ok
-            case FOUR: System.out.println("case three"); // ok
-            default: throw new IllegalStateException("Not a nums"); // ok
+            case ONE: System.out.println("case two");
+            case TWO, THREE: System.out.println("case two");
+            case FOUR: System.out.println("case three");
+            default: throw new IllegalStateException("Not a nums");
         }
     }
 
     void howMany7(Nums k) {
         switch (k) {
-            case ONE -> System.out.println("case one"); // ok
-            case TWO, THREE -> System.out.println("case two"); // ok
-            case FOUR -> System.out.println("case three"); // ok
-            default -> throw new IllegalStateException("Not a nums"); // ok
+            case ONE -> System.out.println("case one");
+            case TWO, THREE -> System.out.println("case two");
+            case FOUR -> System.out.println("case three");
+            default -> throw new IllegalStateException("Not a nums");
         }
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpressionNoSingleLine.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpressionNoSingleLine.java
index 8100473cba0..89764113dfe 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpressionNoSingleLine.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSwitchExpressionNoSingleLine.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
 public class InputNeedBracesTestSwitchExpressionNoSingleLine {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchExpressionAlone.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchExpressionAlone.java
new file mode 100644
index 00000000000..1a534446417
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchExpressionAlone.java
@@ -0,0 +1,92 @@
+/*
+RightCurly
+option = ALONE
+tokens = LITERAL_CASE, LITERAL_IF
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksWithSwitchExpressionAlone {
+
+    int foo(int yield) {
+        return switch (yield) {
+            case 1 -> 2;
+            case 2 -> 3;
+            case 3 -> 4;
+            default -> 5;
+        };
+    }
+
+    void test() {
+        int x = 1;
+        String s = switch (x) {
+            case 1 -> {
+
+                yield "and that's it";
+            }  case 2 -> "x is 2";
+            default -> "x is neither 1 nor 2";
+        };
+    }
+
+    void test2() {
+        int x = 1;
+        String s = switch (x) {
+            case 1 -> {
+
+                yield "and that's it";
+            }  case 2 -> { yield "x is 2";}
+            default -> "x is neither 1 nor 2";
+        };
+    }
+
+    void test3() {
+        int x = 1;
+         String s = switch (x) {
+            case 1 -> {
+
+                String s1 = "and that's it";
+                yield s1;
+            } case 2 -> { yield "x is 2";}
+            default -> "x is neither 1 nor 2";
+        };
+    }
+
+    void test4() throws Exception {
+           int a = 0;
+           int b = switch (a) {
+                case 0 -> {
+                    int x = 5;
+                    int y = 6;
+                    if (a == 2) {
+                        y = 7;}   // violation '}' at column 31 should be alone on a line'
+                    throw new Exception();
+                }  default -> 2;
+            };
+    }
+
+    void test5() throws Exception {
+        int a = 0;
+        int b = switch (a) {
+            case 0 -> {throw new Exception();}
+            default -> 2;
+        };
+    }
+
+    void test6() throws Exception {
+         int y = 0;
+         int x = 0;
+         final boolean a = switch (y) {
+             case 1 -> {x = 1; yield true;}
+             case 2 -> {
+                 x = 1;
+                 yield true;} case 3 -> {
+                 x = 1;
+                 if (x == 1) {yield true;} // violation '}' at column 42 should be alone on a line'
+                 yield false;}
+             default -> throw new RuntimeException();
+         };
+    }
+
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchExpressionAloneOrSingleline.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchExpressionAloneOrSingleline.java
new file mode 100644
index 00000000000..12f02d32f6b
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchExpressionAloneOrSingleline.java
@@ -0,0 +1,93 @@
+/*
+RightCurly
+option = ALONE_OR_SINGLELINE
+tokens = LITERAL_CASE, LITERAL_IF
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksWithSwitchExpressionAloneOrSingleline {
+
+    int foo(int yield) {
+        return switch (yield) {
+            case 1 -> 2;
+            case 2 -> 3;
+            case 3 -> 4;
+            default -> 5;
+        };
+    }
+
+    void test() {
+        int x = 1;
+        String s = switch (x) {
+            case 1 -> {
+
+                yield "and that's it";
+            }  case 2 -> "x is 2";
+            default -> "x is neither 1 nor 2";
+        };
+    }
+
+    void test2() {
+        int x = 1;
+        String s = switch (x) {
+            case 1 -> {
+
+                yield "and that's it";
+            }  case 2 -> { yield "x is 2";}
+            default -> "x is neither 1 nor 2";
+        };
+    }
+
+    void test3() {
+        int x = 1;
+         String s = switch (x) {
+            case 1 -> {
+
+                String s1 = "and that's it";
+                yield s1;
+            } case 2 -> { yield "x is 2";}
+            default -> "x is neither 1 nor 2";
+        };
+    }
+
+    void test4() throws Exception {
+           int a = 0;
+           int b = switch (a) {
+                case 0 -> {
+                    int x = 5;
+                    int y = 6;
+                    if (a == 2) {
+                        y = 7;}   // violation '}' at column 31 should be alone on a line'
+                    throw new Exception();
+                }  default -> 2;
+            };
+    }
+
+    void test5() throws Exception {
+        int a = 0;
+        int b = switch (a) {
+            case 0 -> {throw new Exception();}
+            default -> 2;
+        };
+    }
+
+    void test6() {
+         int y = 0;
+         int x = 0;
+         final boolean a = switch (y) {
+             case 1 -> {x = 1; yield true;
+             }case 2 -> {
+                 x = 1;
+                 yield true;} case 3 -> {
+                 x = 1;
+                 if (x == 1) {yield true;} // ok single line
+                 yield false;
+             }
+             default -> throw new RuntimeException();
+         };
+    }
+
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchRuleAlone.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchRuleAlone.java
new file mode 100644
index 00000000000..de5125e9c47
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchRuleAlone.java
@@ -0,0 +1,96 @@
+/*
+RightCurly
+option = ALONE
+tokens = LITERAL_CASE
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksWithSwitchRuleAlone {
+
+    public static void test0() {
+        int mode = 0;
+        switch (mode) {
+            case 1 -> {
+                int x = 1;
+            }
+            case 2 -> {
+                int x = 0;
+            }
+            case 3 -> System.out.println("x is 3");
+        }
+    }
+
+    public static void test() {
+        int mode = 0;
+        switch (mode) {
+            case 1 -> {
+                int x = 1;
+
+            } default -> {          // violation '}' at column 13 should be alone on a line'
+                int x = 0;
+            }
+        }
+    }
+
+    public static void test1() {
+        int k = 0;
+        switch (k) {
+            case 1 -> {
+                 int x = 1;
+
+            } case 2 -> {       // violation '}' at column 13 should be alone on a line'
+                int x = 2;}     // violation '}' at column 27 should be alone on a line'
+
+        }
+    }
+
+    public static void test2() {
+         int k = 0;
+         switch (k) {
+            case 1 -> {
+                 int x = 1;
+
+            }case 2 -> throw new RuntimeException();
+            // violation above '}' at column 13 should be alone on a line'
+         }
+    }
+
+    public static void test3() {
+         int k = 0;
+         switch (k) {
+            case 1 -> {
+                 int x = 1;
+            }
+            case 2 -> {
+                    int x = 2;
+            } }      // violation '}' at column 13 should be alone on a line'
+    }
+
+    public static void test4() {
+        int mode = 0;
+        switch (mode) { case 0 -> {int x = 1;} }
+        // violation above '}' at column 46 should be alone on a line'
+    }
+
+    public static void test5() {
+        int mode = 0;
+        switch (mode) {
+            case 0 -> {
+                int x = 1;
+            } case 1 -> {int x = 2;}  // 2 violations
+        }
+    }
+
+    public static void test8() {
+        int mode = 0;
+        int x = 0;
+        switch (mode) {
+            case 0 -> throw new RuntimeException();
+            case 1 -> x = 1;
+            case 2 -> {x = 1; }      // violation '}' at column 31 should be alone on a line'
+            case 3 -> {x = 5; } }   // violation '}' at column 31 should be alone on a line'
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchRuleAloneOrSingleline.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchRuleAloneOrSingleline.java
new file mode 100644
index 00000000000..36106c1f0c1
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksWithSwitchRuleAloneOrSingleline.java
@@ -0,0 +1,104 @@
+/*
+RightCurly
+option = ALONE_OR_SINGLELINE
+tokens = LITERAL_CASE
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksWithSwitchRuleAloneOrSingleline {
+
+    public void testt0() {
+        int mode = 0;
+        switch (mode) {
+            case 1 -> {int x = 1;}   // ok, single line
+            case 2 -> {int x = 0;}
+            case 3 -> System.out.println("x is 3");
+        }
+    }
+
+    public static void test0() {
+        int mode = 0;
+        switch (mode) {
+            case 1 -> {
+                int
+            x = 1;} // violation '}' at column 19 should be alone on a line'
+            case 2 -> {
+                int x = 0;
+            }
+            case 3 -> System.out.println("x is 3");
+        }
+    }
+
+    public static void test() {
+        int mode = 0;
+        switch (mode) {
+            case 1 -> {
+                int x = 1;
+
+            } default -> {          // violation '}' at column 13 should be alone on a line'
+                int x = 0;
+            }
+        }
+    }
+
+    public static void test1() {
+        int k = 0;
+        switch (k) {
+            case 1 -> {
+
+
+           int x = 1; } case 2 -> {       // violation '}' at column 23 should be alone on a line'
+                int x = 2;}     // violation '}' at column 27 should be alone on a line'
+
+        }
+    }
+
+    public static void test2() {
+         int k = 0;
+         switch (k) {
+            case 1 -> {int x = 1;
+
+            }case 2 -> throw new RuntimeException();
+            // violation above '}' at column 13 should be alone on a line'
+         }
+    }
+
+    public static void test3() {
+         int k = 0;
+         switch (k) {
+            case 1 -> {
+                 int x = 1;
+            }
+            case 2 -> {
+                    int x = 2;
+            } }      // violation '}' at column 13 should be alone on a line'
+    }
+
+    public static void test4() {
+        int mode = 0;
+        switch (mode) { case 0 -> {int x = 1;} default -> {int x = 0;} }
+        // violation above '}' at column 46 should be alone on a line'
+    }
+
+    public static void test5() {
+        int mode = 0;
+        switch (mode) {
+            case 0 -> {
+                int x = 1;
+            } case 1 -> {int x = 2;}  // violation '}' at column 13 should be alone on a line'
+        }
+    }
+
+    public static void test8() {
+        int mode = 0;
+        int x = 0;
+        switch (mode) {
+            case 0 -> throw new RuntimeException();
+            case 1 -> x = 1;
+            case 2 -> {x = 1; }      // ok, single line
+            case 3 -> {x = 5; } }   // violation '}' at column 31 should be alone on a line'
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestRecordsAndCompactCtors.java
index 156506e0f8f..de1a20bf474 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestRecordsAndCompactCtors.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 import org.w3c.dom.Node;
@@ -42,5 +42,5 @@ record MyTestRecord5() {
                 // violation above ''}' at column 68 should be alone on a line'
     class MyTestClass {
         private MyTestRecord mtr =
-                new MyTestRecord("my string", new MyTestRecord4());} // ok
+                new MyTestRecord("my string", new MyTestRecord4());}
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression.java
index d975706e22a..02f1bd27c48 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 public class InputRightCurlyTestSwitchExpression {
@@ -19,7 +19,7 @@ public void test() {
                 case 2 -> "Tuesday";
                 case 3 -> "Wednesday";
                 default -> "Invalid day";
-            }; } // ok
+            }; }
 
     public void test1() {
         int day = 3;
@@ -27,7 +27,7 @@ public void test1() {
             switch (day) {
                 case 1 -> "Monday";
                 default -> "Invalid day";
-            }; // ok
+            };
     }
 
     public void test2() {
@@ -36,7 +36,7 @@ public void test2() {
             switch (day) {
                 case 1 -> "Monday";
                 default -> "Invalid day";
-            }; System.out.println(check); // ok
+            }; System.out.println(check);
     }
 
     public void test3() {
@@ -60,7 +60,7 @@ public void test5() {
         switch (num) {
             case 1 -> System.out.println("One");
             default -> System.out.println("Other");
-        } // ok
+        }
     }
 
     public void test6() {
@@ -68,7 +68,7 @@ public void test6() {
 
         switch (num) {
             //no case or default statement
-        } // ok
+        }
     }
 
     public void test7() {
@@ -76,7 +76,7 @@ public void test7() {
 
         switch (num) {
             //no case or default statement
-        } // ok
+        }
     }
 
     public void test8() {
@@ -102,17 +102,17 @@ public void test9() {
             default -> {
                 Runnable defaultResult = () -> System.out.println("defaultResult");
             }
-        } // ok
+        }
     }
 
     public void test10() {
         int expression = 2;
         switch (expression) { case 1 -> { Runnable result1 = () -> System.out.println("r1"); }
-        } // ok
+        }
         switch (expression) {
             case 1 -> {
                 Runnable result1 = () -> System.out.println("r1");
             }
-        } // ok
+        }
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression2.java
index 9eda6d8a553..75cce0896a5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression2.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 public class InputRightCurlyTestSwitchExpression2 {
@@ -17,7 +17,7 @@ public void test() {
             switch (day) {
                 case 1 -> "Monday";
                 default -> "Invalid day";
-            }; } // ok
+            }; }
 
     public void test1() {
         int day = 3;
@@ -34,7 +34,7 @@ public void test2() {
             switch (day) {
                 case 1 -> "Monday";
                 default -> "Invalid day";
-            }; System.out.println(check); // ok
+            }; System.out.println(check);
     }
 
     public void test3() {
@@ -58,7 +58,7 @@ public void test5() {
         switch (num) {
             case 1 -> System.out.println("One");
             default -> System.out.println("Other");
-        } // ok
+        }
     }
 
     public void test6() {
@@ -66,7 +66,7 @@ public void test6() {
 
         switch (num) {
             //no case or default statement
-        } // ok
+        }
     }
 
     public void test7() {
@@ -100,19 +100,19 @@ public void test9() {
             default -> {
                 Runnable defaultResult = () -> System.out.println("defaultResult");
             }
-        } // ok
+        }
     }
 
     public void test10() {
         int expression = 2;
         switch (expression)
-        { case 1 -> { Runnable result1 = () -> System.out.println("r1"); } } // ok
+        { case 1 -> { Runnable result1 = () -> System.out.println("r1"); } }
         switch (expression)
-        { case 1 -> { Runnable result1 = () -> System.out.println("r1"); } } // ok
+        { case 1 -> { Runnable result1 = () -> System.out.println("r1"); } }
         switch (expression) {
             case 1 -> {
                 Runnable result1 = () -> System.out.println("r1");
             }
-        } // ok
+        }
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression3.java
index e3bd1d0dfcd..1fa28ddedee 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression3.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 public class InputRightCurlyTestSwitchExpression3 {
@@ -25,5 +25,5 @@ int foo2(int yield) {
             case 2 -> 3;
             case 3 -> 4;
             default -> 5;
-        }; } // ok
+        }; }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression4.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression4.java
index 05f5f3e86d7..77189d583d8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression4.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression4.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 public class InputRightCurlyTestSwitchExpression4 {
@@ -30,8 +30,8 @@ public InputFinalLocalVariableCheckSwitchAssignment() throws Exception {
                         throw new Exception();
                     }
                     default -> 2;
-                }; // ok
-            }; // ok
+                };
+            };
         }
 
         public void foo() throws Exception {
@@ -47,21 +47,21 @@ public void foo() throws Exception {
                     throw new Exception();
                 }
                 default -> 2;
-            }; // ok
+            };
 
             int c = switch (b) {
                 case 0 -> 1;
                 default -> 2;
-            }; // ok
+            };
 
             c = switch (a) {
                 case 0 -> switch (b) {
                     case 0 -> 1;
                     case 1 -> 2;
                     default -> 3;
-                }; // ok
+                };
                 default -> 1;
-            }; // ok
+            };
         }
     }
 }
@@ -78,11 +78,11 @@ public enum Day {
     }
 
     public void foo2(Options option) {
-        assert Integer.valueOf(1).equals(switch (option) { // ok
+        assert Integer.valueOf(1).equals(switch (option) {
             case ONE -> 1;
             case TWO -> 2;
             case THREE -> 3;
-        }); // ok
+        });
     }
 }
 
@@ -102,7 +102,7 @@ private int id(int i) {
               yield temp;
           }
           default -> throw new IllegalStateException();
-      }); // ok
+      });
 
     void commentBeforeRightCurly() {
         int i = 20;
@@ -110,7 +110,7 @@ void commentBeforeRightCurly() {
             switch (i) {
                 case 0:
                     i++;
-            } // ok
+            }
             switch (i) {
                 case 0:
                     i++;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression5.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression5.java
index ee645c7f0da..998b4c03488 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression5.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression5.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 import java.io.IOException;
@@ -32,7 +32,7 @@ public InputFinalLocalVariableCheckSwitchAssignment() throws Exception {
                     }
                     default -> 2;
                 };
-            }; // ok
+            };
         }
 
         public void foo() throws Exception {
@@ -57,8 +57,8 @@ public void foo() throws Exception {
                 case 0 -> switch (b) {
                     case 0 -> 1;
                     case 1 -> 2;
-                    default -> 3; }; // ok
-                default -> 1; }; // ok
+                    default -> 3; };
+                default -> 1; };
         }
     }
 }
@@ -70,9 +70,9 @@ public enum Day {
     public enum Options { THREE }
 
     public void foo2(Options option) {
-        assert Integer.valueOf(1).equals(switch (option) { // ok
+        assert Integer.valueOf(1).equals(switch (option) {
             case THREE -> 3;
-        }); // ok
+        });
     }
 }
 
@@ -92,7 +92,7 @@ private int id(int i) {
             yield temp;
         }
         default -> throw new IllegalStateException();
-    }); // ok
+    });
 
     public static void method0() throws IOException {
         int stValue = 0;
@@ -101,7 +101,7 @@ public static void method0() throws IOException {
                 switch (stValue) {
                     case 0:
                         break;
-                } // ok
+                }
             } catch (NumberFormatException e) {
                 throw new IOException(" value ");
             }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression6.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression6.java
index 62267ffc9fc..afae3f4d34d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression6.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression6.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 public class InputRightCurlyTestSwitchExpression6 {
@@ -19,7 +19,7 @@ public void foo5() {
          case B:
          default:
              yield false;
-         }) && x == 1; // ok
+         }) && x == 1;
 
          {
              final T y = T.A;
@@ -32,7 +32,7 @@ public void foo5() {
                  yield (x = 1) == 1 || true;
              default:
                  yield false;
-             }) && x == 1; // ok
+             }) && x == 1;
          }
 
          {
@@ -65,7 +65,7 @@ public void foo5() {
                  x = 1;
                  yield true;
              }
-             }) && x == 1; // ok
+             }) && x == 1;
          }
      }
 
@@ -74,7 +74,7 @@ public void bar2(Option option) {
               case ONE -> 1;
               case TWO -> 2;
               case THREE -> 3;
-          }; // ok
+          };
       }
 
       int usedOnBothSidesOfArithmeticExpression(Day day) {
@@ -82,7 +82,7 @@ int usedOnBothSidesOfArithmeticExpression(Day day) {
               case MON, TUE -> 0;
               case WED -> 1;
               default -> 2;
-          } * switch (day) {  // ok
+          } * switch (day) {
               case WED, THU -> 3;
               case FRI -> 4;
               default -> 5;
@@ -102,7 +102,7 @@ int usedOnBothSidesOfArithmeticExpression(Day day) {
                   yield (x = 1) == 1 || true;
               default
                       :yield false;
-          }) && x == 1; // ok
+          }) && x == 1;
      }
 }
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression7.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression7.java
index 25d7638bfee..555921259ab 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression7.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchExpression7.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
 public class InputRightCurlyTestSwitchExpression7 {
@@ -16,7 +16,7 @@ String isDayNameLong(Day day) {
               case TUE -> 7;
               case THU, SAT -> 8;
               case WED -> 9;
-          } > 7 ? "long" : "short"; // ok
+          } > 7 ? "long" : "short";
       }
 
      int arithmetic(Day day) {
@@ -25,7 +25,7 @@ int arithmetic(Day day) {
              case TUE -> 7;
              case THU, SAT -> 8;
              case WED -> 9;
-         } % 2; // ok
+         } % 2;
      }
 
      int signArithmetic(Day day) {
@@ -42,11 +42,11 @@ int usedOnBothSidesOfArithmeticExpression(Day day) {
              case MON, TUE -> 0;
              case WED -> 1;
             default -> 2;
-         } * switch (day) { // ok
+         } * switch (day) {
              case WED, THU -> 3;
              case FRI -> 4;
              default -> 5;
-         }; // ok
+         };
      }
 
      static {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/InputConstructorsDeclarationGroupingRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/InputConstructorsDeclarationGroupingRecords.java
new file mode 100644
index 00000000000..d45c0ecc9d9
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/InputConstructorsDeclarationGroupingRecords.java
@@ -0,0 +1,80 @@
+/*
+ConstructorsDeclarationGrouping
+
+
+*/
+
+//non-compiled with javac: Compilable with Java14
+package com.puppycrawl.tools.checkstyle.checks.coding.constructorsdeclarationgrouping;
+
+public class InputConstructorsDeclarationGroupingRecords {
+    public record MyRecord1(int x, int y) {
+        public MyRecord1(int a) {
+            this(a,a);
+        }
+
+        void foo() {}
+
+        void foo2() {}
+
+        public MyRecord1 {}
+        // violation above 'Constructors should be grouped together.*'
+
+        public MyRecord1(int a, int b, int c, int d) {
+            // violation above 'Constructors should be grouped together.*'
+            this(a+b, c+d);
+        }
+
+        public MyRecord1(int x, int y, int z) {
+            // violation above 'Constructors should be grouped together.*'
+            this(x+y, z);
+        }
+    }
+
+    class MyClass {
+        int x = 20;
+
+        MyClass() {}
+
+        MyClass(String s) {}
+
+        String[] str;
+
+        String[] str2;
+
+        MyClass(int a) {}
+        // violation above 'Constructors should be grouped together.*'
+    }
+
+    public record MyRecord2(double d) {
+        public MyRecord2(double a, double b, double c) {
+            this(a+b+c);
+        }
+
+        public MyRecord2 {}
+
+        public MyRecord2(double a, double b) {
+            this(a+b);
+        }
+    }
+
+    public record MyRecord3(float f) {
+        public MyRecord3(float a, float b, float c) {
+            this(a+b+c);
+        }
+    }
+
+    public record MyRecord4(String str) {
+        public MyRecord4 {}
+    }
+
+    public record MyRecord5(long l) {
+        void test() {}
+
+        void test2() {}
+
+        void test3() {}
+    }
+
+    public record MyRecord6(String str, int x) {}
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/covariantequals/InputCovariantEqualsRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/covariantequals/InputCovariantEqualsRecords.java
index 44b3968d627..efaed7bea80 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/covariantequals/InputCovariantEqualsRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/covariantequals/InputCovariantEqualsRecords.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.covariantequals;
 
 public class InputCovariantEqualsRecords {
@@ -16,7 +16,7 @@ public boolean equals(String str) { // violation
     }
 
     public record MyRecord2() {
-        public boolean equals(String str) { // ok
+        public boolean equals(String str) {
             return str.equals(this);
         }
         public boolean equals(Object obj) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrderRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrderRecordsAndCompactCtors.java
index b467ba081dd..4161acd3465 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrderRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrderRecordsAndCompactCtors.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.declarationorder;
 
 import java.util.HashMap;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressions.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressions.java
index 37b53d89905..54b407e0a33 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressions.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressions.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.defaultcomeslast;
 
 public class InputDefaultComesLastSwitchExpressions {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressionsSkipIfLast.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressionsSkipIfLast.java
index 47d9a588524..008fbeedd11 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressionsSkipIfLast.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastSwitchExpressionsSkipIfLast.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.defaultcomeslast;
 
 public class InputDefaultComesLastSwitchExpressionsSkipIfLast {
@@ -13,7 +13,7 @@ public int method1(int i) {
         int x = 7;
         switch (i) {
             case 1:
-            default: // ok
+            default:
                 x = 9;
                 break;
             case 2:
@@ -54,7 +54,7 @@ public int method4(int i) {
         return switch (i) {
             case 1 -> 8;
             case 2 -> 7;
-            default -> 9; // ok
+            default -> 9; //
         };
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullEnhancedInstanceof.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullEnhancedInstanceof.java
index ed60972ff5c..e3bb55ffd24 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullEnhancedInstanceof.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullEnhancedInstanceof.java
@@ -5,15 +5,15 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.equalsavoidnull;
 
 public class InputEqualsAvoidNullEnhancedInstanceof {
-    public InputEqualsAvoidNullEnhancedInstanceof(String str) {
+    public InputEqualsAvoidNullEnhancedInstanceof(Object str) {
         if (str instanceof String myString) {
             System.out.println("Mystring!!");
             boolean myBool = myString.equals("MyString!!"); // violation 'left .* of .* equals'
-            boolean myOtherBool = myString.equals(str); // ok
+            boolean myOtherBool = myString.equals(str);
         } else if (str instanceof String oneMoreString) {
             if(oneMoreString.equals("test")) { // violation 'left .* of .* equals'
                 System.out.println("Test!!");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullRecordsAndCompactCtors.java
index e94aaf780ad..c03329850c1 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullRecordsAndCompactCtors.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.equalsavoidnull;
 
 public class InputEqualsAvoidNullRecordsAndCompactCtors {
@@ -13,7 +13,7 @@ public class InputEqualsAvoidNullRecordsAndCompactCtors {
     record TestRecord1(String str) {
         public TestRecord1 {
             str.equals("my string"); // violation 'left .* of .* equals'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
     }
 
@@ -23,7 +23,7 @@ public boolean stringCheck1 (String toCheck){
         }
 
         public boolean stringCheck2 (String toCheck){
-            return "my string".equals(toCheck); // ok
+            return "my string".equals(toCheck);
         }
     }
 
@@ -32,14 +32,14 @@ record TestRecord3() {
         TestRecord3 (String str){
             this();
             str.equalsIgnoreCase("my string"); // violation 'left .* of .* equalsIgnoreCase'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
     }
 
     record TestRecord4(String str) {
         public TestRecord4 {
             str.equalsIgnoreCase("my string"); // violation 'left .* of .* equalsIgnoreCase'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
     }
 
@@ -47,7 +47,7 @@ record TestRecord5() {
         TestRecord5 (int num) {
             this();
             str.equalsIgnoreCase("my string"); // violation 'left .* of .* equalsIgnoreCase'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
         private static String str;
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullTextBlocks.java
index 767c07bfe9b..a5f817305bf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullTextBlocks.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.equalsavoidnull;
 
 public class InputEqualsAvoidNullTextBlocks {
@@ -36,7 +36,7 @@ record MyRecord(String a, Object obj) {
           System.out.println("this is my other string");
         }
         else if ("""
-            one more string""".equals(s)) { // ok
+            one more string""".equals(s)) {
           System.out.println("This is one more string");
         }
       }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java
index 383cf4f255b..b9dbd9eb583 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java
@@ -43,7 +43,8 @@ void tryResource() throws Exception {
                 return;
             }
             finally {
-            } // ok
+            } // ok, either exception is thrown or
+            // we return from method before fallthrough can occur
         case 6:
             try (final Resource resource = new Resource()) {
             }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java
index 299b517e8ac..34055fe4e8b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java
@@ -51,30 +51,30 @@ void tryResource() throws Exception {
                 return;
             }
             // fallthru
-        case 7: // violation 'Fall through from previous branch of the switch statement.'
+        case 7: // violation 'Fall\ through from previous branch of the switch statement.'
             try (final Resource resource = new Resource()) {
             }
             // fallthru
-        case 8: // violation 'Fall through from previous branch of the switch statement.'
+        case 8: // violation 'Fall\ through from previous branch of the switch statement.'
             try (final Resource resource = new Resource()) {
             }
             finally {
             }
             // fallthru
-        case 9: // violation 'Fall through from previous branch of the switch statement.'
+        case 9: // violation 'Fall\ through from previous branch of the switch statement.'
             try (final Resource resource = new Resource()) {
             }
             catch (Exception ex) {
             }
             // fallthru
-        case 10: // violation 'Fall through from previous branch of the switch statement.'
+        case 10: // violation 'Fall\ through from previous branch of the switch statement.'
             try (final Resource resource = new Resource()) {
                 return;
             }
             catch (Exception ex) {
             }
             // fallthru
-        default: // violation 'Fall through from previous branch of the switch statement.'
+        default: // violation 'Fall\ through from previous branch of the switch statement.'
             break;
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java
index b74f11bb980..46d84197732 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.fallthrough;
 
 public class InputFallThrough3
@@ -16,13 +16,13 @@ int hasYield() {
         return switch (hashCode()) {
         case 1:
             i++;
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             yield 2;
-        case 3: // ok
+        case 3:
             // fall through
-        case 4: // ok
+        case 4:
             yield 5;
-        default: // ok
+        default:
             yield -1;
         };
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java
index 8101a992347..4895465cb6f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.fallthrough;
 
 public class InputFallThrough4 {
@@ -16,7 +16,7 @@ private static boolean commonNeedIncrement(int roundingMode, int qsign,
             case 1:
                 throw new ArithmeticException("Rounding necessary");
 
-            case 2:  /* block */ // ok
+            case 2:  /* block */
                 if (Double.isNaN(3)) /* block */
                     return true; /* block */
                 else /* block */
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java
index ab173dfaaf3..9baf7dcbf5d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java
@@ -21,7 +21,7 @@ void exhaustiveStatementSane(Object o) {
         switch (o) { // violation below 'Fall .* from the last branch of the switch statement'
             case Object obj, null: ;
         }
-        switch (o) { // violation below 'Fall .* from the last branch of the switch statement'
+        switch (o) {
             case Object obj, null: ; // fall thru
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughSwitchRules.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughSwitchRules.java
new file mode 100644
index 00000000000..56fb580edd4
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughSwitchRules.java
@@ -0,0 +1,67 @@
+/*
+FallThrough
+checkLastCaseGroup = (default)false
+reliefPattern = (default)falls?[ -]?thr(u|ough)
+
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.coding.fallthrough;
+
+public class InputFallThroughSwitchRules {
+
+    int method(int a, int b) {
+        top:
+        switch (a) {
+            case 1 -> {
+                switch (b) {
+                    case 10 -> {
+                        break top; // ok as terminates outer 'top' switch
+                    }
+                    default -> {
+                        return 11;
+                    }
+                }
+            }
+            case 2 -> {
+                return 2;
+            }
+        }
+
+        outer:
+        switch (a) {
+            case 1 -> {
+                inner:
+                switch (b) {
+                    case 10 -> throw new IllegalArgumentException("Invalid input");
+                    default -> {
+                        break outer; // ok as terminates outer 'outer' switch
+                    }
+                }
+            }
+            case 2 -> {
+                return 2;
+            }
+        }
+
+        loop:
+        for (int i = 0; i < 3; i++) {
+            switch (a) {
+                case 1 -> {
+                    switch (b) {
+                        case 10 -> {
+                            break loop; // ok as terminates outer 'loop'
+                        }
+                        default -> System.out.println("Default case");
+                    }
+                }
+                case 2 -> {
+                    return 2;
+                }
+            }
+        }
+
+        return -1;
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckRecords.java
index 5ef8033e59c..cb7427c3716 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckRecords.java
@@ -6,12 +6,12 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
 public record InputFinalLocalVariableCheckRecords(boolean t, boolean f) {
     public InputFinalLocalVariableCheckRecords {
-        int a = 0; // ok
+        int a = 0;
         a = 1;
     }
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchAssignment.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchAssignment.java
index 1cf2cc346b7..72c98613b00 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchAssignment.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchAssignment.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
 public class InputFinalLocalVariableCheckSwitchAssignment {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchExpressions.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchExpressions.java
index 77ea24faaf6..28d7fd184f2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchExpressions.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableCheckSwitchExpressions.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
 public class InputFinalLocalVariableCheckSwitchExpressions {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldClassNestedInRecord.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldClassNestedInRecord.java
index f029802c0d6..dddae20d4c4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldClassNestedInRecord.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldClassNestedInRecord.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.hiddenfield;
 
 public class InputHiddenFieldClassNestedInRecord {
@@ -25,7 +25,7 @@ foo setA(int a) { // violation
                 return foo.this;
             }
 
-            foo2 setB(int b) { // ok
+            foo2 setB(int b) {
                 this.b = b;
                 return this;
             }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldEnhancedInstanceof.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldEnhancedInstanceof.java
index f673eed0093..2eb94544eaf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldEnhancedInstanceof.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldEnhancedInstanceof.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.hiddenfield;
 
 import java.util.Locale;
@@ -22,7 +22,7 @@ public class Keyboard {
         private final int price = 2;
 
         // Pattern variable price hides field price
-        public boolean doStuff(Float f) {
+        public boolean doStuff(Object f) {
             return f instanceof Float price && // violation
                     price.floatValue() > 0 &&
                     model != null &&
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldInnerRecordsImplicitlyStatic.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldInnerRecordsImplicitlyStatic.java
new file mode 100644
index 00000000000..667df177b55
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldInnerRecordsImplicitlyStatic.java
@@ -0,0 +1,54 @@
+/*
+HiddenField
+ignoreConstructorParameter = true
+ignoreSetter = true
+setterCanReturnItsClass = true
+tokens = (default)VARIABLE_DEF, PARAMETER_DEF, PATTERN_VARIABLE_DEF, LAMBDA, RECORD_COMPONENT_DEF
+
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.coding.hiddenfield;
+
+import java.time.Clock;
+import java.time.Instant;
+
+public class InputHiddenFieldInnerRecordsImplicitlyStatic {
+}
+
+class Scratch {
+
+    private final Clock clock;
+
+    Scratch(Clock clock) {
+        this.clock = clock;
+    }
+
+    public record State(String token, Instant expiresAt) {
+        static int pointer = 0;
+        // Inner records are implicitly static so the outer class field will not hide this paramter
+        public boolean isFresh(final Clock clock) {
+            return Instant.now(clock).isBefore(expiresAt);
+        }
+
+        public int anInt(int pointer) { // violation ''pointer' hides a field'
+            return pointer;
+        }
+    }
+}
+
+class Test {
+
+    String name;
+
+    record data(String str, int integer) {
+        void method() {
+            String name = str;
+        }
+
+        public boolean isTrue(String name) {
+            return true;
+        }
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldRecords.java
index 23e70551966..fd24f07cb07 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldRecords.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.hiddenfield;
 
 import java.util.Locale;
@@ -54,7 +54,7 @@ public record Keyboard() {
         private static String model = null;
         private static int price = 2;
 
-        public boolean doStuff(Float f) {
+        public boolean doStuff(Object f) {
             return f instanceof Float price && // violation
                     price.floatValue() > 0 &&
                     model != null &&
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldRecordsImplicitlyStaticClassComparison.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldRecordsImplicitlyStaticClassComparison.java
new file mode 100644
index 00000000000..c5f93b906c0
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldRecordsImplicitlyStaticClassComparison.java
@@ -0,0 +1,77 @@
+/*
+HiddenField
+ignoreConstructorParameter = true
+ignoreSetter = true
+setterCanReturnItsClass = true
+tokens = (default)VARIABLE_DEF, PARAMETER_DEF, PATTERN_VARIABLE_DEF, LAMBDA, RECORD_COMPONENT_DEF
+
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.coding.hiddenfield;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import java.time.Clock;
+import java.time.Instant;
+
+public class InputHiddenFieldRecordsImplicitlyStaticClassComparison {
+}
+
+class Test {
+    private final int x;
+
+    public Test(int x) {
+        this.x = x;
+    }
+
+    // inner record is implicitly static, should be treated
+    // the same as R2
+    public record R1() {
+        public void m(int x) {}
+    }
+
+    public static record R2() {
+        public void m(int x) {}
+    }
+
+    // static class, should be treated the same as R2
+    public static class C1 {
+        public void m(int x) {}
+    }
+
+    // non-static class, should have a violation
+    public class C2 {
+        public void m(int x) {} // violation ''x' hides a field'
+    }
+
+    record Wobble (Foo foo) implements ThrowingExternalizable {
+        @Override
+        public void writeExternal(ObjectOutput objectOutput) throws IOException {
+
+        }
+
+        @Override
+        public void readExternal(ObjectInput objectInput)
+                throws IOException, ClassNotFoundException {
+        }
+    }
+
+    interface ThrowingExternalizable extends Externalizable {
+
+    }
+
+    class Foo {}
+
+    public void test() {
+        Foo foo = new Foo();
+        Wobble wobble = new Wobble(foo);
+        Wobble[] objToSerialize = new Wobble[] { wobble, wobble, wobble, wobble };
+    }
+
+}
+
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldSwitchExpression.java
index a83a1d327a5..e08d8c14f5a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldSwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldSwitchExpression.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.hiddenfield;
 
 import java.util.stream.Stream;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang2.java
index 5d1a5ae6ea5..13c0ace2aff 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang2.java
@@ -9,7 +9,7 @@
 //non-compiled with javac: compiling on jdk before 9
 package java.lang;
 
-class InputIllegalInstantiationLang2 { // ok
+class InputIllegalInstantiationLang2 {
     Boolean obj = new Boolean();
     Integer obj2 = new Integer();
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextStringTemplate.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextStringTemplate.java
new file mode 100644
index 00000000000..81f88e4a5d2
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextStringTemplate.java
@@ -0,0 +1,76 @@
+/*
+IllegalTokenText
+format = x
+ignoreCase = (default)false
+message = (default)
+tokens = STRING_TEMPLATE_CONTENT
+
+
+*/
+
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+import java.util.List;
+
+public class InputIllegalTokenTextStringTemplate {
+    int x = 10;
+    int y = 20;
+
+    // most basic example, empty string template expression
+    String result1 = STR."";
+
+    String result1_1 = STR."Hello world!";
+
+    // no content, no expression
+    String result1_2 = STR."\{  }";
+
+    // simple single value interpolation
+    String result2 = STR. "x\{ x }x"; // 2 violations
+
+    // simple single value interpolation with a method call
+    String result3 = STR. "\{ y(y("y")) }";
+
+    // bit more complex example, multiple interpolations
+    String result4 = STR. "\{ x }"  + STR. "\{ y }";
+
+    // bit more complex example, multiple interpolations with method calls
+    String result5 = STR. "\{ y(y("y")) }"  + STR. "\{ y(y("y")) }";
+
+    // string template concatenation
+    String result6 = STR. "\{ x }"  + STR. "\{ y }";
+
+    // concatentation in embedded expression
+    String result7 = STR. "\{ x + y }";
+
+    // concatentation in embedded expression with method calls
+    String result8 = STR. "hey \{ y(y("y")) + y(y("y")) } there";
+
+    // multiple lines
+    String result9 = STR. "hey \{
+            y(y("y")) + y(y("y"))
+            } there";
+
+    // multiple lines with many expressions
+    String result10 = STR. "hey \{
+            y(y("y")) + y(y("y"))
+            } there \{
+            y(y("y")) + y(y("y"))
+            + STR."x\{ x }x" // 2 violations
+            }";
+
+    String name = "world";
+    String s = STR."Hello, \{ name }!";
+
+    private static String y(String y) {
+        return "y";
+    }
+
+    // Verify proper behavior of TransType w.r.t. templated Strings
+    void x(List<? extends StringTemplate.Processor<String, RuntimeException>> list) {
+        list.get(0)."";
+        list.get(0)."\{  }";
+        list.get(0). "x\{ x }x"; // 2 violations
+        list.get(0). ".\{ x }.\{ y }.\{ x }.\{}.\{}";
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocks.java
index 736dabb2772..44496362e70 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocks.java
@@ -8,18 +8,18 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
 
 public class InputIllegalTokenTextTextBlocks {
     public void methodWithLiterals() {
         final String ref = "<a href=\""; // violation
-        final String refCase1 = "<A hReF=\""; // ok
+        final String refCase1 = "<A hReF=\"";
 
         final String ref2 = """
                 <a href=\""""; // violation above
         final String refCase2 = """
-                <A hReF=\""""; // ok
+                <A hReF=\"""";
 
         String escape = """
                 <html>\u000D\u000A\n
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocksQuotes.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocksQuotes.java
index 1eacdc67b17..76c87892d48 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocksQuotes.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTextBlocksQuotes.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
 
 public class InputIllegalTokenTextTextBlocksQuotes {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypePackageClassName.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypePackageClassName.java
index db74befedc8..872d2b3549a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypePackageClassName.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypePackageClassName.java
@@ -19,5 +19,5 @@
 import com.PackageClass.*;
 
 public class InputIllegalTypePackageClassName {
-    PackageClass o = new PackageClass(); // ok
+    PackageClass o = new PackageClass();
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsAndCompactCtors.java
index 9574d68663e..fbb0fcbb4cf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsAndCompactCtors.java
@@ -15,7 +15,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import java.util.HashMap;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersDefault.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersDefault.java
index dd50d3344fc..121a03ff005 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersDefault.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersDefault.java
@@ -15,7 +15,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import java.util.*;
@@ -24,16 +24,16 @@ public class InputIllegalTypeRecordsWithMemberModifiersDefault
 {
 
     public record IdentifiersPair(
-        UUID productId, // ok
-        String identifier // ok
+        UUID productId,
+        String identifier
     )
     {
 
     }
 
     public class IdentifiersPairEquivalent {
-        private final UUID productId; // ok
-        private final String identifier; // ok
+        private final UUID productId;
+        private final String identifier;
 
         public IdentifiersPairEquivalent(UUID productId, String identifier) {
             this.productId = productId;
@@ -43,7 +43,7 @@ public IdentifiersPairEquivalent(UUID productId, String identifier) {
 
     public record IdentifiersPair2(
         HashSet x, // violation
-        String identifier // ok
+        String identifier
     )
     {
 
@@ -51,10 +51,10 @@ public record IdentifiersPair2(
 
     public class IdentifiersPairEquivalent2 {
         private final HashSet x; // violation
-        private final String identifier; // ok
+        private final String identifier;
 
-        public IdentifiersPairEquivalent2(Set x, String identifier) { // ok
-            this.x = (HashSet) x; // ok
+        public IdentifiersPairEquivalent2(Set x, String identifier) {
+            this.x = (HashSet) x;
             this.identifier = identifier;
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersFinal.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersFinal.java
index 227c84555b9..56a9a17067f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersFinal.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersFinal.java
@@ -15,7 +15,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import java.util.*;
@@ -24,16 +24,16 @@ public class InputIllegalTypeRecordsWithMemberModifiersFinal
 {
 
     public record IdentifiersPair(
-        UUID productId, // ok
-        String identifier // ok
+        UUID productId,
+        String identifier
     )
     {
 
     }
 
     public class IdentifiersPairEquivalent {
-        private final UUID productId; // ok
-        private final String identifier; // ok
+        private final UUID productId;
+        private final String identifier;
 
         public IdentifiersPairEquivalent(UUID productId, String identifier) {
             this.productId = productId;
@@ -43,7 +43,7 @@ public IdentifiersPairEquivalent(UUID productId, String identifier) {
 
     public record IdentifiersPair2(
         HashSet x, // violation
-        String identifier // ok
+        String identifier
     )
     {
 
@@ -51,10 +51,10 @@ public record IdentifiersPair2(
 
     public class IdentifiersPairEquivalent2 {
         private final HashSet x; // violation
-        private final String identifier; // ok
+        private final String identifier;
 
-        public IdentifiersPairEquivalent2(Set x, String identifier) { // ok
-            this.x = (HashSet) x; // ok
+        public IdentifiersPairEquivalent2(Set x, String identifier) {
+            this.x = (HashSet) x;
             this.identifier = identifier;
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java
index d76607337eb..39b46d64fb9 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPrivateFinal.java
@@ -15,7 +15,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import java.util.*;
@@ -24,16 +24,16 @@ public class InputIllegalTypeRecordsWithMemberModifiersPrivateFinal
 {
 
     public record IdentifiersPair(
-        UUID productId, // ok
-        String identifier // ok
+        UUID productId,
+        String identifier
     )
     {
 
     }
 
     public class IdentifiersPairEquivalent {
-        private final UUID productId; // ok
-        private final String identifier; // ok
+        private final UUID productId;
+        private final String identifier;
 
         public IdentifiersPairEquivalent(UUID productId, String identifier) {
             this.productId = productId;
@@ -43,7 +43,7 @@ public IdentifiersPairEquivalent(UUID productId, String identifier) {
 
     public record IdentifiersPair2(
         HashSet x, // violation
-        String identifier // ok
+        String identifier
     )
     {
 
@@ -51,10 +51,10 @@ public record IdentifiersPair2(
 
     public class IdentifiersPairEquivalent2 {
         private final HashSet x; // violation
-        private final String identifier; // ok
+        private final String identifier;
 
-        public IdentifiersPairEquivalent2(Set x, String identifier) { // ok
-            this.x = (HashSet) x; // ok
+        public IdentifiersPairEquivalent2(Set x, String identifier) {
+            this.x = (HashSet) x;
             this.identifier = identifier;
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java
index d1149e88108..2ad37738b82 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic.java
@@ -15,7 +15,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import java.util.*;
@@ -24,16 +24,16 @@ public class InputIllegalTypeRecordsWithMemberModifiersPublicProtectedStatic
 {
 
     public record IdentifiersPair(
-        UUID productId, // ok
-        String identifier // ok
+        UUID productId,
+        String identifier
     )
     {
 
     }
 
     public class IdentifiersPairEquivalent {
-        private final UUID productId; // ok
-        private final String identifier; // ok
+        private final UUID productId;
+        private final String identifier;
 
         public IdentifiersPairEquivalent(UUID productId, String identifier) {
             this.productId = productId;
@@ -43,18 +43,18 @@ public IdentifiersPairEquivalent(UUID productId, String identifier) {
 
     public record IdentifiersPair2(
         HashSet x, // violation
-        String identifier // ok
+        String identifier
     )
     {
 
     }
 
     public class IdentifiersPairEquivalent2 {
-        private final HashSet x; // ok
-        private final String identifier; // ok
+        private final HashSet x;
+        private final String identifier;
 
-        public IdentifiersPairEquivalent2(Set x, String identifier) { // ok
-            this.x = (HashSet) x; // ok
+        public IdentifiersPairEquivalent2(Set x, String identifier) {
+            this.x = (HashSet) x;
             this.identifier = identifier;
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestEnhancedInstanceof.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestEnhancedInstanceof.java
index a448cae748e..073351305dc 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestEnhancedInstanceof.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestEnhancedInstanceof.java
@@ -15,30 +15,32 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeSet;
+import java.util.AbstractMap;
 
 public class InputIllegalTypeTestEnhancedInstanceof {
-    public void InputIllegalTypeEnhancedInstanceof() {
+    public void InputIllegalTypeEnhancedInstanceof(Map<Integer, Integer> lmm) {
         LinkedHashMap<Integer, Integer> lhm // violation
                 = new LinkedHashMap<Integer, Integer>();
 
-        if (lhm instanceof LinkedHashMap<Integer, Integer> linkedHashMap) { // violation
+        if (lmm instanceof LinkedHashMap<Integer, Integer> linkedHashMap) { // violation
             System.out.println(linkedHashMap);
-        } else if (lhm instanceof Map<Integer, Integer> map) {
+        } else if (lmm instanceof AbstractMap<Integer, Integer> map) {
             System.out.println(map);
-        } else if (lhm instanceof HashMap<Integer, Integer> hashMap) { // violation
+        } else if (lmm instanceof HashMap<Integer, Integer> hashMap) { // violation
             System.out.println(hashMap);
         }
     }
 
     public void InputIllegalTypeEnhancedInstanceof(TreeSet treeSet) { // violation
-        if (treeSet instanceof TreeSet t) { // violation
+        Object set = new Object();
+        if (set instanceof TreeSet t) { // violation
             System.out.println(t);
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentSwitchAndSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentSwitchAndSwitchExpression.java
new file mode 100644
index 00000000000..358cbe6be5e
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentSwitchAndSwitchExpression.java
@@ -0,0 +1,101 @@
+/*
+InnerAssignment
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.coding.innerassignment;
+
+public class InputInnerAssignmentSwitchAndSwitchExpression {
+
+    public void test1(int mode) {
+        int x = 0;
+        switch (mode) {
+            case 2 -> {
+                x = 2;
+            }
+            case 1 -> x = 1;
+        }
+    }
+
+    public void test2(int mode) {
+        int x = 0, y = 0;
+        switch (mode) {
+            case 2, 4, 6 -> {
+                x = 2;
+            }
+            case 1, 3, 5 -> {
+                x = y = 1;  // violation
+            }
+            case 0, 7, 8 -> x = 1;
+        }
+    }
+
+    public void test3(int mode) {
+        int x = 0;
+        x = switch (mode) {
+            case 2 -> {
+                yield x = 2; // violation
+            }
+            case 1 -> x = 1;  // violation
+            default -> x = 0; // violation
+        };
+    }
+
+    public void test4(int mode) {
+        int x = 0;
+        x = switch (mode) {
+            case 2, 4, 6 -> {
+                yield x = 2; // violation
+            }
+            case 1, 3, 5 -> x = 1;  // violation
+            default -> x = 0; // violation
+        };
+    }
+
+    public void test5(String operation) {
+        boolean innerFlag, flag;
+        switch (operation) {
+            case "Y" -> flag = innerFlag = true; // violation
+            case "N" -> {
+                flag = innerFlag = false; // violation
+            }
+        }
+    }
+
+    public void test6(int mode) {
+        int x = 0;
+        switch (mode) {
+            case 2: {
+                x = 2;
+            }
+            case 1:
+                x = 1;
+        }
+    }
+
+    public void test7(int mode) {
+        int x = 0;
+        switch (mode) {
+            case 0:
+            case 1:
+            case 2: {
+                x = 2;
+            }
+            case 4:
+            case 5:
+                x = 1;
+        }
+    }
+
+    public void test8(int mode) {
+        int x = 4;
+        System.out.println(switch (x) {
+            case 1 -> x = 1;   // violation
+            case 2 -> {
+                 yield x = 2;      // violation
+            }
+            default ->  x = 3;     // violation
+        });
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclarationRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclarationRecords.java
index db3800e9298..f76143eaba0 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclarationRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclarationRecords.java
@@ -12,13 +12,13 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.magicnumber;
 
 public class InputMagicNumberIgnoreFieldDeclarationRecords {
     @anno(6) // violation
     public record MyRecord() {
-        private static int myInt = 7; // ok
+        private static int myInt = 7;
 
         public MyRecord{
             int i = myInt + 1; // no violation, 1 is defined as non-magic
@@ -41,9 +41,9 @@ public int hashCode() {
 }
 
 class TestClass {
-    static int X = 42; // ok
+    static int X = 42;
 }
 
 record TestRecord() {
-    static int X = 42; // ok
+    static int X = 42;
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberRecordsDefault.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberRecordsDefault.java
index 41e84ae767d..ad6ae5c08ed 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberRecordsDefault.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberRecordsDefault.java
@@ -12,7 +12,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.magicnumber;
 
 public class InputMagicNumberRecordsDefault {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCaseLabelElements.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCaseLabelElements.java
index 2c8dc8f6a72..abcab8d36e6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCaseLabelElements.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCaseLabelElements.java
@@ -9,18 +9,18 @@
 
 public class InputMissingSwitchDefaultCaseLabelElements {
     static void m(Object o) {
-        switch (o) { // ok
+        switch (o) {
             case null, String s -> System.out.println("String, including null");
             default -> System.out.println("something else");
         }
 
-        switch (o) { // ok
+        switch (o) {
             case null, String s: System.out.println("String, including null"); break;
             default: System.out.println("something else");
         }
 
         switch(o) {
-            case null: default: // ok
+            case null: default:
                 System.out.println("The rest (including null)");
         }
 
@@ -40,50 +40,50 @@ static void m(Object o) {
                 break;
         }
 
-        switch(o) { // ok
+        switch(o) {
             case String str, null ->
                 System.out.println("null");
             default -> System.out.println("default");
         }
 
-        switch(o) { // ok
+        switch(o) {
             case null, default ->
                 System.out.println("The rest (including null)");
         }
 
-        switch(o) { // ok
+        switch(o) {
             case String s && s.length() > 2 ->
                 System.out.println("The string longer than 2 chars");
             default -> System.out.println("default!");
         }
 
-        switch(o) { // ok
+        switch(o) {
             case default, null ->
                 System.out.println("The rest (including null)");
         }
 
-        switch(o) { // ok
+        switch(o) {
             case default, null:
                 System.out.println("The rest (including null)");
         }
 
-        switch(o) { // ok
+        switch(o) {
             case null, default:
                 System.out.println("The rest (including null)");
         }
 
-        switch(o) { // ok
+        switch(o) {
             case null, default:
                 throw new UnsupportedOperationException("not supported!");
         }
     }
 
     void m2(String s) {
-        switch (s) { // ok
+        switch (s) {
             case "a": throw new AssertionError("Wrong branch.");
             case default: break;
         }
-        switch (s) { // ok
+        switch (s) {
             case "a" -> throw new AssertionError("Wrong branch.");
             case default -> {}
         }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckNullCaseLabel.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckNullCaseLabel.java
new file mode 100644
index 00000000000..0e0199f7405
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckNullCaseLabel.java
@@ -0,0 +1,96 @@
+/*
+MissingSwitchDefault
+
+
+*/
+
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.checks.coding.missingswitchdefault;
+
+public class InputMissingSwitchDefaultCheckNullCaseLabel {
+     public void switchWithNullLabelTest(SwitchInput i) {
+        Integer counter=0;
+        switch (i) {
+            case FIRST: counter++;
+            case SECOND: counter--;
+            case null: counter=counter+2;
+        }
+    }
+    enum SwitchInput {
+        FIRST,
+        SECOND
+    }
+
+    public void switchWithPermutatedCaseLabels(SwitchInput i) {
+        Integer counter=0;
+        switch (i) {
+            case SECOND: counter++;
+            case null: counter--;
+            case FIRST: counter=counter+2;
+        }
+
+        switch (i) {
+            case null: counter++;
+            case SECOND: counter--;
+            case FIRST: counter=counter+2;
+        }
+
+    }
+
+    public void multipleCaseWithNullCaseConstants(){
+
+        Integer value = 0;
+        int counter = 0;
+        switch (value) {
+            case 0, 1 -> counter++;
+            case 2 -> counter++;
+            case null -> counter++;
+            default -> counter++;
+        }
+    }
+
+    public void nullCaseConstantsPrecedingDefaultCaseConstants(){
+
+        String fruit = null;
+
+        int counter = 0;
+
+        switch (fruit) {
+            case "apple", "orange" -> counter++;
+            case null -> counter++;
+            default -> counter++;
+        }
+    }
+
+    public void switchExpressionWithPatterns(){
+
+        Object value = 1;
+        int counter = 0;
+        Integer result = switch (value) {
+            case String s -> counter++;
+            case Integer i -> counter++;
+            case null -> counter++;
+            default -> counter++;
+        };
+
+    }
+      public void multipleCaseWithNullDefaultLabel(){
+
+        Integer value = 0;
+        int counter = 0;
+        switch (value) {
+            case 0, 1 -> counter++;
+            case 2 -> counter++;
+            case null, default -> counter++;
+
+        }
+    }
+     public void switchWithNullTest(SwitchInput i) {
+        switch (i) {
+            case FIRST -> System.out.println("FIRST");
+            case SECOND -> System.out.println("SECOND");
+            case null -> System.out.println("NULL");
+        }
+    }
+}
+
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressions.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressions.java
index 7d01f4a5ce2..ed6732485c1 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressions.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressions.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.missingswitchdefault;
 
 public class InputMissingSwitchDefaultCheckSwitchExpressions {
@@ -20,7 +20,7 @@ int howMany1(Nums k) {
     }
 
     int howMany2(Nums k) {
-        return switch (k) { // ok
+        return switch (k) {
             case ONE -> {
                 yield 4;
             }
@@ -34,7 +34,7 @@ int howMany2(Nums k) {
     }
 
     int howMany3(Nums k) {
-        return switch (k) { // ok
+        return switch (k) {
             case ONE:
                 yield 3;
             case TWO:
@@ -45,7 +45,7 @@ int howMany3(Nums k) {
     }
 
     int howMany4(Nums k) {
-        return switch (k) { // ok
+        return switch (k) {
             case ONE -> {
                 yield 4;
             }
@@ -62,7 +62,7 @@ int howMany4(Nums k) {
     }
 
     int howMany5(Nums k) {
-        return switch (k) { // ok
+        return switch (k) {
             case ONE:
                 yield 3;
             case TWO:
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsThree.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsThree.java
index be5cbd0d506..8e8b61e7ea2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsThree.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsThree.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.missingswitchdefault;
 
 import java.util.stream.Stream;
@@ -27,7 +27,7 @@ public enum Day {
     }
 
     public void foo1(Options option) {
-        int num = switch (option) { // ok
+        int num = switch (option) {
             case ONE:
                 yield 1;
             case TWO:
@@ -38,7 +38,7 @@ public void foo1(Options option) {
     }
 
     public void foo2(Options option) {
-        assert Integer.valueOf(1).equals(switch (option) { // ok
+        assert Integer.valueOf(1).equals(switch (option) {
             case ONE -> 1;
             case TWO -> 2;
             case THREE -> 3;
@@ -47,7 +47,7 @@ public void foo2(Options option) {
 
     public void bar1(Options option) {
         int num;
-        num = switch (option) { // ok
+        num = switch (option) {
             case ONE -> 1;
             case TWO -> 2;
             case THREE -> 3;
@@ -55,7 +55,7 @@ public void bar1(Options option) {
     }
 
     public void bar2(Options option) {
-        assert 1 < switch (option) { // ok
+        assert 1 < switch (option) {
             case ONE -> 1;
             case TWO -> 2;
             case THREE -> 3;
@@ -64,7 +64,7 @@ public void bar2(Options option) {
 
     public void bar3(Options option) {
         int num = 0;
-        num += switch (option) { // ok
+        num += switch (option) {
             case ONE -> 1;
             case TWO -> 2;
             case THREE -> 3;
@@ -72,11 +72,11 @@ public void bar3(Options option) {
     }
 
     int usedOnBothSidesOfArithmeticExpression(Day day) {
-        return switch (day) { // ok
+        return switch (day) {
             case MON, TUE -> 0;
             case WED -> 1;
             default -> 2;
-        } * switch (day) { // ok
+        } * switch (day) {
             case WED, THU -> 3;
             case FRI -> 4;
             default -> 5;
@@ -84,7 +84,7 @@ int usedOnBothSidesOfArithmeticExpression(Day day) {
     }
 
     boolean complexDefault(Day k, String string) {
-        switch (k) { // ok
+        switch (k) {
         case MON -> {
             System.out.println(2);
             System.out.println(3);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java
index 8bce94e607d..5ca37d8b9ad 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/missingswitchdefault/InputMissingSwitchDefaultCheckSwitchExpressionsTwo.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.missingswitchdefault;
 
 public class InputMissingSwitchDefaultCheckSwitchExpressionsTwo {
@@ -33,7 +33,7 @@ int howMany2(Nums k) {
 
     int howMany3(Nums k) {
         int x;
-        boolean bool = (switch (k) { // ok
+        boolean bool = (switch (k) {
             case ONE -> {
                 x = 1;
                 yield true;
@@ -52,7 +52,7 @@ int howMany3(Nums k) {
 
     int howMany4(Nums k) {
         int x;
-        boolean bool = (switch (k) { // ok
+        boolean bool = (switch (k) {
             case ONE: {
                 x = 1;
                 yield true;
@@ -70,7 +70,7 @@ int howMany4(Nums k) {
     }
 
     int howMany5(Nums k) {
-        return switch (k) { // ok
+        return switch (k) {
             case ONE -> {
                 yield 4;
             }
@@ -87,7 +87,7 @@ int howMany5(Nums k) {
     }
 
     int howMany6(Nums k) {
-        return switch (k) { // ok
+        return switch (k) {
             case ONE: {
                 yield 4;
             }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsTextBlocks.java
index c58adc8cccc..9d03eba2fe8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsTextBlocks.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.multiplestringliterals;
 
 public class InputMultipleStringLiteralsTextBlocks {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java
index 0367ee0bfed..c1ea2884cc6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java
@@ -8,7 +8,7 @@
 //Compilable by javac, but noncompilable by eclipse
 package com.puppycrawl.tools.checkstyle.checks.coding.nofinalizer;
 
-public class InputNoFinalizerFallThrough { // ok
+public class InputNoFinalizerFallThrough {
 
     void tryResource() throws Exception {
         switch (hashCode()) {
@@ -77,7 +77,7 @@ void tryResource() throws Exception {
         }
     }
 
-    private static class Resource implements AutoCloseable { // ok
+    private static class Resource implements AutoCloseable {
         @Override
         public void close() throws Exception {
         }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLine.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLine.java
index 00edef269f7..b4c4c5cafc6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLine.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLine.java
@@ -70,7 +70,7 @@ private static void good() {
   InputOneStatementPerLine method(foo a) {
     foo obj = () -> {
       method(() ->
-             {method(null);}).method(null); // ok
+             {method(null);}).method(null);
     };
     return this;
   }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderRecords.java
index 6a3146bce93..0a354a20a39 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderRecords.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.overloadmethodsdeclarationorder;
 
 public class InputOverloadMethodsDeclarationOrderRecords {
@@ -60,7 +60,7 @@ public void foo() { // violation
         public MyClass() {
         }
 
-        public void foo(int i, String s) {
+        public void foo(int i, String s) { // violation
         }
 
         public void foo(String s, int i) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectory2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectory2.java
index 3a8343c5dc7..1193ebc8941 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectory2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectory2.java
@@ -5,7 +5,7 @@
 
 */
 
-package com.testing.packagediffdirectory; // ok
+package com.testing.packagediffdirectory;
 
 public class InputPackageDeclarationDiffDirectory2 {
     public String value;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtParent2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtParent2.java
index e1c6dc0bff9..f150c5d861f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtParent2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtParent2.java
@@ -5,7 +5,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.coding; // ok
+package com.puppycrawl.tools.checkstyle.checks.coding;
 
 public class InputPackageDeclarationDiffDirectoryAtParent2 {
     public String value;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtSubpackage2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtSubpackage2.java
index 0a82c8f1aad..6c005968cf8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtSubpackage2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtSubpackage2.java
@@ -7,7 +7,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.packagedeclaration.subpackage;
 
-public class InputPackageDeclarationDiffDirectoryAtSubpackage2 { // ok
+public class InputPackageDeclarationDiffDirectoryAtSubpackage2 {
     public String value;
 
     private void get(){
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentWithEnhancedSwitch.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentWithEnhancedSwitch.java
index 8eb5d77fbd2..3ed0015dbd2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentWithEnhancedSwitch.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentWithEnhancedSwitch.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.parameterassignment;
 
 public class InputParameterAssignmentWithEnhancedSwitch {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordAsTopLevel.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordAsTopLevel.java
index 7019b68fff4..8f82858d693 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordAsTopLevel.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordAsTopLevel.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public record InputRequireThisRecordAsTopLevel(int x, int y) {
@@ -36,7 +36,7 @@ public static void setI(int i) {
 
     void method1() {
         i = 3 + y; // violation 'Reference to instance variable 'y' needs "this.".'
-        int w = this.x; // ok
+        int w = this.x;
     }
 
     void method2(int i) {
@@ -44,7 +44,7 @@ void method2(int i) {
         this.setI(i);
         method1(); // violation 'Method call to 'method1' needs "this.".'
         try {
-            this.method1(); // ok
+            this.method1();
         } catch (RuntimeException e) {
             e.toString();
         }
@@ -54,10 +54,10 @@ void method2(int i) {
     }
 
     <T> void method3() {
-        setI(3); // ok
+        setI(3);
     }
 
     void method4() {
-        this.<String>method3(); // ok
+        this.<String>method3();
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordCompactCtors.java
index 541eeaa28b9..6e84096f783 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordCompactCtors.java
@@ -7,16 +7,16 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 import java.util.Map;
 
-public record InputRequireThisRecordCompactCtors(String name, Map<String, String> items){ // ok
+public record InputRequireThisRecordCompactCtors(String name, Map<String, String> items){
     // 'this' cannot be used in compact constructor
     public InputRequireThisRecordCompactCtors {
-        if (name == null) { // ok
-            name = "<unknown>"; // ok
+        if (name == null) {
+            name = "<unknown>";
         }
-        items = Map.copyOf(items); // ok
+        items = Map.copyOf(items);
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordDefault.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordDefault.java
index d947d29bd1e..821dfc458ba 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordDefault.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordDefault.java
@@ -7,18 +7,18 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public record InputRequireThisRecordDefault(int x, int y) {
     private static int i; // all fields must be static in a record definition
 
     public InputRequireThisRecordDefault {
-        method1(); // ok
-        method2(42); // ok
-        method3(); // ok
-        int z = x + y + 2; // ok
-        System.out.println(y + x); // ok
+        method1();
+        method2(42);
+        method3();
+        int z = x + y + 2;
+        System.out.println(y + x);
     }
 
     InputRequireThisRecordDefault(int x) {
@@ -27,7 +27,7 @@ public record InputRequireThisRecordDefault(int x, int y) {
     }
 
     public int getIPlusX() {
-        return  i + x; // ok
+        return  i + x;
     }
 
     public static void setI(int i) {
@@ -35,16 +35,16 @@ public static void setI(int i) {
     }
 
     void method1() {
-        i = 3 + y; // ok
-        int w = this.x; // ok
+        i = 3 + y;
+        int w = this.x;
     }
 
     void method2(int i) {
         i++;
         this.setI(i);
-        method1(); // ok
+        method1();
         try {
-            this.method1(); // ok
+            this.method1();
         } catch (RuntimeException e) {
             e.toString();
         }
@@ -54,7 +54,7 @@ void method2(int i) {
     }
 
     <T> void method3() {
-        setI(3); // ok
+        setI(3);
     }
 
     void method4() {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsAndCompactCtors.java
index 892306ac789..c224f8d7fc3 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsAndCompactCtors.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public class InputRequireThisRecordsAndCompactCtors {
@@ -29,7 +29,7 @@ void method2(int i) {
             this.i = i;
             method1(); // violation 'Method call to 'method1' needs "this.".'
             try {
-                this.method1(); // ok
+                this.method1();
             }
             catch (RuntimeException e) {
                 e.toString();
@@ -45,7 +45,7 @@ <T> void method3()
         }
 
         void method4() {
-            this.<String>method3(); // ok
+            this.<String>method3();
         }
     }
 
@@ -67,7 +67,7 @@ void method2(int i) {
             this.i = i;
             method1(); // violation 'Method call to 'method1' needs "this.".'
             try {
-                this.method1(); // ok
+                this.method1();
             }
             catch (RuntimeException e) {
                 e.toString();
@@ -83,7 +83,7 @@ <T> void method3()
         }
 
         void method4() {
-            this.<String>method3(); // ok
+            this.<String>method3();
         }
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFields.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFields.java
index d952f1c5ac9..627f5b31976 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFields.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFields.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public record InputRequireThisRecordsWithCheckFields(String a) {
@@ -43,6 +43,6 @@ void method2() {
     }
 
     public String a() {
-        return a; // ok
+        return a;
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFieldsOverlap.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFieldsOverlap.java
index eb649df3d29..862b498635d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFieldsOverlap.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisRecordsWithCheckFieldsOverlap.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public record InputRequireThisRecordsWithCheckFieldsOverlap(String a) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalseLeaves.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalseLeaves.java
index 2bb14b5cffe..82dbf7951f5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalseLeaves.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalseLeaves.java
@@ -6,7 +6,7 @@
 
 
 */
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public class InputRequireThisValidateOnlyOverlappingFalseLeaves {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityCheckTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityCheckTextBlocks.java
index 625172841db..446c2a668fb 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityCheckTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityCheckTextBlocks.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.stringliteralequality;
 
 public class InputStringLiteralEqualityCheckTextBlocks {
@@ -13,7 +13,7 @@ void method() {
 
         boolean flag1 = (status1 == "done"); // violation
 
-        boolean flag2 = (status1.equals("done")); // ok
+        boolean flag2 = (status1.equals("done"));
 
 
         String status2 = """
@@ -29,7 +29,7 @@ void method() {
                 done"""); // violation above
 
         boolean flag4 = (status2.equals("""
-                done""")); // ok
+                done"""));
 
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityConcatenatedTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityConcatenatedTextBlocks.java
index b2ef7b63a94..ec6469fc1c5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityConcatenatedTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/stringliteralequality/InputStringLiteralEqualityConcatenatedTextBlocks.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.stringliteralequality;
 
 public class InputStringLiteralEqualityConcatenatedTextBlocks {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckPatterns.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckPatterns.java
index dfe4e113bb3..d6b59d4616e 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckPatterns.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckPatterns.java
@@ -11,14 +11,14 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.unnecessaryparentheses;
 
 public class InputUnnecessaryParenthesesCheckPatterns {
     void method() {
         Object o = "";
 
-        boolean result = (o instanceof String a) ? // ok
-                (o instanceof String x) : (!(o instanceof String y)); // ok
+        boolean result = (o instanceof String a) ?
+                (o instanceof String x) : (!(o instanceof String y));
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckSwitchExpression.java
index d09f007a27d..693cc08e08d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckSwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckSwitchExpression.java
@@ -11,7 +11,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.unnecessaryparentheses;
 
 public class InputUnnecessaryParenthesesCheckSwitchExpression {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckTextBlocks.java
index 39142b3897e..f9edd910f85 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesCheckTextBlocks.java
@@ -11,7 +11,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.unnecessaryparentheses;
 
 public class InputUnnecessaryParenthesesCheckTextBlocks {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/InputUnnecessarySemicolonAfterOuterTypeDeclarationRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/InputUnnecessarySemicolonAfterOuterTypeDeclarationRecords.java
index 6ccd148b4de..23be7c21135 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/InputUnnecessarySemicolonAfterOuterTypeDeclarationRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/InputUnnecessarySemicolonAfterOuterTypeDeclarationRecords.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.unnecessarysemicolonafteroutertypedeclaration;
 
 public record InputUnnecessarySemicolonAfterOuterTypeDeclarationRecords() {
@@ -19,5 +19,5 @@ public record MyInnerRecord() {
 record OuterRecord() {
     record InnerRecord() {
 
-    }; // ok
+    };
 }; // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonaftertypememberdeclaration/InputUnnecessarySemicolonAfterTypeMemberDeclarationRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonaftertypememberdeclaration/InputUnnecessarySemicolonAfterTypeMemberDeclarationRecords.java
index 09ff9388fe2..6e5e9baa08b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonaftertypememberdeclaration/InputUnnecessarySemicolonAfterTypeMemberDeclarationRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonaftertypememberdeclaration/InputUnnecessarySemicolonAfterTypeMemberDeclarationRecords.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.unnecessarysemicolonaftertypememberdeclaration;
 
 public record InputUnnecessarySemicolonAfterTypeMemberDeclarationRecords() {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableRecords.java
index 68b6a418005..40ca6538d43 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableRecords.java
@@ -8,10 +8,10 @@
 
 import java.util.function.Predicate;
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 public record InputUnusedLocalVariableRecords(int a, int b) {
     public InputUnusedLocalVariableRecords {
-        int ab = 12; // ok
+        int ab = 12;
         ab += a;
         int var1 = 1; // violation
         new nested() {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchExpression.java
new file mode 100644
index 00000000000..a71358707fe
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchExpression.java
@@ -0,0 +1,44 @@
+/*
+UnusedLocalVariable
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableSwitchExpression {
+
+    public int complexSwitch(int input) {
+        int check = 8;
+        int something = 0;
+        int line = 1;
+        int line2 = 9; // violation 'Unused local variable 'line2''
+        return switch (check++) {
+            case 0 -> {
+                int x = 2;
+                line2++;
+                yield switch (x) {
+                    case 1 -> x++;
+                    case 2 -> x--;
+                    default -> 0;
+                };
+            }
+            case 1 -> {
+                int y = input * 2;
+                yield switch (++line) {
+                    case 2, 4 -> y / 2;
+                    case 6 -> y - 1;
+                    default -> -1;
+                };
+            }
+            case 2 -> {
+                int checks = switch (something++) {
+                    case 1 -> input/2;
+                    default -> input;
+                };
+                yield checks;
+            }
+            default -> 0;
+        };
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableWithoutPackageStatement.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableWithoutPackageStatement.java
index 9980e0946da..0d7337e0670 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableWithoutPackageStatement.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableWithoutPackageStatement.java
@@ -20,7 +20,7 @@ void method() {
     }
 
     void anotherMethod() {
-        int var1 = 12; // ok
+        int var1 = 12;
         int var2 = 13; // violation
         Foo obj = new Foo() {
             void method() {
@@ -43,7 +43,7 @@ class SharkFoo {
 
         void method() {
             int var3 = 13; // violation
-            int var1 = 12; // ok
+            int var1 = 12;
             SharkFoo obj = new SharkFoo() {
                 void method() {
                     var3 += var1;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions.java
index 82263eb3f3c..155260273de 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.variabledeclarationusagedistance;
 
 public class InputVariableDeclarationUsageDistanceCheckSwitchExpressions {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java
index 232a5781a0d..10e70df6339 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCheckSwitchExpressions2.java
@@ -8,13 +8,13 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.coding.variabledeclarationusagedistance;
 
 public class InputVariableDeclarationUsageDistanceCheckSwitchExpressions2 {
     void issue11973() {
         int i = -1; // violation 'Distance between.*'i'.*and.*first usage is 2, but allowed 1.'
-        int x = -1; // ok
+        int x = -1;
         switch (i) {
             case 1 -> {
                 x++;
@@ -22,7 +22,7 @@ void issue11973() {
             }
         };
 
-        int a = -1; // ok
+        int a = -1;
         int a123 = switch (a) {
             case 1 -> {
                 yield 2;
@@ -32,7 +32,7 @@ void issue11973() {
             }
         };
 
-        int b = -1; // ok
+        int b = -1;
         int b123 = switch (b) {
             case 1 -> {
                 yield b;
@@ -42,7 +42,7 @@ void issue11973() {
             }
         };
 
-        int day = 1; // ok
+        int day = 1;
         int c = -1;
         int c123 = switch (c) {
             case 1:
@@ -53,7 +53,7 @@ void issue11973() {
                 yield day++;
         };
 
-        int day1 = 1; // ok
+        int day1 = 1;
         int cc = -1;
         int d123 = switch (cc) {
             case 1 -> {
@@ -66,7 +66,7 @@ void issue11973() {
             }
         };
 
-        int day2 = 1; // ok
+        int day2 = 1;
         int ccc = -1;
         int e123 = switch (ccc) {
             case 1 -> {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionRecords.java
index 5ef750cd38c..c899b213fb5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionRecords.java
@@ -6,10 +6,10 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.design.designforextension;
 
-public record InputDesignForExtensionRecords(String string) { // ok
+public record InputDesignForExtensionRecords(String string) {
 
     @Override
     public String toString() {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java
index e866794b3b0..e1b0ced909a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java
@@ -4,10 +4,10 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.design.finalclass;
 
-public record InputFinalClassConstructorInRecord(String string) { // ok
+public record InputFinalClassConstructorInRecord(String string) {
 
     public InputFinalClassConstructorInRecord {
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInRecord.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInRecord.java
index 34110a7f492..0b1d815502b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInRecord.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInRecord.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.design.finalclass;
 
 public record InputFinalClassNestedInRecord(int a) {
@@ -20,7 +20,7 @@ class k {
         c obj = new c() {
         };
 
-        class c { // ok
+        class c {
             private c() {
             }
         }
@@ -40,7 +40,7 @@ record f() {
             final static f.j obj = new f.j() {
             };
 
-            static class j { // ok
+            static class j {
                 private j() {
                 }
             }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedStaticClassInsideInnerClass.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedStaticClassInsideInnerClass.java
index 057674640e2..ca500b0c95c 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedStaticClassInsideInnerClass.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedStaticClassInsideInnerClass.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.design.finalclass;
 
 public class InputFinalClassNestedStaticClassInsideInnerClass {
@@ -21,7 +21,7 @@ private C() {
 
     class Mw {
         static class B {
-            static class C { // ok
+            static class C {
                 private C() {
                 }
             }
@@ -30,7 +30,7 @@ private C() {
 
     class A {
         class B { // violation
-            class C { // ok
+            class C {
                 private C() {}
             }
             class D extends C {
@@ -50,7 +50,7 @@ class D extends Mw.B.C {
     class P extends Q {
     }
 
-    class Q { // ok
+    class Q {
         private Q() {
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastRecords.java
index cc3f11789dc..b86fbb46334 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastRecords.java
@@ -4,14 +4,14 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.design.innertypelast;
 
 public class InputInnerTypeLastRecords {
     record Test() {
-        private static String s; // ok
+        private static String s;
 
-        record InnerTest1() { // ok
+        record InnerTest1() {
         }
 
         public void test() { // violation
@@ -22,7 +22,7 @@ public void test() { // violation
     }
 
     record Test3() {
-        private static String s; // ok
+        private static String s;
 
         class InnerTest1 {
         }
@@ -32,7 +32,7 @@ public void test() { // violation
     }
 
     record Test4() {
-        private static String s; // ok
+        private static String s;
 
         record MyInnerRecord() {
             void foo() {}
@@ -54,10 +54,10 @@ public void test() { // violation
     }
 
     record Test5() {
-        private static String s; // ok
-        static Test3 myRecordTest = new Test3(); //ok
+        private static String s;
+        static Test3 myRecordTest = new Test3();
 
         public void test() {
-        } // ok
+        }
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEmpty.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEmpty.java
index 6fd50b6a6da..b2af825c75d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEmpty.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEmpty.java
@@ -5,4 +5,4 @@
 */
 
 /* Comment only. This file is compilable,
-but causes DetailAstImplTest#testTreeStructure to fail. */ // ok
+but causes DetailAstImplTest#testTreeStructure to fail. */
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassRecords.java
index d724c56aad1..071712b4a2e 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassRecords.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.design.onetoplevelclass;
 
 public record InputOneTopLevelClassRecords() {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/package-info.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/package-info.java
index 9707c73d084..3cebb12bae6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/package-info.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/package-info.java
@@ -5,6 +5,6 @@
 */
 
 /**
- * Package containing input files for design checks. // ok
+ * Package containing input files for design checks.
  */
 package com.puppycrawl.tools.checkstyle.checks.design.onetoplevelclass;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierPackageClassName.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierPackageClassName.java
index 9bda7f4ab68..a2c9a06bd8a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierPackageClassName.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierPackageClassName.java
@@ -17,6 +17,6 @@
 
 import com.PackageClass.*;
 
-public final class InputVisibilityModifierPackageClassName { // ok
+public final class InputVisibilityModifierPackageClassName {
     public final PackageClass o = new PackageClass();
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSamePackageDepth254.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSamePackageDepth254.java
index e7f058f912e..a2b1b8d1015 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSamePackageDepth254.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSamePackageDepth254.java
@@ -26,5 +26,5 @@
 import java.util.regex.Pattern; //#7
 import java.util.regex.Matcher; //#8
 
-public class InputCustomImportOrderSamePackageDepth254 { // ok
+public class InputCustomImportOrderSamePackageDepth254 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyAndSpecial2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyAndSpecial2.java
index ce44828f51e..f5a90452929 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyAndSpecial2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyAndSpecial2.java
@@ -28,7 +28,7 @@
 import java.awt.Dialog; // violation 'Extra separation in import group before .*'
 import java.io.File;
 
-import com.puppycrawl.tools.*; // THIRD_PARTY_PACKAGE
+import com.google.thirdparty.*; // THIRD_PARTY_PACKAGE
 
 
 import com.google.common.*; // violation 'Extra separation in import group before .*'
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyPackage.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyPackage.java
index 71a550520b9..f7a3e160b1f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyPackage.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderThirdPartyPackage.java
@@ -23,7 +23,7 @@
 import static sun.tools.util.ModifierFilter.ALL_ACCESS;
 import static sun.tools.util.ModifierFilter.ALL_ACCESS;
 
-public class InputCustomImportOrderThirdPartyPackage // ok
+public class InputCustomImportOrderThirdPartyPackage
 {
 
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault.java
index 453033581d0..a9c11deefeb 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault.java
@@ -10,12 +10,12 @@
 //non-compiled with javac: contains sun package so IDEA marks it as build problem
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import java.io.*; // ok
-import sun.misc.*; // ok
-import javax.swing.BorderFactory; // ok
-import static java.io.File.listRoots; // ok
+import java.io.*;
+import sun.misc.*;
+import javax.swing.BorderFactory;
+import static java.io.File.listRoots;
 import sun.reflect.*; // violation
 
-import java.awt.Component; // ok
+import java.awt.Component;
 
 class InputIllegalImportDefault {}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder1.java
index 088e71e2f10..ef29be56732 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder1.java
@@ -16,23 +16,23 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import java.awt.Button; // ok
-import java.awt.Frame; // ok
+import java.awt.Button;
+import java.awt.Frame;
 import java.awt.Dialog; // violation 'Wrong order for 'java.awt.Dialog' import.'
-import java.awt.event.ActionEvent; // ok
-import static java.awt.Button.ABORT // ok
+import java.awt.event.ActionEvent;
+import static java.awt.Button.ABORT
 ;
 import javax.swing.JComponent; // violation 'Wrong order for 'javax.swing.JComponent' import.'
-import javax.swing.JTable; // ok
+import javax.swing.JTable;
 import java.io.File; // violation 'Wrong order for 'java.io.File' import.'
-import static java.io.File.createTempFile; // ok
+import static java.io.File.createTempFile;
 import java.io.IOException; // violation 'Wrong order for 'java.io.IOException' import.'
-import java.io.InputStream; // ok
-import java.io.Reader; // ok
-import static javax.swing.WindowConstants.*; // ok
+import java.io.InputStream;
+import java.io.Reader;
+import static javax.swing.WindowConstants.*;
 
 import static sun.tools.util.ModifierFilter.ALL_ACCESS; // violation 'Extra separation in import group before .*'
-import static sun.tools.util.ModifierFilter.PACKAGE; // ok
+import static sun.tools.util.ModifierFilter.PACKAGE;
 
 public class InputImportOrder1 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder2.java
index 65107f1dff3..f5f1d5f8fb1 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder2.java
@@ -16,23 +16,23 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import java.awt.Button; // ok
-import java.awt.Frame; // ok
+import java.awt.Button;
+import java.awt.Frame;
 import java.awt.Dialog; // violation 'Wrong order for 'java.awt.Dialog' import.'
-import java.awt.event.ActionEvent; // ok
-import static java.awt.Button.ABORT // ok
+import java.awt.event.ActionEvent;
+import static java.awt.Button.ABORT
 ;
-import javax.swing.JComponent; // ok
-import javax.swing.JTable; // ok
-import java.io.File; // ok
-import static java.io.File.createTempFile; // ok
+import javax.swing.JComponent;
+import javax.swing.JTable;
+import java.io.File;
+import static java.io.File.createTempFile;
 import java.io.IOException; // violation 'Wrong order for 'java.io.IOException' import.'
-import java.io.InputStream; // ok
-import java.io.Reader; // ok
+import java.io.InputStream;
+import java.io.Reader;
 import static javax.swing.WindowConstants.*; // violation 'Wrong order for 'javax.swing.WindowConstants.*' import.'
 
 import static sun.tools.util.ModifierFilter.ALL_ACCESS; // violation 'Extra separation in import group before .*'
-import static sun.tools.util.ModifierFilter.PACKAGE; // ok
+import static sun.tools.util.ModifierFilter.PACKAGE;
 
 public class InputImportOrder2 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder3.java
index 484b4da4b32..0e992fb52e2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder3.java
@@ -16,23 +16,23 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import java.awt.Button; // ok
-import java.awt.Frame; // ok
-import java.awt.Dialog; // ok
-import java.awt.event.ActionEvent; // ok
-import static java.awt.Button.ABORT // ok
+import java.awt.Button;
+import java.awt.Frame;
+import java.awt.Dialog;
+import java.awt.event.ActionEvent;
+import static java.awt.Button.ABORT
 ;
-import javax.swing.JComponent; // ok
-import javax.swing.JTable; // ok
+import javax.swing.JComponent;
+import javax.swing.JTable;
 import java.io.File; // violation 'Wrong order for 'java.io.File' import.'
-import static java.io.File.createTempFile; // ok
-import java.io.IOException; // ok
-import java.io.InputStream; // ok
-import java.io.Reader; // ok
-import static javax.swing.WindowConstants.*; // ok
+import static java.io.File.createTempFile;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import static javax.swing.WindowConstants.*;
 
 import static sun.tools.util.ModifierFilter.ALL_ACCESS; // violation 'Extra separation in import group before .*'
-import static sun.tools.util.ModifierFilter.PACKAGE; // ok
+import static sun.tools.util.ModifierFilter.PACKAGE;
 
 public class InputImportOrder3 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder4.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder4.java
index ee83106205c..b251e7c4ede 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder4.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder4.java
@@ -16,23 +16,23 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import java.awt.Button; // ok
-import java.awt.Frame; // ok
-import java.awt.Dialog; // ok
-import java.awt.event.ActionEvent; // ok
-import static java.awt.Button.ABORT // ok
+import java.awt.Button;
+import java.awt.Frame;
+import java.awt.Dialog;
+import java.awt.event.ActionEvent;
+import static java.awt.Button.ABORT
 ;
 import javax.swing.JComponent; // violation ''javax.swing.JComponent' should be separated from previous imports.'
-import javax.swing.JTable; // ok
+import javax.swing.JTable;
 import java.io.File; // violation ''java.io.File' should be separated from previous imports.'
-import static java.io.File.createTempFile; // ok
-import java.io.IOException; // ok
-import java.io.InputStream; // ok
-import java.io.Reader; // ok
+import static java.io.File.createTempFile;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
 import static javax.swing.WindowConstants.*; // violation 'Wrong order for 'javax.swing.WindowConstants.*' import.'
 
-import static sun.tools.util.ModifierFilter.ALL_ACCESS; // ok
-import static sun.tools.util.ModifierFilter.PACKAGE; // ok
+import static sun.tools.util.ModifierFilter.ALL_ACCESS;
+import static sun.tools.util.ModifierFilter.PACKAGE;
 
 public class InputImportOrder4 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder5.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder5.java
index 3901dd08757..fabc7375128 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder5.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder5.java
@@ -1,5 +1,5 @@
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-public class InputImportOrder5 { // ok
+public class InputImportOrder5 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder6.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder6.java
new file mode 100644
index 00000000000..2b3ab1e15a5
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder6.java
@@ -0,0 +1,28 @@
+/*
+ImportOrder
+option = (default)under
+groups = /awt/, /jar/, /jar.*.JarInputStream/, /jar.*.JarInput/
+ordered = (default)true
+separated = true
+separatedStaticGroups = (default)false
+caseSensitive = (default)true
+staticGroups = (default)
+sortStaticImportsAlphabetically = (default)false
+useContainerOrderingForStatic = (default)false
+
+
+*/
+
+//non-compiled with javac: contains specially crafted set of imports for testing
+package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
+
+import java.awt.Button;
+
+import java.util.jar.Some;
+
+import java.util.jar.JarInputStream;
+
+import java.util.jar.JarInputMy;
+
+public class InputImportOrder6 {
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderContainerOrdering.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderContainerOrdering.java
index 1b9c47668ec..683efad1bab 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderContainerOrdering.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderContainerOrdering.java
@@ -16,9 +16,9 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static io.netty.handler.codec.http.HttpConstants.COLON; // ok
-import static io.netty.handler.codec.http.HttpHeaders.addHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.setHeader; // ok
+import static io.netty.handler.codec.http.HttpConstants.COLON;
+import static io.netty.handler.codec.http.HttpHeaders.addHeader;
+import static io.netty.handler.codec.http.HttpHeaders.setHeader;
 import static io.netty.handler.Codec.HTTP.HttpHeaders.tmp.same; // violation 'Wrong order for .* import.'
 import static io.netty.handler.Codec.HTTP.HttpHeaders.TKN.same; // violation 'Wrong order for .* import.'
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic1.java
index d5464587f6f..f0e4c085876 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic1.java
@@ -16,11 +16,11 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static io.netty.handler.codec.http.HttpConstants.COLON; // ok
-import static io.netty.handler.codec.http.HttpHeaders.addHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.setHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.Names.addDate; // ok
-import static io.netty.handler.codec.http.HttpHeaders.Names.DATE; // ok
+import static io.netty.handler.codec.http.HttpConstants.COLON;
+import static io.netty.handler.codec.http.HttpHeaders.addHeader;
+import static io.netty.handler.codec.http.HttpHeaders.setHeader;
+import static io.netty.handler.codec.http.HttpHeaders.Names.addDate;
+import static io.netty.handler.codec.http.HttpHeaders.Names.DATE;
 
 public class InputImportOrderEclipseStatic1 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic2.java
index e73ed7eee52..9b878adfd9f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic2.java
@@ -16,11 +16,11 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static io.netty.handler.codec.http.HttpConstants.COLON; // ok
-import static io.netty.handler.codec.http.HttpHeaders.addHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.setHeader; // ok
+import static io.netty.handler.codec.http.HttpConstants.COLON;
+import static io.netty.handler.codec.http.HttpHeaders.addHeader;
+import static io.netty.handler.codec.http.HttpHeaders.setHeader;
 import static io.netty.handler.codec.http.HttpHeaders.Names.addDate; // violation 'Wrong order for .* import.'
-import static io.netty.handler.codec.http.HttpHeaders.Names.DATE; // ok
+import static io.netty.handler.codec.http.HttpHeaders.Names.DATE;
 
 public class InputImportOrderEclipseStatic2 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic3.java
index f0158076d9d..41d7a237867 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStatic3.java
@@ -16,10 +16,10 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static io.netty.handler.codec.http.HttpConstants.COLON; // ok
-import static io.netty.handler.codec.http.HttpHeaders.addHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.setHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.Names.addDate; // ok
+import static io.netty.handler.codec.http.HttpConstants.COLON;
+import static io.netty.handler.codec.http.HttpHeaders.addHeader;
+import static io.netty.handler.codec.http.HttpHeaders.setHeader;
+import static io.netty.handler.codec.http.HttpHeaders.Names.addDate;
 import static io.netty.handler.codec.http.HttpHeaders.Names.DATE; // violation 'Wrong order for .* import.'
 
 public class InputImportOrderEclipseStatic3 {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticCaseSensitive.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticCaseSensitive.java
index 679ade8cd17..8fa55704c17 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticCaseSensitive.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticCaseSensitive.java
@@ -16,11 +16,11 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static io.netty.handler.codec.http.HttpConstants.COLON; // ok
-import static io.netty.handler.codec.http.HttpHeaders.addHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.setHeader; // ok
-import static io.netty.handler.codec.http.HttpHeaders.Names.addDate; // ok
-import static io.netty.handler.codec.http.HttpHeaders.NAMES.DATE; // ok
+import static io.netty.handler.codec.http.HttpConstants.COLON;
+import static io.netty.handler.codec.http.HttpHeaders.addHeader;
+import static io.netty.handler.codec.http.HttpHeaders.setHeader;
+import static io.netty.handler.codec.http.HttpHeaders.Names.addDate;
+import static io.netty.handler.codec.http.HttpHeaders.NAMES.DATE;
 
 public class InputImportOrderEclipseStaticCaseSensitive {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticRepetition.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticRepetition.java
index 8f39f78d9b5..3a675c03230 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticRepetition.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderEclipseStaticRepetition.java
@@ -16,9 +16,9 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static io.netty.handler.codec.http.HttpHeaders.Names.DATE; // ok
-import static io.netty.handler.codec.http.HttpHeaders.Names.DATE; // ok
-import static io.netty.handler.codec.http.HttpHeaders.Names.addDate; // ok
+import static io.netty.handler.codec.http.HttpHeaders.Names.DATE;
+import static io.netty.handler.codec.http.HttpHeaders.Names.DATE;
+import static io.netty.handler.codec.http.HttpHeaders.Names.addDate;
 
 public class InputImportOrderEclipseStaticRepetition {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderGetGroupNumber.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderGetGroupNumber.java
index 8548638b77c..9c280c40260 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderGetGroupNumber.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderGetGroupNumber.java
@@ -17,10 +17,10 @@
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import javax.io.File; // ok
-import sun.tools.util.ModifierFilter.ALL_ACCESS; // ok
-import java.test.javax; // ok
-import org.junit.Test; // ok
+import javax.io.File;
+import sun.tools.util.ModifierFilter.ALL_ACCESS;
+import java.test.javax;
+import org.junit.Test;
 
 public class InputImportOrderGetGroupNumber {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderMultiline.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderMultiline.java
index b75897cf068..1af31f46623 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderMultiline.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderMultiline.java
@@ -16,29 +16,29 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 import
-    java.awt.Button; // ok
+    java.awt.Button;
 import java.awt.Dialog
-    ; // ok
+    ;
 import
-java.awt.Frame; // ok
+java.awt.Frame;
 import java
     .awt.event.
     ActionEvent
-    ; // ok
+    ;
 import
 java.io.File
-; // ok
+;
 import java.
     io.
-    IOException; // ok
-import java.io.InputStream; // ok
+    IOException;
+import java.io.InputStream;
 import
-  static java.awt.Button.ABORT; // ok
+  static java.awt.Button.ABORT;
 import static
- java.io.File.createTempFile; // ok
+ java.io.File.createTempFile;
 import static javax.swing
     .WindowConstants.*
-    ; // ok
+    ;
 
 public class InputImportOrderMultiline {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNonStaticWrongSequence.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNonStaticWrongSequence.java
index 59c185c6c09..68f8513be7e 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNonStaticWrongSequence.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNonStaticWrongSequence.java
@@ -15,7 +15,7 @@
 */
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import java.util.LinkedList; // ok
+import java.util.LinkedList;
 import java.util.HashMap; // violation 'Wrong order for 'java.util.HashMap' import.'
 
 class InputImportOrderNonStaticWrongSequence {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java
index c8d47849202..8ad56141e8b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSimilarGroupPattern.java
@@ -17,8 +17,8 @@
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.util.java.io.File; // ok
-import java.io.File; // ok
+import java.util.java.io.File;
+import java.io.File;
 
 public class InputImportOrderSimilarGroupPattern {
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsAbove.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsAbove.java
index b3e817f66fd..4d7a9a41536 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsAbove.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsAbove.java
@@ -16,19 +16,19 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static com.google.common.truth.Truth.assertThat; // ok
-import static java.lang.String.format; // ok
-import static javax.lang.model.SourceVersion; // ok
-import static org.infinispan.test.TestingUtil.extractComponent; // ok
-import static org.junit.Assert.fail; // ok
-import com.google.common.collect.Lists; // ok
-import com.google.common.primitives.Doubles; // ok
-import java.util.Arrays; // ok
-import java.util.Objects; // ok
-import java.util.concurrent.TimeUnit; // ok
-import javax.lang.model.type.ArrayType; // ok
-import org.infinispan.Cache; // ok
-import org.infinispan.commons.api.BasicCacheContainer; // ok
+import static com.google.common.truth.Truth.assertThat;
+import static java.lang.String.format;
+import static javax.lang.model.SourceVersion;
+import static org.infinispan.test.TestingUtil.extractComponent;
+import static org.junit.Assert.fail;
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Doubles;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import javax.lang.model.type.ArrayType;
+import org.infinispan.Cache;
+import org.infinispan.commons.api.BasicCacheContainer;
 
 
 public class InputImportOrderStaticGroupsAbove {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottom.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottom.java
index 8c81621fcba..26db4484d5f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottom.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottom.java
@@ -16,22 +16,22 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import org.infinispan.Cache; // ok
-import org.infinispan.commons.api.BasicCacheContainer; // ok
+import org.infinispan.Cache;
+import org.infinispan.commons.api.BasicCacheContainer;
 
-import java.util.Arrays; // ok
-import java.util.Objects; // ok
-import java.util.concurrent.TimeUnit; // ok
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
-import com.google.common.collect.Lists; // ok
-import com.google.common.primitives.Doubles; // ok
-import javax.lang.model.type.ArrayType; // ok
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Doubles;
+import javax.lang.model.type.ArrayType;
 
-import static java.lang.String.format; // ok
-import static org.infinispan.test.TestingUtil.extractComponent; // ok
-import static org.junit.Assert.fail; // ok
-import static com.google.common.truth.Truth.assertThat; // ok
-import static javax.lang.model.SourceVersion; // ok
+import static java.lang.String.format;
+import static org.infinispan.test.TestingUtil.extractComponent;
+import static org.junit.Assert.fail;
+import static com.google.common.truth.Truth.assertThat;
+import static javax.lang.model.SourceVersion;
 
 public class InputImportOrderStaticGroupsBottom {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottomSeparated.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottomSeparated.java
index db23e88460d..57ba2132fe5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottomSeparated.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsBottomSeparated.java
@@ -16,18 +16,18 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import com.spotify.x.R; // ok
+import com.spotify.x.R;
 
-import javax.inject.Inject; // ok
+import javax.inject.Inject;
 
-import static android.support.test.espresso.action.ViewActions.click; // ok
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; // ok
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription; // ok
-import static android.support.test.espresso.matcher.ViewMatchers.withText; // ok
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
-import static com.spotify.X.o; // ok
+import static com.spotify.X.o;
 
-import static org.hamcrest.core.AllOf.allOf; // ok
+import static org.hamcrest.core.AllOf.allOf;
 
 public class InputImportOrderStaticGroupsBottomSeparated {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsInflow.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsInflow.java
index dc513aa2761..51fa04687bc 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsInflow.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsInflow.java
@@ -16,19 +16,19 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import com.google.common.collect.Lists; // ok
-import com.google.common.primitives.Doubles; // ok
-import static com.google.common.truth.Truth.assertThat; // ok
-import static java.lang.String.format; // ok
-import java.util.Arrays; // ok
-import java.util.Objects; // ok
-import java.util.concurrent.TimeUnit; // ok
-import static javax.lang.model.SourceVersion; // ok
-import javax.lang.model.type.ArrayType; // ok
-import org.infinispan.Cache; // ok
-import org.infinispan.commons.api.BasicCacheContainer; // ok
-import static org.infinispan.test.TestingUtil.extractComponent; // ok
-import static org.junit.Assert.fail; // ok
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Doubles;
+import static com.google.common.truth.Truth.assertThat;
+import static java.lang.String.format;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import static javax.lang.model.SourceVersion;
+import javax.lang.model.type.ArrayType;
+import org.infinispan.Cache;
+import org.infinispan.commons.api.BasicCacheContainer;
+import static org.infinispan.test.TestingUtil.extractComponent;
+import static org.junit.Assert.fail;
 
 
 public class InputImportOrderStaticGroupsInflow {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsNegative.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsNegative.java
index c1c53f1b139..6c607425d12 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsNegative.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsNegative.java
@@ -16,10 +16,10 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import com.google.common.collect.Lists; // ok
+import com.google.common.collect.Lists;
 
 import static org.junit.Assert.fail; // violation 'Wrong order for 'org.junit.Assert.fail' import.'
-import static java.lang.String.format; // ok
+import static java.lang.String.format;
 import static org.infinispan.test.TestingUtil.extract; // violation 'Wrong order for 'org.infinispan.test.TestingUtil.extract' import.'
 
 public class InputImportOrderStaticGroupsNegative {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTop.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTop.java
index 7b69c4c4883..f463865fc75 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTop.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTop.java
@@ -16,23 +16,23 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static org.infinispan.test.TestingUtil.extractComponent; // ok
-import static org.junit.Assert.fail; // ok
-import static com.google.common.truth.Truth.assertThat; // ok
-import static java.lang.String.format; // ok
-import static javax.lang.model.SourceVersion; // ok
+import static org.infinispan.test.TestingUtil.extractComponent;
+import static org.junit.Assert.fail;
+import static com.google.common.truth.Truth.assertThat;
+import static java.lang.String.format;
+import static javax.lang.model.SourceVersion;
 
-import org.infinispan.Cache; // ok
-import org.infinispan.commons.api.BasicCacheContainer; // ok
+import org.infinispan.Cache;
+import org.infinispan.commons.api.BasicCacheContainer;
 
-import com.google.common.collect.Lists; // ok
-import com.google.common.primitives.Doubles; // ok
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Doubles;
 
-import java.util.Arrays; // ok
-import java.util.Objects; // ok
-import java.util.concurrent.TimeUnit; // ok
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
-import javax.lang.model.type.ArrayType; // ok
+import javax.lang.model.type.ArrayType;
 
 public class InputImportOrderStaticGroupsTop {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTopSeparated.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTopSeparated.java
index 63285088d91..435cb12c69b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTopSeparated.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsTopSeparated.java
@@ -16,29 +16,29 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static android.app.slice.Slice.HINT_ACTIONS; // ok
-import static android.app.slice.Slice.HINT_ERROR; // ok
-import static android.app.slice.Slice.HINT_SUMMARY; // ok
-import static android.app.slice.Slice.HINT_TITLE; // ok
-import static android.app.slice.SliceItem.FORMAT_TEXT; // ok
+import static android.app.slice.Slice.HINT_ACTIONS;
+import static android.app.slice.Slice.HINT_ERROR;
+import static android.app.slice.Slice.HINT_SUMMARY;
+import static android.app.slice.Slice.HINT_TITLE;
+import static android.app.slice.SliceItem.FORMAT_TEXT;
 
-import static androidx.annotation.RestrictTo.Scope.LIBRARY; // ok
-import static androidx.slice.builders.ListBuilder.ICON_IMAGE; // ok
-import static androidx.slice.builders.ListBuilder.INFINITY; // ok
-import static androidx.slice.builders.ListBuilder.LARGE_IMAGE; // ok
-import static androidx.slice.core.SliceHints.SUBTYPE_MIN; // ok
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
+import static androidx.slice.builders.ListBuilder.INFINITY;
+import static androidx.slice.builders.ListBuilder.LARGE_IMAGE;
+import static androidx.slice.core.SliceHints.SUBTYPE_MIN;
 
-import android.app.PendingIntent; // ok
-import android.net.Uri; // ok
-import androidx.annotation.ColorInt; // ok
-import androidx.annotation.NonNull; // ok
-import androidx.core.graphics.drawable.IconCompat; // ok
-import androidx.slice.Clock; // ok
-import androidx.slice.Slice; // ok
-import androidx.slice.builders.SliceAction; // ok
-import java.time.Duration; // ok
-import java.util.ArrayList; // ok
-import java.util.List; // ok
+import android.app.PendingIntent;
+import android.net.Uri;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Clock;
+import androidx.slice.Slice;
+import androidx.slice.builders.SliceAction;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
 
 public class InputImportOrderStaticGroupsTopSeparated {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsUnordered.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsUnordered.java
index b4cdb1d573a..b777f8097c5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsUnordered.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupsUnordered.java
@@ -16,19 +16,19 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static org.infinispan.test.TestingUtil.extractComponent; // ok
-import static java.lang.String.format; // ok
-import static org.junit.Assert.fail; // ok
-import static com.google.common.truth.Truth.assertThat; // ok
-import static javax.lang.model.SourceVersion; // ok
-import org.infinispan.Cache; // ok
-import org.infinispan.commons.api.BasicCacheContainer; // ok
-import com.google.common.collect.Lists; // ok
-import com.google.common.primitives.Doubles; // ok
-import java.util.Arrays; // ok
-import java.util.Objects; // ok
-import java.util.concurrent.TimeUnit; // ok
-import javax.lang.model.type.ArrayType; // ok
+import static org.infinispan.test.TestingUtil.extractComponent;
+import static java.lang.String.format;
+import static org.junit.Assert.fail;
+import static com.google.common.truth.Truth.assertThat;
+import static javax.lang.model.SourceVersion;
+import org.infinispan.Cache;
+import org.infinispan.commons.api.BasicCacheContainer;
+import com.google.common.collect.Lists;
+import com.google.common.primitives.Doubles;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import javax.lang.model.type.ArrayType;
 
 public class InputImportOrderStaticGroupsUnordered {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultNegative.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultNegative.java
index 69b8b18c9d5..4af45546ebd 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultNegative.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultNegative.java
@@ -16,24 +16,24 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static com.some.Class.MESSAGE_ORDERING; // ok
-import static java.awt.Button.ABORT; // ok
-import static java.io.File.createTempFile; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static org.junit.Assert.assertEquals; // ok
-
-import java.awt.Button; // ok
-import java.awt.Dialog; // ok
-import java.io.InputStream; // ok
+import static com.some.Class.MESSAGE_ORDERING;
+import static java.awt.Button.ABORT;
+import static java.io.File.createTempFile;
+import static javax.swing.WindowConstants.*;
+import static org.junit.Assert.assertEquals;
+
+import java.awt.Button;
+import java.awt.Dialog;
+import java.io.InputStream;
 import javax.swing.JComponent; // violation ''javax.swing.JComponent' should be separated from previous imports.'
-import javax.swing.JTable; // ok
+import javax.swing.JTable;
 
-import sun.tools.java.ArrayType; // ok
+import sun.tools.java.ArrayType;
 
 import org.junit.Test; // violation 'Wrong order for 'org.junit.Test' import.'
-import org.mockito.Mock; // ok
+import org.mockito.Mock;
 
-import com.some.api.DetailClass; // ok
+import com.some.api.DetailClass;
 
 public class InputImportOrder_EclipseDefaultNegative {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultPositive.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultPositive.java
index c747b0e5dfd..d63484d9c34 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultPositive.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_EclipseDefaultPositive.java
@@ -16,25 +16,25 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import static com.some.Class.MESSAGE_ORDERING; // ok
-import static java.awt.Button.ABORT; // ok
-import static java.io.File.createTempFile; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static org.junit.Assert.assertEquals; // ok
+import static com.some.Class.MESSAGE_ORDERING;
+import static java.awt.Button.ABORT;
+import static java.io.File.createTempFile;
+import static javax.swing.WindowConstants.*;
+import static org.junit.Assert.assertEquals;
 
-import java.awt.Button; // ok
-import java.awt.Dialog; // ok
-import java.io.InputStream; // ok
+import java.awt.Button;
+import java.awt.Dialog;
+import java.io.InputStream;
 
-import javax.swing.JComponent; // ok
-import javax.swing.JTable; // ok
+import javax.swing.JComponent;
+import javax.swing.JTable;
 
-import org.junit.Test; // ok
-import org.mockito.Mock; // ok
+import org.junit.Test;
+import org.mockito.Mock;
 
-import com.some.api.DetailClass; // ok
+import com.some.api.DetailClass;
 
-import sun.tools.java.ArrayType; // ok
+import sun.tools.java.ArrayType;
 
 public class InputImportOrder_EclipseDefaultPositive {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches1.java
index 9f44155b0ef..dffa3aaae09 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches1.java
@@ -16,10 +16,10 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import java.io.File; // ok
+import java.io.File;
 
 import org.*; // violation 'Extra separation in import group before 'org.*''
-import org.myOrgorgan.Test; // ok
+import org.myOrgorgan.Test;
 
 public class InputImportOrder_MultiplePatternMatches1 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches2.java
index 4825c33a22f..5b3fdd71097 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_MultiplePatternMatches2.java
@@ -16,10 +16,10 @@
 
 //non-compiled with javac: contains specially crafted set of imports for testing
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
-import java.io.File; // ok
+import java.io.File;
 
 import org.*; // violation 'Extra separation in import group before 'org.*''
-import org.myOrgorgan.Test; // ok
+import org.myOrgorgan.Test;
 
 public class InputImportOrder_MultiplePatternMatches2 {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsAnnotations.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsAnnotations.java
index 1c71cdda44f..320d3accf7a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsAnnotations.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsAnnotations.java
@@ -11,5 +11,3 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 @MyAnnotation
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
-
-import com.puppycrawl.tools.checkstyle.MyAnnotation; // ok
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsRecordsAndCompactCtors.java
index 57407292b1b..dde35ea5dc5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsRecordsAndCompactCtors.java
@@ -5,21 +5,21 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
-import java.util.ArrayDeque; // ok
-import java.util.Arrays; // ok
-import java.util.Date;  // ok
-import java.util.HashMap;// ok
-import java.util.Iterator; // ok
-import java.util.LinkedHashSet; // ok
-import java.util.LinkedList; // ok
-import java.util.List;  // ok
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
 import javax.swing.JToolBar; // violation
 import javax.swing.JToggleButton; // violation
 
-import org.w3c.dom.Node; // ok
+import org.w3c.dom.Node;
 
 public class InputUnusedImportsRecordsAndCompactCtors {
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationRecordsAndCompactCtors.java
index ebb18d8e981..7d1503cfe68 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationRecordsAndCompactCtors.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
 
 public class InputCommentsIndentationRecordsAndCompactCtors {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpression.java
index 184d9fd6b28..458a3e4790c 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpression.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 /* Config:                                                                          //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionCorrect.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionCorrect.java
index f4f817dd209..caf8f3e67ce 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionCorrect.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionCorrect.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 /* Config:                                                                          //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionDeclaration.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionDeclaration.java
index 79af7826366..58a7c48a0fe 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionDeclaration.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionDeclaration.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 /* Config:                                                                          //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionDeclarationLCurlyNewLine.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionDeclarationLCurlyNewLine.java
new file mode 100644
index 00000000000..b48c21c1631
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionDeclarationLCurlyNewLine.java
@@ -0,0 +1,64 @@
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
+
+/* Config:                                                                          //indent:0 exp:0
+ *                                                                                  //indent:1 exp:1
+ * basicOffset = 4                                                                  //indent:1 exp:1
+ * braceAdjustment = 0                                                              //indent:1 exp:1
+ * caseIndent = 4                                                                   //indent:1 exp:1
+ * throwsIndent = 4                                                                 //indent:1 exp:1
+ * arrayInitIndent = 4                                                              //indent:1 exp:1
+ * lineWrappingIndentation = 4                                                      //indent:1 exp:1
+ * forceStrictCondition = false                                                     //indent:1 exp:1
+ */                                                                                 //indent:1 exp:1
+public class InputIndentationCheckSwitchExpressionDeclarationLCurlyNewLine {     //indent:0 exp:0
+
+    public void validDeclare() {                                 //indent:4 exp:4
+        String requestId = switch ("in")                                          //indent:8 exp:8
+        {                                                                         //indent:8 exp:8
+            case "correct" -> "true";                                             //indent:12 exp:12
+            default -> "also correct";                                            //indent:12 exp:12
+        };                                                                          //indent:8 exp:8
+    }                                                                               //indent:4 exp:4
+
+    public void validAssign(String result) {                      //indent:4 exp:4
+        result = switch ("in")                                                    //indent:8 exp:8
+        {                                                                         //indent:8 exp:8
+            case "correct" -> "true";                                             //indent:12 exp:12
+            default -> "also correct";                                            //indent:12 exp:12
+        };                                                                          //indent:8 exp:8
+    }                                                                               //indent:4 exp:4
+
+    public void invalidAssignLeftCurlyWithLesserIndent(String result) {      //indent:4 exp:4
+        result = switch ("in")                                               //indent:8 exp:8
+    {                                                                        //indent:4 exp:8 warn
+            case "correct" -> "true";                                        //indent:12 exp:12
+            case "incorrect" -> "true";                                      //indent:12 exp:12
+            default -> "also incorrect";                                     //indent:12 exp:12
+        };                                                                   //indent:8 exp:8
+    }                                                                        //indent:4 exp:4
+    public void invalidDeclareLeftCurlyWithLesserIndent() {                   //indent:4 exp:4
+        String result = switch ("in")                                         //indent:8 exp:8
+    {                                                                         //indent:4 exp:8 warn
+            case "correct" -> "true";                                         //indent:12 exp:12
+            case "incorrect" -> "true";                                       //indent:12 exp:12
+            default -> "also incorrect";                                      //indent:12 exp:12
+        };                                                                    //indent:8 exp:8
+    }                                                                         //indent:4 exp:4
+    public void invalidAssignLeftCurlyWithBiggerIndent(String result) {      //indent:4 exp:4
+        result = switch ("in")                                               //indent:8 exp:8
+            {                                                                //indent:12 exp:8 warn
+            case "correct" -> "true";                                        //indent:12 exp:12
+            case "incorrect" -> "true";                                      //indent:12 exp:12
+            default -> "also incorrect";                                     //indent:12 exp:12
+        };                                                                   //indent:8 exp:8
+    }                                                                        //indent:4 exp:4
+    public void invalidDeclareLeftCurlyWithBiggerIndent() {                  //indent:4 exp:4
+        String result = switch ("in")                                        //indent:8 exp:8
+            {                                                                //indent:12 exp:8 warn
+            case "correct" -> "true";                                        //indent:12 exp:12
+            case "incorrect" -> "true";                                      //indent:12 exp:12
+            default -> "also incorrect";                                     //indent:12 exp:12
+        };                                                                   //indent:8 exp:8
+    }                                                                        //indent:4 exp:4
+}                                                                            //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionNewLine.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionNewLine.java
index 7f5c61eb4c7..8b1ab7b1a8c 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionNewLine.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationCheckSwitchExpressionNewLine.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java15                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 /* Config:                                                                          //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLineWrappedRecordDeclaration.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLineWrappedRecordDeclaration.java
index 8b46922438a..87960875fc1 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLineWrappedRecordDeclaration.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationLineWrappedRecordDeclaration.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 import java.io.IOException;                                                         //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecords.java
index 7f2bfbbb2ce..ce0b4040f08 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecords.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 import java.util.List;                                                              //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecordsAndCompactCtors.java
index 776c6143eeb..b80419bb4b3 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationRecordsAndCompactCtors.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 import org.w3c.dom.Node;                                                            //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationYieldStatement.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationYieldStatement.java
index da70ed9521a..01af37a7f59 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationYieldStatement.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationYieldStatement.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14                                   //indent:0 exp:0
+//non-compiled with javac: Compilable with Java17                                   //indent:0 exp:0
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation;             //indent:0 exp:0
                                                                                   //indent:82 exp:82
 enum Day {                                                                          //indent:0 exp:0
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords1.java
index 68883cac209..02fd577b589 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords1.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
 
 import java.io.IOException;
@@ -52,7 +52,7 @@ public interface Coords {
      * @param theta not really a param
      * @return
      */
-    public record Polar(double r, double theta) implements Coords { // ok
+    public record Polar(double r, double theta) implements Coords {
         @Override
         public double x() {
             return r * Math.cos(theta);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords2.java
index 6e1b0cdf1d4..9875b39bf5b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords2.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
 
 import java.io.IOException;
@@ -29,7 +29,7 @@ public class InputAtclauseOrderLotsOfRecords2 {
     public @interface NonNull1 {
     }
     // Basic Record declaration
-    public record Car(String color, String model) { // ok
+    public record Car(String color, String model) {
     }
 
     /**
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords3.java
index 480a2bc0262..31ac082a2df 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords3.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
 
 import java.io.IOException;
@@ -55,7 +55,7 @@ public record FXOrder(int units,
         }
     }
 
-    public boolean isLoggable(LogRecord record) { // ok
+    public boolean isLoggable(LogRecord record) {
         String packageName = null;
         return record.getLoggerName().startsWith(packageName);
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords4.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords4.java
index 2e8228fdf3b..0588354b082 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords4.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderLotsOfRecords4.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
 
 import java.io.IOException;
@@ -29,7 +29,7 @@ public class InputAtclauseOrderLotsOfRecords4 {
     /**
      * Javadoc here
      */
-    record RX(int[]xs) { // ok
+    record RX(int[]xs) {
     }
 
     private static int record = 2;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderRecords.java
index a52bf5455a9..878a34549c5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderRecords.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
 
 import java.io.Serializable;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodCompilationUnit.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodCompilationUnit.java
index b36d501a845..328c0751129 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodCompilationUnit.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodCompilationUnit.java
@@ -4,13 +4,13 @@
 
 
 */
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocmethod;
 
 @Deprecated @ProblemCauser
 public record InputJavadocMethodCompilationUnit() {
 
-    public void doThing() { // ok
+    public void doThing() {
         // No error unless an annotation is present
         @ProblemCauser
         record Test(String hello, int world) {}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodRecordsAndCompactCtors.java
index 573debe1dd4..ae077564301 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodRecordsAndCompactCtors.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocmethod;
 
 public class InputJavadocMethodRecordsAndCompactCtors {
@@ -20,7 +20,7 @@ public record MyRecord() {
          * exception is explitly thrown in code missed in javadoc
          *
          * @param properties some value
-         * @throws java.lang.IllegalStateException when argument is wrong // ok
+         * @throws java.lang.IllegalStateException when argument is wrong
          */
         public void doSomething4(String properties) {
             // here is NPE possible
@@ -34,7 +34,7 @@ public void doSomething4(String properties) {
          * exception is explitly thrown in code missed in javadoc
          *
          * @param properties some value
-         * @throws java.lang.IllegalStateException when argument is wrong // ok
+         * @throws java.lang.IllegalStateException when argument is wrong
          */
         public void doSomething5(String properties) {
             // here is NPE possible
@@ -53,7 +53,7 @@ public record MySecondRecord() {
          * exception is explitly thrown in code missed in javadoc
          *
          * @param properties some value
-         * @throws java.lang.IllegalStateException when argument is wrong // ok
+         * @throws java.lang.IllegalStateException when argument is wrong
          */
         // violation 3 lines above 'Unused Javadoc tag.'
         public MySecondRecord {
@@ -71,7 +71,7 @@ public record MyThirdRecord(String myString) {
          * exception is explitly thrown in code missed in javadoc
          *
          * @param properties some value
-         * @throws java.lang.IllegalStateException when argument is wrong // ok
+         * @throws java.lang.IllegalStateException when argument is wrong
          */
         // violation 3 lines above 'Unused Javadoc tag.'
         public MyThirdRecord {
@@ -89,7 +89,7 @@ public record MyFourthRecord(String myString) {
          * exception is explitly thrown in code missed in javadoc
          *
          * @param properties some value
-         * @throws java.lang.IllegalStateException when argument is wrong // ok
+         * @throws java.lang.IllegalStateException when argument is wrong
          */
         // violation 3 lines above 'Unused @param tag for 'properties'.'
         // violation below 'Expected @param tag for 'myInt'.'
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRecordsAndCompactCtors.java
index 0a468dff28c..30b3872ba67 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRecordsAndCompactCtors.java
@@ -13,14 +13,15 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleRecordsAndCompactCtors { // ok
+public class InputJavadocStyleRecordsAndCompactCtors {
 
-    public record MyRecord() { // ok
+    public record MyRecord() {
 
-        /** // violation
+        // violation 1 lines below 'First sentence should end with a period.'
+        /**
          * This Javadoc is missing an ending period
          */
         private static String second;
@@ -31,31 +32,36 @@ public record MyRecord() { // ok
          *
          * @see Something
          */
-        public MyRecord() { // ok
+        public MyRecord() {
         }
 
         /**
          * This is ok!
          */
-        private void method1() { // ok
+        private void method1() {
         }
 
-        /** // violation
+        // violation 1 lines below 'First sentence should end with a period.'
+        /**
          * This should fail even.though.there are embedded periods
          */
         private void method4() {
         }
 
+        // violation 7 lines below 'Unclosed HTML tag found: <b>'
+        // violation 9 lines below 'Extra HTML tag found: </td>'
+        // violation 9 lines below 'Extra HTML tag found: </style>'
+        // violation 10 lines below 'Unclosed HTML tag found: <code>dummy'
         /**
          * Test HTML in Javadoc comment
          * <dl>
-         * <dt><b>This guy is missing end of bold tag // violation
+         * <dt><b>
          * <dd>The dt and dd don't require end tags.
          * </dl>
-         * </td>Extra tag shouldn't be here // violation
-         * <style>this tag isn't supported in Javadoc</style> // violation
+         * </td>
+         * <style>this tag isn't supported in Javadoc</style>
          *
-         * @param arg1 <code>dummy. // violation
+         * @param arg1 <code>dummy
          */
         private void method5(int arg1) {
         }
@@ -67,10 +73,13 @@ private void method5(int arg1) {
     public record MySecondRecord() {
         static String props = "";
 
-        /** // violation
-         * Public check should fail</code> // violation
+        // violation 3 lines below 'First sentence should end with a period.'
+        // violation 3 lines below 'Extra HTML tag found: </code>'
+        // violation 3 lines below 'should fail <'
+        /**
+         * Public check should fail</code>
          * should fail <
-         */ // violation above
+         */
         public void method8() {
         }
     }
@@ -78,28 +87,30 @@ public void method8() {
     /**
      *
      */
-    public record MyThirdRecord(String myString) { // ok
+    public record MyThirdRecord(String myString) {
     }
 
-    public record MyFourthRecord(String myString) { // ok
+    public record MyFourthRecord(String myString) {
+        // violation 3 lines below 'Unclosed HTML tag found: <code>'
         /**
          * This Javadoc contains unclosed tag.
-         * <code>unclosed 'code' tag<code> // violation
+         * <code>unclosed 'code' tag<code>
          */
         private static void unclosedTag() {
             System.out.println("stuff");
         }
 
-        public MyFourthRecord { // ok
+        public MyFourthRecord {
             /**
              * No period at the end of this sentence
              */
-            String myOtherString = "mystring"; // ok
+            String myOtherString = "mystring";
         }
     }
 
-    public record MyFifthRecord() { // ok
-        /** // violation
+    public record MyFifthRecord() {
+        // violation 1 lines below 'First sentence should end with a period.'
+        /**
          * No period here on compact ctor
          */
         public MyFifthRecord {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents.java
index 55eab33685f..d6ef3185dd6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents.java
@@ -12,7 +12,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
 /**
@@ -20,5 +20,5 @@
  *
  * @param value Sponge Bob rules the world!
  */
-public record InputJavadocTypeRecordComponents(String value) { // ok
+public record InputJavadocTypeRecordComponents(String value) {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents2.java
index 7e3484a875b..bc1e3d680c6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordComponents2.java
@@ -12,7 +12,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
 import java.util.HashMap;
@@ -23,7 +23,7 @@
  *
  * @param value Sponge Bob rules the world!
  */
-public record InputJavadocTypeRecordComponents2(String value) { // ok
+public record InputJavadocTypeRecordComponents2(String value) {
 }
 
 /**
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordParamDescriptionWithAngularTags.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordParamDescriptionWithAngularTags.java
new file mode 100644
index 00000000000..d3b1326a6a1
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecordParamDescriptionWithAngularTags.java
@@ -0,0 +1,99 @@
+/*
+JavadocType
+
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
+
+/**
+ *
+ * @param <T> stuff <stuff>
+ * @param value
+ */
+public record InputJavadocTypeRecordParamDescriptionWithAngularTags<T>(String value) {
+
+}
+
+/**
+ *
+ * @param    <T>    🐦‍🔥stuff<stuff>stu🐦‍🔥ff</stuff>stuff🐦‍🔥
+ * @param     a     <stuff>
+ */
+record Record1<T>(int a) {}
+
+/**
+ *
+ * @param <T> &lt;stuff&gt;
+ * @param a stUff&lt;stuff&gt;sutff&lt;🐦‍🔥&gt;🐦‍🔥
+ * @param b <>>>>><<<<
+ */
+record Record2<T>(int a, int b) {
+    /**
+     *
+     * @param <T>
+     * @param a <//< <stuff></> stuff >>  <stuff>st<u>ff</stuff> >><
+     * @param b stuff <><><<stuff></></></> stuff
+     * @param c /-+`[]:^^<stuff **%%$>##(sutff)stuff()</stuff> @@
+     */
+    record Record3<T>(int a, int b, int c) {}
+
+    /**
+     *
+     * @param <V> [(<>{@code stuff<stuff>&lt;stuff&gt;}</>)]{@code {&lt;stuff&gt;}}
+     */
+    record Record4<V>() {}
+}
+
+/**
+ * @param <T>
+ * @param    <P>     stuff <><><<stuff></></></> stuff // violation,'Unused @param tag for '<P>'.'
+ */
+record Record5<T, U>() {} // violation, 'Type Javadoc comment is missing @param <U> tag.'
+
+/**
+ *
+ * @param region [(<>{@code stuff<stuff🐦‍🔥>🐦‍🔥&lt;stuff&gt;}</>)]{@code {&lt;stuff&gt;}}
+ * // violation above, 'Unused @param tag for 'region'.'
+ */
+record Record6(int a) {} // violation, 'Type Javadoc comment is missing @param a tag.'
+
+/**
+ *
+ * @param <T>
+ * @param a 🐦‍🔥<><🐦‍🔥><<stuff></></></> stuff🐦‍🔥
+ * @param b
+ */
+record Record7<T>(int a, int b) {}
+
+/**
+ * @param a <<></>></><<></>></>
+ * @param b stuff<stuff>:<>:<>:<🐦‍🔥<<🐦‍🔥>>🐦‍🔥>
+ * @param e [(<>{@code stuff<stuff🐦[(‍{🔥}])>🐦‍🔥&lt;stuff&gt;}</>)]{@code {&lt;stuff&gt;}}
+ * // violation above, 'Unused @param tag for 'e'.'
+ */
+record Record8(int a, int b, int c) { // violation, 'Type Javadoc comment is missing @param c tag.'
+}
+
+/**
+ *
+ * @param a [(<>{@code stuff<stuff🐦‍🔥>🐦‍🔥&lt;stuff&gt;}</>)]
+ */
+record Record9(int a) {}
+
+/**
+ *
+ * @param a <><><><><><><><>
+ * @param b >><>>><><><<<><<
+ * @param c {@code <{[(<stu<f>f>)]}>}
+ */
+record Record10(int a, int b, int c) {}
+
+/**
+ * One Transaction.
+ *
+ * @param transactionId  unique ID of the transaction in format: {@code <first Code>:<second Code>}
+ */
+record MyTransaction(String transactionId) {
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecords.java
index 050f300b829..5bc96d134c1 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeRecords.java
@@ -12,7 +12,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
 /**
@@ -66,6 +66,6 @@ record MyRecord4() { // violation 'missing @author tag.'
 
 }
 
-record MyRecord5() { // ok
+record MyRecord5() {
 
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethod1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethod1.java
index 48526919369..fcda4cfca8d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethod1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethod1.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java15
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;
 
 public class InputMissingJavadocMethod1 {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodBasic.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodBasic.java
new file mode 100644
index 00000000000..cd23b9c5dd4
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodBasic.java
@@ -0,0 +1,19 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck
+allowMissingPropertyJavadoc = true
+
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;
+
+public class InputMissingJavadocMethodBasic {
+
+    public void validAssign(String result) { // violation 'Missing a Javadoc comment'
+         result = switch ("in") {
+              case "correct" -> "true";
+              default -> "also correct";
+          };
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtors.java
index a4d6cc25da3..39b27868ff7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtors.java
@@ -11,7 +11,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;
 
 public class InputMissingJavadocMethodRecordsAndCtors {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtorsMinLineCount.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtorsMinLineCount.java
index 77e7cb9f378..886a8804ccf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtorsMinLineCount.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodRecordsAndCtorsMinLineCount.java
@@ -11,10 +11,10 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;
 
-public class InputMissingJavadocMethodRecordsAndCtorsMinLineCount { // ok
+public class InputMissingJavadocMethodRecordsAndCtorsMinLineCount {
     public record MyRecord(Integer number) {
         private static int mNumber;
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeRecords.java
index afc9c361bdc..08d32f4354f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeRecords.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
 
 public record InputMissingJavadocTypeRecords() { // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/writetag/InputWriteTagRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/writetag/InputWriteTagRecordsAndCompactCtors.java
index 2a55bb565f1..4bdf8d1b28c 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/writetag/InputWriteTagRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/writetag/InputWriteTagRecordsAndCompactCtors.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.javadoc.writetag;
 
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordLeaves.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordLeaves.java
index b2b47023e0e..563365a7cfc 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordLeaves.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordLeaves.java
@@ -4,14 +4,14 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
 
 public record InputBooleanExpressionComplexityRecordLeaves() {
     public InputBooleanExpressionComplexityRecordLeaves {
     }
 
-    public static final ConstructingObjectParser PARSER = new ConstructingObjectParser( // ok
+    public static final ConstructingObjectParser PARSER = new ConstructingObjectParser(
         "restore_snapshot",
         true,
         () -> {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordsAndCompactCtors.java
index 673218e5e17..f6a86fe5c8d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityRecordsAndCompactCtors.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
 
 public class InputBooleanExpressionComplexityRecordsAndCompactCtors {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingRecords.java
index c9f2f97c417..e7aa0410a0a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingRecords.java
@@ -18,7 +18,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling;
 
 import java.sql.Time;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRecords.java
index 3ced2064b26..807c30f8314 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRecords.java
@@ -18,7 +18,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity;
 
 import javax.naming.NamingException;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexityRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexityRecords.java
index e3db4975444..6f3f4d8c47a 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexityRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexityRecords.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.cyclomaticcomplexity;
 
 public class InputCyclomaticComplexityRecords {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsAndCompactCtors.java
index 9402dc52d57..df93583eff1 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsAndCompactCtors.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.javancss;  // violation 'NCSS for this file is 89 (max allowed is 2).'
 
 import java.time.LocalDateTime;
@@ -84,14 +84,14 @@ record TestInnerRecord() {
     }
   } // 6
 
-  record MyRecord4(int x, int y) { // ok
+  record MyRecord4(int x, int y) {
     //should give an ncss of 2
     record TestInnerRecord() {
       private static Object test;
     }
   }
 
-  record MyRecord5(int x, int y) { // ok
+  record MyRecord5(int x, int y) {
     //should give an ncss of 4
     public MyRecord5{
       if(x > 5) {
@@ -100,7 +100,7 @@ record MyRecord5(int x, int y) { // ok
     }
   }
 
-  record MyRecord6(int x, int y) { // ok
+  record MyRecord6(int x, int y) {
     //should give an ncss of 2
     public MyRecord6{
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsMax.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsMax.java
index f587938e9a6..a824ab4cabc 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsMax.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSRecordsMax.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.javancss;
 
 public class InputJavaNCSSRecordsMax {// violation 'NCSS for this class is 152 (max allowed is 80)'
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityCheckSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityCheckSwitchExpression.java
index a3dc6d7a217..57c3c593a0e 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityCheckSwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityCheckSwitchExpression.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.npathcomplexity;
 
 public class InputNPathComplexityCheckSwitchExpression {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityRecords.java
index 20fc9eaa21a..ed5e42fb261 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityRecords.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.metrics.npathcomplexity;
 
 public class InputNPathComplexityRecords {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java
index 89b742b6911..62192dc2fe4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierNoViolationRecords.java
@@ -11,34 +11,34 @@
 package com.puppycrawl.tools.checkstyle.checks.modifier.classmemberimpliedmodifier;
 
 public class InputClassMemberImpliedModifierNoViolationRecords {
-    public static interface GoodInterface {} // OK
+    public static interface GoodInterface {}
     // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
     public interface BadInterface {} // violation
 
-    public static enum GoodEnum {} // OK
+    public static enum GoodEnum {}
     // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
     public enum BadEnum {} // violation
 
-    public static record GoodRecord() {} // OK
+    public static record GoodRecord() {}
 
-    public record BadRecord() {} // ok
+    public record BadRecord() {}
 
     public static record OuterRecord() {
-        public static record InnerRecord1(){} // ok
+        public static record InnerRecord1(){}
 
-        public record InnerRecord2(){} // ok
+        public record InnerRecord2(){}
 
-        public static interface InnerInterface1 {} // ok
+        public static interface InnerInterface1 {}
         // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
         public interface InnerInterface2 {} // violation
 
-        public static enum InnerEnum1{} // ok
+        public static enum InnerEnum1{}
         // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
         public enum InnerEnum2{} // violation
     }
 
     Object obj = new Object() {
-        public record BadRecord() {} // ok
-        public static record OkRecord() {} // ok
+        public record BadRecord() {}
+        public static record OkRecord() {}
     };
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java
index ce10b24b86e..e89fca838e0 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierRecords.java
@@ -11,28 +11,28 @@
 package com.puppycrawl.tools.checkstyle.checks.modifier.classmemberimpliedmodifier;
 
 public class InputClassMemberImpliedModifierRecords {
-    public static interface GoodInterface {} // OK
+    public static interface GoodInterface {}
     // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
     public interface BadInterface {} // violation
 
-    public static enum GoodEnum {} // OK
+    public static enum GoodEnum {}
     // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
     public enum BadEnum {} // violation
 
-    public static record GoodRecord() {} // OK
+    public static record GoodRecord() {}
     // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
     public record BadRecord() {} // violation
 
     public static record OuterRecord() {
-        public static record InnerRecord1(){} // ok
+        public static record InnerRecord1(){}
         // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
         public record InnerRecord2(){} // violation
 
-        public static interface InnerInterface1 {} // ok
+        public static interface InnerInterface1 {}
         // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
         public interface InnerInterface2 {} // violation
 
-        public static enum InnerEnum1{} // ok
+        public static enum InnerEnum1{}
         // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
         public enum InnerEnum2{} // violation
     }
@@ -40,6 +40,6 @@ public enum InnerEnum2{} // violation
     Object obj = new Object() {
         // Implied modifier 'static' should be explicit. [ClassMemberImpliedModifier]
         public record BadRecord() {} // violation
-        public static record OkRecord() {} // ok
+        public static record OkRecord() {}
     };
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealed.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealed.java
index 4d6ac4ce2b7..dba703dda56 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealed.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealed.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java15
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.modifier.modifierorder;
 // violation below ''public' modifier out of order with the JLS suggestions.'
 sealed public class InputModifierOrderSealedAndNonSealed
@@ -14,7 +14,7 @@ sealed public class InputModifierOrderSealedAndNonSealed
 final class Circle extends InputModifierOrderSealedAndNonSealed implements Squircle {
 }
 
-sealed class Rectangle extends InputModifierOrderSealedAndNonSealed // ok
+sealed class Rectangle extends InputModifierOrderSealedAndNonSealed
     implements Cloneable
     permits TransparentRectangle, FilledRectangle {
 }
@@ -38,7 +38,7 @@ static non-sealed strictfp class StaticClass implements Squircle {
 final strictfp class FilledRectangle extends Rectangle {
 }
 
-sealed interface Squircle permits Circle, Square, Ellipse, Square.StaticClass { // ok
+sealed interface Squircle permits Circle, Square, Ellipse, Square.StaticClass {
 }
 // violation below ''sealed' modifier out of order with the JLS suggestions.'
 strictfp sealed interface Rhombus permits Parallelogram, Parallelogram.Diamond,
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealedNoViolation.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealedNoViolation.java
index 8c037241c30..134d2821be2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealedNoViolation.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderSealedAndNonSealedNoViolation.java
@@ -4,17 +4,17 @@
 
 */
 
-//non-compiled with javac: Compilable with Java15
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.modifier.modifierorder;
 
-public sealed class InputModifierOrderSealedAndNonSealedNoViolation // ok
+public sealed class InputModifierOrderSealedAndNonSealedNoViolation
     permits Circle, Square, Rectangle {
 }
 
 final class Circle extends InputModifierOrderSealedAndNonSealedNoViolation implements Squircle {
 }
 
-sealed class Rectangle extends InputModifierOrderSealedAndNonSealedNoViolation // ok
+sealed class Rectangle extends InputModifierOrderSealedAndNonSealedNoViolation
     implements Cloneable
     permits TransparentRectangle, FilledRectangle {
 }
@@ -23,7 +23,7 @@ final class TransparentRectangle extends Rectangle {
 }
 
 sealed class Square extends InputModifierOrderSealedAndNonSealedNoViolation implements Squircle {
-    private sealed class OtherSquare extends Square permits OtherSquare2 { // ok
+    private sealed class OtherSquare extends Square permits OtherSquare2 {
     }
 
     private final class OtherSquare2 extends OtherSquare {
@@ -33,5 +33,5 @@ private final class OtherSquare2 extends OtherSquare {
 final strictfp class FilledRectangle extends Rectangle {
 }
 
-sealed interface Squircle permits Circle, Square { // ok
+sealed interface Squircle permits Circle, Square {
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierRecords.java
index 3c6984b41f5..0c7e3a0041c 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierRecords.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier;
 
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 public class InputRedundantModifierRecords {
 
     static record testRecord(int a) { // violation 'Redundant 'static' modifier'
@@ -49,8 +49,8 @@ final static record someRecord() { // 2 violations
     }
 }
 
-record anotherRecord(int b) { // ok
+record anotherRecord(int b) {
 
-    record nestedRecord(int a, int p) { // ok
+    record nestedRecord(int a, int p) {
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java
index a01cd9963f5..7927cd4d5ee 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java
@@ -13,10 +13,10 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-import java.util.ArrayList;
+import java.util.*;
 import java.util.Locale;
 
 public class InputAbbreviationAsWordInNameCheckEnhancedInstanceof {
@@ -25,19 +25,19 @@ public void t(Object o1, Object o2) {
         if (!(o1 instanceof String STRING) // violation
                 && (o2 instanceof Integer INTEGER)) {} // violation
 
-        ArrayList<Integer> arrayList = new ArrayList<Integer>();
-        if (arrayList instanceof ArrayList<Integer> aXML) { // ok
+        List<Integer> arrayList = new ArrayList<Integer>();
+        if (arrayList instanceof ArrayList<Integer> aXML) {
             System.out.println("BlahBlah");
         }
 
         boolean result = (o1 instanceof String a1) ?
-                (o1 instanceof String aTXT) :   // ok
+                (o1 instanceof String aTXT) :
                 (!(o1 instanceof String ssSTRING)); // violation
 
         String formatted;
         if (o1 instanceof Integer XMLHTTP) formatted = // violation
                 String.format("int %d", XMLHTTP);
-        else if (o1 instanceof Byte bYT) formatted = String.format("byte %d", bYT); // ok
+        else if (o1 instanceof Byte bYT) formatted = String.format("byte %d", bYT);
         else formatted = String.format("Something else "+ o1.toString());
 
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1.java
index 2add6419177..3268c4e9c61 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1.java
@@ -13,10 +13,10 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-import java.util.ArrayList;
+import java.util.*;
 import java.util.Locale;
 
 public class InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1 {
@@ -25,7 +25,7 @@ public void t(Object o1, Object o2) {
         if (!(o1 instanceof String STRING) // violation
                 && (o2 instanceof Integer INTEGER)) {} // violation
 
-        ArrayList<Integer> arrayList = new ArrayList<Integer>();
+        List<Integer> arrayList = new ArrayList<Integer>();
         if (arrayList instanceof ArrayList<Integer> aXML) { // ok, allowed XML
             System.out.println("Blah");
         }
@@ -37,7 +37,7 @@ public void t(Object o1, Object o2) {
         String formatted;
         if (o1 instanceof Integer XMLHTTP) formatted = // violation
                 String.format("int %d", XMLHTTP);
-        else if (o1 instanceof Byte bYT) formatted = String.format("byte %d", bYT); // ok
+        else if (o1 instanceof Byte bYT) formatted = String.format("byte %d", bYT);
         else formatted = String.format("Something else "+ o1.toString());
 
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckRecords.java
index 10809b4cdcf..96b4838fa90 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckRecords.java
@@ -13,7 +13,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
 import org.w3c.dom.Node;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierName.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierName.java
index 72ddbb2d22b..cf97cf314d2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierName.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierName.java
@@ -8,13 +8,13 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.illegalidentifiername;
 
 import java.util.logging.LogRecord;
 
 public class InputIllegalIdentifierName {
-    public Class<Record[]> getRecordType() { // ok
+    public Class<Record[]> getRecordType() {
         return Record[].class;
     }
 
@@ -24,7 +24,7 @@ private static void record(LogRecord... logArray) { // violation
         }
     }
 
-    class yieldClass { // ok
+    class yieldClass {
         int yield = 6; // violation
 
         public void yield() { // violation
@@ -68,8 +68,8 @@ record Record // violation
         record MyRecord() {} // ok, part of another word
         var variable = 2; // ok, part of another word
 
-        String recordString = "record"; // ok
-        recordString = recordString.substring(record, 20); // ok
+        String recordString = "record";
+        recordString = recordString.substring(record, 20);
 
         record MyOtherRecord(String record, String yield, String... var) { // 3 violations
         }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameLambda.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameLambda.java
index 60dc9bfea46..01698144ca7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameLambda.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameLambda.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.illegalidentifiername;
 
 import java.util.function.Function;
@@ -18,7 +18,7 @@ public class InputIllegalIdentifierNameLambda {
     public static void main(String... args) {
         Function<String, String> f1 = var -> var; // violation
         Function<String, String> f2 = (var) -> var; // violation
-        Function<String, String> f3 = myLambdaParam -> myLambdaParam; // ok
+        Function<String, String> f3 = myLambdaParam -> myLambdaParam;
     }
 
     enum Day {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameOpenTransitive.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameOpenTransitive.java
index 77a46cc3eb4..597329bffda 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameOpenTransitive.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameOpenTransitive.java
@@ -8,13 +8,13 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.illegalidentifiername;
 
 import java.util.logging.LogRecord;
 
 public class InputIllegalIdentifierNameOpenTransitive {
-    public Class<Record[]> getRecordType() { // ok
+    public Class<Record[]> getRecordType() {
         return Record[].class;
     }
 
@@ -24,7 +24,7 @@ private static void record(LogRecord... logArray) { // violation
         }
     }
 
-    class openClass { // ok
+    class openClass {
         int open = 6; // violation
 
         public void transitive() { // violation
@@ -71,7 +71,7 @@ record MyRecord() {
         var variable = 2; // ok, part of another word
 
         String Transitive = "record"; // violation
-        Transitive = Transitive.substring(record, 20); // ok
+        Transitive = Transitive.substring(record, 20);
 
         record MyOtherRecord(String transitive, String yield, String...var) { // 3 violations
         }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameParameterReceiver.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameParameterReceiver.java
index f51214a5dd8..8fefceecc10 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameParameterReceiver.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameParameterReceiver.java
@@ -8,16 +8,16 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.illegalidentifiername;
 
-public record InputIllegalIdentifierNameParameterReceiver() { // ok
-    public void foo4(InputIllegalIdentifierNameParameterReceiver this) { // ok
+public record InputIllegalIdentifierNameParameterReceiver() {
+    public void foo4(InputIllegalIdentifierNameParameterReceiver this) {
     }
 
     private class Inner {
-        Inner(InputIllegalIdentifierNameParameterReceiver // ok
-                  InputIllegalIdentifierNameParameterReceiver.this) { // ok
+        Inner(InputIllegalIdentifierNameParameterReceiver
+                  InputIllegalIdentifierNameParameterReceiver.this) {
         }
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameUnderscore.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameUnderscore.java
index 924e5c9ef24..37598baf43e 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameUnderscore.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/InputIllegalIdentifierNameUnderscore.java
@@ -12,8 +12,8 @@
 package com.puppycrawl.tools.checkstyle.checks.naming.illegalidentifiername;
 
 public class InputIllegalIdentifierNameUnderscore {
-    String _string = "_string"; // ok
-    String string_ = "string_"; // ok
-    String another_string = "string"; // ok
+    String _string = "_string";
+    String string_ = "string_";
+    String another_string = "string";
     String _; // violation
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/InputLambdaParameterNameSwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/InputLambdaParameterNameSwitchExpression.java
index 2ec6e86d705..1918ad6d4b3 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/InputLambdaParameterNameSwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/InputLambdaParameterNameSwitchExpression.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.lambdaparametername;
 
 import java.util.stream.Stream;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameRecordInInterfaceBody.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameRecordInInterfaceBody.java
index e85df6721b5..82cc4d69668 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameRecordInInterfaceBody.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameRecordInInterfaceBody.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.methodname;
 
 public interface InputMethodNameRecordInInterfaceBody {
@@ -18,7 +18,7 @@ static record MyRedundantStaticRecord() {}
     record MyRecord1(){}
     record MyRecord2(int x, int y, int z){}
     record MyRecord3(int[][] x, String... z){
-        String record() { // ok
+        String record() {
             return null;
         }
         void VIOLATION() { // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofNoSingleChar.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofNoSingleChar.java
index c78ebfbd5f5..900a576fe1f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofNoSingleChar.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofNoSingleChar.java
@@ -5,10 +5,10 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.patternvariablename;
 
-import java.util.ArrayList;
+import java.util.*;
 import java.util.Locale;
 
 public class InputPatternVariableNameEnhancedInstanceofNoSingleChar {
@@ -48,7 +48,7 @@ public void t(Object o1, Object o2) {
         }
         b = ((VoidPredicate) () -> o1 instanceof String s).get(); // violation
 
-        ArrayList<Integer> arrayList = new ArrayList<Integer>();
+        List<Integer> arrayList = new ArrayList<Integer>();
         if (arrayList instanceof ArrayList<Integer> ai) {
             System.out.println("Blah");
         }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofTestDefault.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofTestDefault.java
index 9bb742c1ec3..4dfd5a0a93d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofTestDefault.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/InputPatternVariableNameEnhancedInstanceofTestDefault.java
@@ -5,10 +5,10 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.patternvariablename;
 
-import java.util.ArrayList;
+import java.util.*;
 import java.util.Locale;
 
 public class InputPatternVariableNameEnhancedInstanceofTestDefault {
@@ -49,7 +49,7 @@ public void t(Object o1, Object o2) {
         }
         b = ((VoidPredicate) () -> o1 instanceof String s).get();
 
-        ArrayList<Integer> arrayList = new ArrayList<Integer>();
+        List<Integer> arrayList = new ArrayList<Integer>();
         if (arrayList instanceof ArrayList<Integer> ai) {
             System.out.println("Blah");
         }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameDefault.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameDefault.java
index 49dab5b0053..858ed5d229d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameDefault.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameDefault.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.recordcomponentname;
 
 import java.io.Serializable;
@@ -13,7 +13,7 @@
 
 import org.w3c.dom.Node;
 
-public record InputRecordComponentNameDefault(int x, String str, Double myValue1, int i1) { // ok
+public record InputRecordComponentNameDefault(int x, String str, Double myValue1, int i1) {
 }
 
 record DefaultFirstRecord(String value_123, // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameLowercase.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameLowercase.java
index 06f3623cad1..b6e0736415f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameLowercase.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordcomponentname/InputRecordComponentNameLowercase.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.recordcomponentname;
 
 import java.io.Serializable;
@@ -13,7 +13,7 @@
 
 import org.w3c.dom.Node;
 
-public record InputRecordComponentNameLowercase(Integer x, String str, Double val123) { // ok
+public record InputRecordComponentNameLowercase(Integer x, String str, Double val123) {
 }
 
 record LowercaseFirstRecord(String value_123, // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterName.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterName.java
index 10ce455e0a8..c1e69061257 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterName.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterName.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.recordtypeparametername;
 
 import java.io.Serializable;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterNameFoo.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterNameFoo.java
index a3afa484adb..81ec2b75d5b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterNameFoo.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/recordtypeparametername/InputRecordTypeParameterNameFoo.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.recordtypeparametername;
 
 import java.io.Serializable;
@@ -31,11 +31,11 @@ foo getOne() {
         return null;
     }
 
-    <foo extends Runnable> foo getShadow() { // ok
+    <foo extends Runnable> foo getShadow() {
         return null;
     }
 
-    static record Junk <foo>() { // ok
+    static record Junk <foo>() {
         <_fo extends foo> void getMoreFoo() {
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/typename/InputTypeNameRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/typename/InputTypeNameRecords.java
index 16e8835f1d2..f6cfd2191b2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/typename/InputTypeNameRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/typename/InputTypeNameRecords.java
@@ -10,15 +10,15 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.naming.typename;
 
 public class InputTypeNameRecords {
     interface FirstName {
-    } // OK
+    }
 
     class SecondName {
-    } // OK
+    }
 
     enum Third_Name {} // violation
 
@@ -35,5 +35,5 @@ record MyRecord__() { // violation
     }
 
     record GoodName() {
-    } // ok
+    }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java
index 45e58ebb606..eed455b46d4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java
@@ -5,5 +5,5 @@
 */
 
 @Deprecated
-package com.puppycrawl.tools.checkstyle.checks.outertypefilename; // ok
+package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java
index 02adfb60353..443905178cb 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/executablestatementcount/InputExecutableStatementCountRecords.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.executablestatementcount;
 
 public class InputExecutableStatementCountRecords {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthSwitchExps.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthSwitchExps.java
index 23edeac41d2..62816e0ac92 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthSwitchExps.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthSwitchExps.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.lambdabodylength;
 
 import java.util.stream.Stream;
@@ -14,7 +14,7 @@ public class InputLambdaBodyLengthSwitchExps {
 
     boolean method1(Nums k, String string) {
         switch (k) {
-        case ONE -> { // ok
+        case ONE -> {
             System.out.println(2);
             System.out.println(3);
             System.out.println(4);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringImportStatements.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringImportStatements.java
index 43ac2a11c98..c0f2fbc3aa4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringImportStatements.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringImportStatements.java
@@ -6,12 +6,12 @@
 
 
 */
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 
 // violation below 'longer than 75 characters (found 79)'
 package com.       puppycrawl.tools.    checkstyle.checks.    sizes.linelength;
 
-import java.   security.    interfaces.          RSAMultiPrimePrivateCrtKey; // ok
+import java.   security.    interfaces.          RSAMultiPrimePrivateCrtKey;
 
 public class InputLineLengthIgnoringImportStatements {
     @Override
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringPackageStatements.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringPackageStatements.java
index d04fc4c339b..ad5387759ac 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringPackageStatements.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthIgnoringPackageStatements.java
@@ -6,13 +6,13 @@
 
 
 */
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.   checkstyle.checks.sizes.linelength; // ok
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.   checkstyle.checks.sizes.linelength;
 
 // violation below 'longer than 75 characters (found 76)'
 import java.   security.    interfaces.          RSAMultiPrimePrivateCrtKey;
 
-import java.util.Arrays; // ok
+import java.util.Arrays;
 
 public class InputLineLengthIgnoringPackageStatements {
     @Override
@@ -28,7 +28,7 @@ public String toString() {
 
         String b = """
 package com.puppycrawl.tools.checkstyle.    checks.sizes.     linelength;
-            """; // ok above
+            """;
 
         // violation below 'longer than 75 characters (found 77)'
         return "This line is longer than 60 characters and should be logged";
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCountRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCountRecords.java
index bef865f17ee..ed64341a028 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCountRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCountRecords.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodcount;
 
 public class InputMethodCountRecords {
@@ -42,7 +42,7 @@ void foo2() {
         }
     }
     //compact ctor
-    record MyTestRecord3() { // ok
+    record MyTestRecord3() {
         void foo() {
         }
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCompactCtorsCountEmpty.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCompactCtorsCountEmpty.java
index 099a5842e81..afecf002b8f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCompactCtorsCountEmpty.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCompactCtorsCountEmpty.java
@@ -7,13 +7,13 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
 
 public class InputMethodLengthCompactCtorsCountEmpty {
 
     record MyTestRecord() {
-        static { // ok
+        static {
             System.out.println("test");
             System.out.println("test");
             System.out.println("test");
@@ -42,7 +42,7 @@ public MyTestRecord4() { // violation 'Method .* length is 3 lines (max allowed
     }
 
     record MyTestRecord5() {
-        public MyTestRecord5() { // ok
+        public MyTestRecord5() {
             // some comment
             /*
             block comment
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthRecordsAndCompactCtors.java
index 0d116bad797..862bd826329 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthRecordsAndCompactCtors.java
@@ -7,13 +7,13 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
 
 public class InputMethodLengthRecordsAndCompactCtors {
 
     record MyTestRecord() {
-        static { // ok
+        static {
             System.out.println("test");
             System.out.println("test");
             System.out.println("test");
@@ -49,7 +49,7 @@ public MyTestRecord4() { // violation
     }
 
     record MyTestRecord5() {
-        static { // ok
+        static {
             int y = 5;
             int z = 10;
             String newString = String.valueOf(y);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthTextBlocksCountEmpty.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthTextBlocksCountEmpty.java
index 4f2e49f96b6..cedb75d5ec1 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthTextBlocksCountEmpty.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthTextBlocksCountEmpty.java
@@ -7,7 +7,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
 
 public class InputMethodLengthTextBlocksCountEmpty {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/outertypenumber/InputOuterTypeNumberRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/outertypenumber/InputOuterTypeNumberRecords.java
index ca9fc485d59..26aff23a553 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/outertypenumber/InputOuterTypeNumberRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/outertypenumber/InputOuterTypeNumberRecords.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.outertypenumber; // violation
 
 class InputOuterTypeNumberRecords { }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumber.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumber.java
index 6701c343cb1..86251d517c4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumber.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumber.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
 
 import java.awt.Point;
@@ -25,15 +25,15 @@ public record TestRecord1(int x){
         }
     }
 
-    public record TestRecord2(int x, int y){ // ok
+    public record TestRecord2(int x, int y){
 
     }
 
-    public record TestRecord3(String str, int x, int y){ // ok
+    public record TestRecord3(String str, int x, int y){
 
     }
 
-    public record TestRecord4(Node node, // ok
+    public record TestRecord4(Node node,
                               Point x,
                               Point y,
                               int translation,
@@ -49,7 +49,7 @@ public record TestRecord4(Node node, // ok
         }
     }
 
-    public record TestRecord5(int x, int y, int z, // ok
+    public record TestRecord5(int x, int y, int z,
                               int a, int b, int c, int d){
 
     }
@@ -61,7 +61,7 @@ public record TestRecord6(int x, int y, int z, // violation
                               int j, int k){
 
     }
-    public record TestRecord7(int y){ // ok
+    public record TestRecord7(int y){
 
         record InnerRecordOk(int x, int y, int z){
 
@@ -106,11 +106,11 @@ public record TestRecord9(int x, int y, int z, // violation
 
     }
 
-    public record TestRecord10(String... myVarargs){} // ok
+    public record TestRecord10(String... myVarargs){}
 
-    public record TestRecord11(int[] arr, LinkedHashMap<String, Node> linkedHashMap, int x){} // ok
+    public record TestRecord11(int[] arr, LinkedHashMap<String, Node> linkedHashMap, int x){}
 
-    public record TestRecord12(int[] arr, // ok
+    public record TestRecord12(int[] arr,
                                LinkedHashMap<String, Node> linkedHashMap,
                                int x,
                                ArrayDeque<Node> arrayDeque,
@@ -127,7 +127,7 @@ private static record MyPrivateRecord1(int x, int y, int z, // violation
 
     private static record MyPrivateRecord2(int x, int y) {}
 
-    protected static record MyProtectedRecord1(int x, int y) {} // ok
+    protected static record MyProtectedRecord1(int x, int y) {}
 
     protected static record MyProtectedRecord2(int x, int y, int z, // violation
                                                int a, int b, int c,
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax1.java
index 847be2e694c..4e37f3f48a0 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax1.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
 
 import java.awt.Point;
@@ -19,7 +19,7 @@
 
 public class InputRecordComponentNumberMax1 {
 
-    public record TestRecord1(int x){ // ok
+    public record TestRecord1(int x){
         public TestRecord1{
 
         }
@@ -61,7 +61,7 @@ public record TestRecord6(int x, int y, int z, // violation
                               int j, int k){
 
     }
-    public record TestRecord7(int y){ // ok
+    public record TestRecord7(int y){
 
         record InnerRecordOk(int x, int y, int z){ // violation
 
@@ -105,7 +105,7 @@ public record TestRecord9(int x, int y, int z, // violation
 
     }
 
-    public record TestRecord10(String... myVarargs){} // ok
+    public record TestRecord10(String... myVarargs){}
 
     public record TestRecord11(int[] arr, // violation
                                LinkedHashMap<String, Node> linkedHashMap,
@@ -120,7 +120,7 @@ public record TestRecord12(int[] arr, // violation
 
     }
 
-    private static record MyPrivateRecord1() {} // ok
+    private static record MyPrivateRecord1() {}
 
     private static record MyPrivateRecord2(int x, int y) {} // violation
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax20.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax20.java
index 2eeac623484..d474f6b641c 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax20.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberMax20.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
 
 import java.awt.Point;
@@ -19,21 +19,21 @@
 
 public class InputRecordComponentNumberMax20 {
 
-    public record TestRecord1(int x){ // ok
+    public record TestRecord1(int x){
         public TestRecord1{
 
         }
     }
 
-    public record TestRecord2(int x, int y){ // ok
+    public record TestRecord2(int x, int y){
 
     }
 
-    public record TestRecord3(String str, int x, int y){ // ok
+    public record TestRecord3(String str, int x, int y){
 
     }
 
-    public record TestRecord4(Node node, // ok
+    public record TestRecord4(Node node,
                               Point x,
                               Point y,
                               int translation,
@@ -49,37 +49,37 @@ public record TestRecord4(Node node, // ok
         }
     }
 
-    public record TestRecord5(int x, int y, int z, // ok
+    public record TestRecord5(int x, int y, int z,
                               int a, int b, int c, int d){
 
     }
 
-    public record TestRecord6(int x, int y, int z, // ok
+    public record TestRecord6(int x, int y, int z,
                               int a, int b, int c,
                               int d, int e, int f,
                               int g, int h, int i,
                               int j, int k){
 
     }
-    public record TestRecord7(int y){ // ok
+    public record TestRecord7(int y){
 
-        record InnerRecordOk(int x, int y, int z){ // ok
+        record InnerRecordOk(int x, int y, int z){
 
         }
 
-        private record InnerRecordBad(int x, int y, int z, // ok
+        private record InnerRecordBad(int x, int y, int z,
                                       int a, int b, int c,
                                       int d, int e, int f,
                                       int g, int h, int i,
                                       int j, int k){
 
-            private record InnerRecordCeptionBad(int x, int y, int z, // ok
+            private record InnerRecordCeptionBad(int x, int y, int z,
                                                  int a, int b, int c,
                                                  int d, int e, int f,
                                                  int g, int h, int i,
                                                  int j, int k) {
 
-                public record InnerPublicBad(int[] arr, // ok
+                public record InnerPublicBad(int[] arr,
                                              LinkedHashMap<String, Node> linkedHashMap,
                                              int x,
                                              ArrayDeque<Node> arrayDeque,
@@ -93,11 +93,11 @@ public record InnerPublicBad(int[] arr, // ok
         }
     }
 
-    public record TestRecord8(int x, int y, int z, String... myVarargs){ // ok
+    public record TestRecord8(int x, int y, int z, String... myVarargs){
 
     }
 
-    public record TestRecord9(int x, int y, int z, // ok
+    public record TestRecord9(int x, int y, int z,
                               int a, int b, int c,
                               int d, int e, int f,
                               int g, int h, int i,
@@ -105,10 +105,10 @@ public record TestRecord9(int x, int y, int z, // ok
 
     }
 
-    public record TestRecord10(String... myVarargs){} // ok
+    public record TestRecord10(String... myVarargs){}
 
-    public record TestRecord11(int[] arr, LinkedHashMap<String, Node> linkedHashMap, int x){} // ok
-    public record TestRecord12(int[] arr, // ok
+    public record TestRecord11(int[] arr, LinkedHashMap<String, Node> linkedHashMap, int x){}
+    public record TestRecord12(int[] arr,
                                LinkedHashMap<String, Node> linkedHashMap,
                                int x,
                                ArrayDeque<Node> arrayDeque,
@@ -117,8 +117,8 @@ public record TestRecord12(int[] arr, // ok
 
     }
 
-    private static record MyPrivateRecord1() {} // ok
+    private static record MyPrivateRecord1() {}
 
-    private static record MyPrivateRecord2(int x, int y) {} // ok
+    private static record MyPrivateRecord2(int x, int y) {}
 
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberPrivateModifier.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberPrivateModifier.java
index 82c40b88d9c..a3b910af857 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberPrivateModifier.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberPrivateModifier.java
@@ -4,9 +4,10 @@
 accessModifiers = private
 
 
+
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
 
 import java.awt.Point;
@@ -25,15 +26,14 @@ public record TestRecord1(int x){
         }
     }
 
-    public record TestRecord2(int x, int y){ // ok
+    public record TestRecord2(int x, int y){
 
     }
 
-    public record TestRecord3(String str, int x, int y){ // ok
-
+    public record TestRecord3(String str, int x, int y){
     }
 
-    public record TestRecord4(Node node, // ok
+    public record TestRecord4(Node node,
                               Point x,
                               Point y,
                               int translation,
@@ -49,21 +49,21 @@ public record TestRecord4(Node node, // ok
         }
     }
 
-    public record TestRecord5(int x, int y, int z, // ok
+    public record TestRecord5(int x, int y, int z,
                               int a, int b, int c, int d){
 
     }
 
-    public record TestRecord6(int x, int y, int z,// ok
+    public record TestRecord6(int x, int y, int z,
                               int a, int b, int c,
                               int d, int e, int f,
                               int g, int h, int i,
                               int j, int k){
 
     }
-    public record TestRecord7(int y){ // ok
+    public record TestRecord7(int y){
 
-        record InnerRecordOk(int x, int y, int z){ // ok
+        record InnerRecordOk(int x, int y, int z){
 
         }
 
@@ -79,7 +79,7 @@ private record InnerRecordCeptionBad(int x, int y, int z, // violation
                                                  int g, int h, int i,
                                                  int j, int k) {
 
-                public record InnerPublicBad(int[] arr,// ok
+                public record InnerPublicBad(int[] arr,
                                              LinkedHashMap<String, Node> linkedHashMap,
                                              int x,
                                              ArrayDeque<Node> arrayDeque,
@@ -94,11 +94,11 @@ public record InnerPublicBad(int[] arr,// ok
         }
     }
 
-    public record TestRecord8(int x, int y, int z, String... myVarargs){ // ok
+    public record TestRecord8(int x, int y, int z, String... myVarargs){
 
     }
 
-    public record TestRecord9(int x, int y, int z,// ok
+    public record TestRecord9(int x, int y, int z,
                               int a, int b, int c,
                               int d, int e, int f,
                               int g, int h, int i,
@@ -106,11 +106,11 @@ public record TestRecord9(int x, int y, int z,// ok
 
     }
 
-    public record TestRecord10(String... myVarargs){} // ok
+    public record TestRecord10(String... myVarargs){}
 
-    public record TestRecord11(int[] arr, LinkedHashMap<String, Node> linkedHashMap, int x){} // ok
+    public record TestRecord11(int[] arr, LinkedHashMap<String, Node> linkedHashMap, int x){}
 
-    public record TestRecord12(int[] arr, // ok
+    public record TestRecord12(int[] arr,
                                LinkedHashMap<String, Node> linkedHashMap,
                                int x,
                                ArrayDeque<Node> arrayDeque,
@@ -127,9 +127,9 @@ private static record MyPrivateRecord1(int x, int y, int z, // violation
 
     private static record MyPrivateRecord2(int x, int y) {}
 
-    protected static record MyProtectedRecord1(int x, int y) {} // ok
+    protected static record MyProtectedRecord1(int x, int y) {}
 
-    protected static record MyProtectedRecord2(int x, int y, int z, // ok
+    protected static record MyProtectedRecord2(int x, int y, int z,
                                                int a, int b, int c,
                                                int d, int e, int f,
                                                int g, int h, int i,
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel1.java
index 00a8dad9de0..1f78813d7e7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel1.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
 
 public record InputRecordComponentNumberTopLevel1(int x, int y, int z, // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel2.java
index 4a219c051bc..50ab059009f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/recordcomponentnumber/InputRecordComponentNumberTopLevel2.java
@@ -6,9 +6,9 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.sizes.recordcomponentnumber;
 
-public record InputRecordComponentNumberTopLevel2<T>() { // ok
+public record InputRecordComponentNumberTopLevel2<T>() {
 
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/suppresswarningsholder/InputSuppressWarningsHolderTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/suppresswarningsholder/InputSuppressWarningsHolderTextBlocks.java
index 1cbec945347..18db7dcbaf7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/suppresswarningsholder/InputSuppressWarningsHolderTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/suppresswarningsholder/InputSuppressWarningsHolderTextBlocks.java
@@ -14,7 +14,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.suppresswarningsholder;
 
 /* Config:
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTree2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTree2.java
index f26b0bed18d..278f2efa24d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTree2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTree2.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.uncommentedmain;
 
 public record InputUncommentedMainBeginTree2(Integer x) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords.java
index 4fc8c8fe833..fefdfa73552 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.uncommentedmain;
 
 public record InputUncommentedMainRecords(Integer x) {
@@ -13,7 +13,7 @@ public static void main(String... args) { // violation
         System.out.println("no comments here!");
     }
 
-    // public static void main(String... args) { } // ok
+    // public static void main(String... args) { }
 
     // unlike inner classes, inner records CAN have static methods
     record InnerRecord(String... args) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords2.java
index 7e4b877e4aa..f381196d016 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainRecords2.java
@@ -5,7 +5,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.uncommentedmain;
 
 public record InputUncommentedMainRecords2(Integer x) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleLines3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleLines3.java
index dd1ff192172..a1a941ad1e7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleLines3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleLines3.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 
 package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator;
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtors.java
index f7f3d393e0a..dabcfd9566b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtors.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; // violation ''package' should be separated from previous line.'
 
 public class InputEmptyLineSeparatorRecordsAndCompactCtors {
@@ -42,29 +42,29 @@ record recordCompactCtors2(){
         public static final int Y = 1; // violation ''VARIABLE_DEF' .*separated .*previous line.'
     }
 
-    record MyRecord2(String foo) { // ok
+    record MyRecord2(String foo) {
 
         public static final int FOO_CONST = 1;
 
-        public void method() {} // ok
+        public void method() {}
 
-        public MyRecord2{} // ok
+        public MyRecord2{}
 
-        MyRecord2(int x){this("string");} // ok
+        MyRecord2(int x){this("string");}
 
-        static{} // ok
+        static{}
     }
 
-    record InBetween3(int x, int y) {} // ok
+    record InBetween3(int x, int y) {}
 
     class MyClass2 {
 
         public static final int FOO_CONST = 1;
 
-        public void method() {} // ok
+        public void method() {}
 
-        public MyClass2(){} // ok
+        public MyClass2(){}
 
-        MyClass2(String foo){} // ok
+        MyClass2(String foo){}
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java
index 4c71601eb81..758751876fc 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines.java
@@ -10,7 +10,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; // violation ''package' should be separated from previous line.'
 
 public class InputEmptyLineSeparatorRecordsAndCompactCtorsNoEmptyLines {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeRecordHeader.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeRecordHeader.java
new file mode 100644
index 00000000000..2bafef3e527
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeRecordHeader.java
@@ -0,0 +1,119 @@
+/*
+GenericWhitespace
+
+
+*/
+
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
+
+import java.lang.annotation.Target;
+import java.util.HashMap;
+
+import static java.lang.annotation.ElementType.TYPE_USE;
+
+public class InputGenericWhitespaceBeforeRecordHeader {
+    record License<T>() {}
+    record Person<T> () {} // violation, ''>' is followed by whitespace.'
+    record Session < T > (T a) {}
+    // 4 violations above:
+    //                    ''<' is followed by whitespace.'
+    //                    ''<' is preceded with whitespace.'
+    //                    ''>' is followed by whitespace.'
+    //                    ''>' is preceded with whitespace.'
+
+    class InnerClass {
+        static <T> void innerMethod(T a) {}
+        static <T> void innerMethod(T a, boolean isSession) {}
+        record Participant<T>() {
+            //            +          +                                         +
+            record Stats<T> (HashMap <String, Session<HashMap<String, Integer>>>stats) {
+                // 3 violations above:
+                //                    ''>' is followed by whitespace.'
+                //                    ''<' is preceded with whitespace.'
+                //                    ''>' is followed by an illegal character.'
+
+                record Achievements<T> () {} // violation, ''>' is followed by whitespace.'
+            }
+        }
+    }
+
+    int method(Session<HashMap<String, Integer>> ssn) {
+        //                                 +                        +
+        InnerClass.innerMethod(new Session <HashMap<Integer, String>> (new HashMap()));
+        // 2 violations above:
+        //                    ''<' is preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+
+        //          +                                          + +
+        new License <@A Session<HashMap<@A Session, @A Session >>> ();
+        // 3 violations above:
+        //                    ''<' is preceded with whitespace.'
+        //                    ''>' is preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+
+        //                                                    +                +
+        new InnerClass.Participant.Stats.Achievements<Session <License<String>>> ();
+        // 2 violations above:
+        //                   ''<' is preceded with whitespace.'
+        //                   ''>' is followed by whitespace.'
+
+        //                         +                        +
+        if (ssn instanceof Session <HashMap<String, Integer>> (var sess)) {
+            // 2 violations above:
+            //                    ''<' is preceded with whitespace.'
+            //                    ''>' is followed by whitespace.'
+
+            InnerClass.innerMethod(new Session<?> []{}, true);
+            // violation above, ''>' is followed by whitespace.'
+        }
+
+        return switch (ssn) {
+            //           +                        +            +
+            case Session <HashMap<String, Integer>> (@A HashMap< @A String, Integer> hm) -> 1;
+            //  3 violations above:
+            //                     ''<' is preceded with whitespace.'
+            //                     ''>' is followed by whitespace.'
+            //                     ''<' is followed by whitespace.'
+
+            //           +       +                    +
+            case Session <HashMap< @A String, Integer>>sess -> 1;
+            // 3 violations above:
+            //                    ''<' is preceded with whitespace.'
+            //                    ''<' is followed by whitespace.'
+            //                    ''>' is followed by an illegal character.'
+        };
+    }
+
+    static {
+        new Object() {
+            //          +                  +  +             +         + +
+            record Sys<T> (Session<Session <T >> p, Session <Session<T> > q) {}
+            // 6 violations above:
+            //                    ''>' is followed by whitespace.'
+            //                    ''<' is preceded with whitespace.'
+            //                    ''>' is preceded with whitespace.'
+            //                    ''<' is preceded with whitespace.'
+            //                    ''>' is followed by whitespace.'
+            //                    ''>' is preceded with whitespace.'
+
+            //          +                                +
+            record Game <T extends Number & Comparable<T>> (T guess) {}
+            // 2 violations above:
+            //                    ''<' is preceded with whitespace.'
+            //                    ''>' is followed by whitespace.'
+
+            void method() {
+                //      +      +             +                +
+                new Sys <String> (new Session< Session<String>> (new Session<>("a")), null);
+                // 4 violations above:
+                //                    ''<' is preceded with whitespace.'
+                //                    ''>' is followed by whitespace.'
+                //                    ''<' is followed by whitespace.'
+                //                    ''>' is followed by whitespace.'
+            }
+        };
+    }
+
+    @Target({TYPE_USE}) @interface A {}
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadRecords.java
index c9c02dedc25..f6828b2e52b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadRecords.java
@@ -8,7 +8,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.methodparampad;
 
 import org.w3c.dom.Node;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapRecordsAndCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapRecordsAndCompactCtors.java
index 4e33995cb47..ec1a344d3dd 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapRecordsAndCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapRecordsAndCompactCtors.java
@@ -5,30 +5,30 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.nolinewrap;
 
 public class InputNoLineWrapRecordsAndCompactCtors {
-    class Bar { // OK
+    class Bar {
         public // violation
         Bar() {
         }
-        public void fun() { // OK
+        public void fun() {
         }
     }
     record // violation
     MyRecord1() {
-        public MyRecord1() { // OK
+        public MyRecord1() {
         }
         public static void
         doSomething() {
         }
     }
-    record MyRecord2() { // OK
+    record MyRecord2() {
         public // violation
         MyRecord2() {
         }
-        public void fun() { // OK
+        public void fun() {
         }
     }
     record MyRecord3(String str, int // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeTextBlocksTabIndent.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeTextBlocksTabIndent.java
index 6d600105075..06868e44da7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeTextBlocksTabIndent.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebefore/InputNoWhitespaceBeforeTextBlocksTabIndent.java
@@ -6,7 +6,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespacebefore;
 
 public class InputNoWhitespaceBeforeTextBlocksTabIndent {
@@ -34,18 +34,18 @@ private void workingCheck_no_spaces() {
     private void brokenCheck_space_before_tabs() {
         String x = """
             Some Text
- 		"""; // ok
+ 		""";
     }
 
     private void brokenCheck_space_after_tabs() {
         String x = """
             Some Text
-		 """; // ok
+		 """;
     }
 
     private void brokenCheck_just_tabs() {
         String x = """
             Some Text
-		"""; // ok
+		""";
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java
index 1b234d0a7b0..54b2b3bee83 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings.java
@@ -4,7 +4,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespacebeforecasedefaultcolon;
 
 class InputNoWhitespaceBeforeCaseDefaultColonEnumAndStrings {
@@ -31,7 +31,7 @@ int assignment(Day day) {
         int numLetters = -1;
         switch (day) {
             case MON,
-                    FRI: numLetters = 6; // ok
+                    FRI: numLetters = 6;
                             break;
             case TUE : numLetters = 7; // violation
                        break;
@@ -49,11 +49,11 @@ int complexCase(Day day) {
         int someInt = -1;
         return switch (day) {
             case MON,
-                    TUE: { // ok
+                    TUE: {
                 int l = day.toString().length();
                 yield l + someInt;
             }
-            case WED: { // ok
+            case WED: {
                 int l = day.toString().length();
                 yield l + someInt * 2;
             }
@@ -72,7 +72,7 @@ int numberOfDays(String month) {
                         break;
             case "JAN", "MAR"
                        , "MAY" : days = 31; break; // violation
-            case "APR", "JUN": days = 30; // ok
+            case "APR", "JUN": days = 30;
                                 break;
         };
         return days;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapGuardedPatterns.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapGuardedPatterns.java
index 7ee4f45a520..93ff2d04199 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapGuardedPatterns.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapGuardedPatterns.java
@@ -15,9 +15,9 @@ public class InputOperatorWrapGuardedPatterns {
     String typeGuardAfterParenthesizedTrueSwitchStatement1(Object o) {
         switch (o) {
             case (Integer i)
-                    && i == 0: o = String.valueOf(i); return "true"; // ok
+                    && i == 0: o = String.valueOf(i); return "true";
             case ((Integer i)
-                    && i == 2): o = String.valueOf(i); return "second"; // ok
+                    && i == 2): o = String.valueOf(i); return "second";
             case Object x: return "any";
         }
     }
@@ -25,22 +25,22 @@ String typeGuardAfterParenthesizedTrueSwitchStatement1(Object o) {
     String typeGuardAfterParenthesizedTrueSwitchExpression1(Object o) {
         return switch (o) {
             case (Integer i)
-                    && i == 0: o = String.valueOf(i); yield "true"; // ok
+                    && i == 0: o = String.valueOf(i); yield "true";
             case ((Integer i)
-                    && i == 2): o = String.valueOf(i); yield "second"; // ok
+                    && i == 2): o = String.valueOf(i); yield "second";
             case Object x: yield "any";
         };
     }
 
     String typeGuardAfterParenthesizedTrueIfStatement1(Object o) {
         if (o != null
-                && o instanceof ((Integer i) // ok
-                && i == 0)) { // ok
+                && o instanceof ((Integer i)
+                && i == 0)) {
             return "true";
         } else if (o != null
-                && o instanceof (((Integer i)  // ok
-                && i == 2))  // ok
-                && (o = i) != null) { // ok
+                && o instanceof (((Integer i)
+                && i == 2))
+                && (o = i) != null) {
             return "second";
         } else {
             return "any";
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecords.java
index f7dc7d212b1..ca01773b954 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecords.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.parenpad;
 
 import java.util.HashMap;
@@ -27,19 +27,19 @@ record MyRecord1( ) { // 2 violations
 
         static int n;
 
-        public void fun() {  // ok
+        public void fun() {
             bar( 1);  // violation
         }
 
         public void bar(int k ) {  // violation
-            while (k > 0) {  // ok
+            while (k > 0) {
             }
         }
 
-        public void fun2() {  // ok
+        public void fun2() {
             switch( n) {  // violation
                 case 2:
-                    bar(n);  // ok
+                    bar(n);
                 default:
                     break;
             }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecordsSpace.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecordsSpace.java
index 748efe785d6..abc9e321343 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecordsSpace.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/parenpad/InputParenPadCheckRecordsSpace.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.parenpad;
 
 import java.util.HashMap;
@@ -17,9 +17,9 @@
 import org.w3c.dom.Node;
 
 public class InputParenPadCheckRecordsSpace {
-    record MyRecord1( ) { // ok
+    record MyRecord1( ) {
 
-        MyRecord1( int x ){this();} // ok
+        MyRecord1( int x ){this();}
 
         public MyRecord1{
             bar( 1);  // violation
@@ -27,7 +27,7 @@ record MyRecord1( ) { // ok
 
         static int n;
 
-        public void fun() {  // ok
+        public void fun() {
             bar( 1);  // violation
         }
 
@@ -36,7 +36,7 @@ public void bar(int k ) {  // violation
             }
         }
 
-        public void fun2() {  // ok
+        public void fun2() {
             switch( n) {  // violation
                 case 2:
                     bar(n);  // 2 violations
@@ -49,7 +49,7 @@ public void fun2() {  // ok
 
     //record components
     record MyRecord2( String s){} // violation
-    record MyRecord4( String s, String ...varargs ){} // ok
+    record MyRecord4( String s, String ...varargs ){}
     record MyRecord6( String[] strArr){} // violation
     record MyRecord7(HashMap<String, Node> hashMap ){} // violation
     record MyRecord8(int x // violation
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralYield.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralYield.java
index 6fdc3606512..84790723893 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralYield.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralYield.java
@@ -12,7 +12,7 @@ public class InputWhitespaceAfterLiteralYield {
   public static void main(String[] args) {
     int a = switch (args[0]) {
       case "got":
-        yield (1); // OK
+        yield (1);
       case "my":
         yield(3); // violation ''yield' is not followed by whitespace'
       default:
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterSwitchStatements.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterSwitchStatements.java
index 834d4d8cf40..bcda5c073cf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterSwitchStatements.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterSwitchStatements.java
@@ -40,7 +40,7 @@ void switchWithPatternMatching() {
         switch(o) { // violation ''switch' is not followed by whitespace'
             case String s ->s.trim(); // violation ''->' is not followed by whitespace'
             case Integer a ->a.intValue(); // violation ''->' is not followed by whitespace'
-            default -> throw new IllegalArgumentException(); // ok
+            default -> throw new IllegalArgumentException();
         }
     }
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundAllowEmptyCompactCtors.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundAllowEmptyCompactCtors.java
index dedcdbaa833..7b057acf3a7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundAllowEmptyCompactCtors.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundAllowEmptyCompactCtors.java
@@ -18,7 +18,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespacearound;
 
 public class InputWhitespaceAroundAllowEmptyCompactCtors {
@@ -27,7 +27,7 @@ record MyRecord() {} // 2 violations
 
     // simple record def
     record MyRecord1() {
-    } // ok
+    }
 
     // nested constructs
     record MyRecord2() {
@@ -58,7 +58,7 @@ public MyRecord4() {
     // compact ctor
     record MyRecord5() {
         public MyRecord5 {
-        } // ok
+        }
     }
 
     // static fields
@@ -68,7 +68,7 @@ record MyRecord6() {
     }
 
     record TestRecord7() {
-        public TestRecord7 {} // ok
+        public TestRecord7 {}
     }
 }
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecords.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecords.java
index 0796d0f6e5e..b52abbc861b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecords.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecords.java
@@ -18,7 +18,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespacearound;
 
 public class InputWhitespaceAroundRecords {
@@ -27,7 +27,7 @@ record MyRecord() {} // 2 violations
 
     // simple record def
     record MyRecord1() {
-    } // ok
+    }
 
     // nested constructs
     record MyRecord2() {
@@ -75,25 +75,25 @@ record TestRecord7() {
     }
 
     record TestRecord8() {
-        public TestRecord8 () { // ok
+        public TestRecord8 () {
 
         }
     }
 
     class TestClass {
-        public TestClass () { // ok
+        public TestClass () {
 
         }
     }
 
     record TestRecord9() {
-        public TestRecord9() { // ok
+        public TestRecord9() {
 
         }
     }
 
     class TestClass2 {
-        public TestClass2() { // ok
+        public TestClass2() {
 
         }
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecordsAllowEmptyTypes.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecordsAllowEmptyTypes.java
index c6fd10b6354..296194e0600 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecordsAllowEmptyTypes.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundRecordsAllowEmptyTypes.java
@@ -18,21 +18,21 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespacearound;
 
-public class InputWhitespaceAroundRecordsAllowEmptyTypes { // ok
+public class InputWhitespaceAroundRecordsAllowEmptyTypes {
     // simple record def
-    record MyRecord() {} // ok
+    record MyRecord() {}
 
     // simple record def
     record MyRecord1() {
-    } // ok
+    }
 
     // nested constructs
     record MyRecord2() {
-        class MyClass {} // ok
-        interface Foo {} // ok
-        record MyRecord () {} // ok
+        class MyClass {}
+        interface Foo {}
+        record MyRecord () {}
     }
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundSwitchExpressions.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundSwitchExpressions.java
new file mode 100644
index 00000000000..5b2f18cce9d
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundSwitchExpressions.java
@@ -0,0 +1,51 @@
+/*
+WhitespaceAround
+allowEmptyConstructors = (default)false
+allowEmptyMethods = (default)false
+allowEmptyTypes = (default)false
+allowEmptyLoops = (default)false
+allowEmptyLambdas = (default)false
+allowEmptyCatches = (default)false
+ignoreEnhancedForColon = (default)true
+tokens = (default)ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, \
+         BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, \
+         LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, \
+         LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, \
+         LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, \
+         NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, \
+         SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND
+
+
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespacearound;
+
+import java.util.Optional;
+
+public class InputWhitespaceAroundSwitchExpressions {
+
+    Optional<String> someMethod(int arg) {
+        return Optional.ofNullable(switch (arg) { // ok - switch expression is skipped by design
+            default -> null;
+        });
+    }
+
+    Optional<String> someMethod2(int a) {
+        return Optional.ofNullable(((switch (a) { // ok - switch expression is skipped by design
+            default -> null;
+        })));
+    }
+
+    Object someMethod3(int a) {
+        return switch(a) { // ok - switch expression is skipped by design
+            default -> null;
+        };
+    }
+
+    Object someMethod3(String b) {
+        return (switch(b.trim()) { // ok - switch expression is skipped by design
+            default -> null;
+        });
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionInterfaceRecordDef.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionInterfaceRecordDef.java
index ff57945d297..221f15255e9 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionInterfaceRecordDef.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionInterfaceRecordDef.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.antlr4;
 
 public interface InputAntlr4AstRegressionInterfaceRecordDef {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava15FinalLocalRecord.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava15FinalLocalRecord.java
index 71dbca7e69e..14e22cb6391 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava15FinalLocalRecord.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava15FinalLocalRecord.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java15
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.antlr4;
 
 public class InputAntlr4AstRegressionJava15FinalLocalRecord {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava16LocalEnumAndInterface.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava16LocalEnumAndInterface.java
index cd0e219f58e..700e4bc0312 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava16LocalEnumAndInterface.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionJava16LocalEnumAndInterface.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.antlr4;
 
 public class InputAntlr4AstRegressionJava16LocalEnumAndInterface {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.java
index 8e49d386559..064dec39b65 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.antlr4;
 
 import java.io.Serializable;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.java
index 939864cc3b5..ea26c59bfaf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/antlr4/InputAntlr4AstRegressionUncommon3.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.antlr4;
 
 public class InputAntlr4AstRegressionUncommon3 implements AutoCloseable {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14EscapedS.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14EscapedS.java
index 156fc483507..a772c5a5493 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14EscapedS.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14EscapedS.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 public class InputJava14EscapedS {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14InstanceofWithPatternMatching.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14InstanceofWithPatternMatching.java
index 75abb4c5420..59f8e665335 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14InstanceofWithPatternMatching.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14InstanceofWithPatternMatching.java
@@ -1,7 +1,7 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
-import java.util.ArrayList;
+import java.util.*;
 import java.util.Arrays;
 import java.util.Locale;
 
@@ -86,7 +86,7 @@ public void t(Object o1, Object o2) {
         if (o1 instanceof String s || !(o2 instanceof String s)) {} //ok
         b = ((VoidPredicate) () -> o1 instanceof String s).get();
 
-        ArrayList<Integer> arrayList = new ArrayList<Integer>();
+        List<Integer> arrayList = new ArrayList<Integer>();
         if (arrayList instanceof ArrayList<Integer> ai) {
             System.out.println("Blah");
         }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14LocalRecordAnnotation.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14LocalRecordAnnotation.java
index 074f77e7f1b..9232a890e36 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14LocalRecordAnnotation.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14LocalRecordAnnotation.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 @Deprecated @ProblemCauser
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14Records.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14Records.java
index 60af4f85960..da43f77e6f4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14Records.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14Records.java
@@ -9,7 +9,7 @@
 
 */
 
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 import java.io.IOException;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14RecordsTopLevel.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14RecordsTopLevel.java
index ecdaba2cea8..dca82c7a63c 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14RecordsTopLevel.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14RecordsTopLevel.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 public record InputJava14RecordsTopLevel(Integer i, String s, Character c) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14SwitchExpression.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14SwitchExpression.java
index d6f773eec18..6c41ef426b2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14SwitchExpression.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14SwitchExpression.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 import static java.time.Instant.*;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocks.java
index 07903274375..5b8d8d84bb8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocks.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 public class InputJava14TextBlocks
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksEscapesAreOneChar.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksEscapesAreOneChar.java
index 93cb15e5cb5..4f2b1e34faf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksEscapesAreOneChar.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksEscapesAreOneChar.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 public class InputJava14TextBlocksEscapesAreOneChar {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksTabSize.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksTabSize.java
index 07e39ad0a68..3d7596147b4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksTabSize.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java14/InputJava14TextBlocksTabSize.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java14;
 
 public class InputJava14TextBlocksTabSize {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputAstRegressionSealedAndPermits.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputAstRegressionSealedAndPermits.java
index 8035e2d0a09..ceaf9495680 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputAstRegressionSealedAndPermits.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputAstRegressionSealedAndPermits.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java15
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java15;
 
 public sealed class InputAstRegressionSealedAndPermits permits Circle, Square, Rectangle {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputTopLevelNonSealed.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputTopLevelNonSealed.java
index 9c47b91b64d..f2aa9eac7b5 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputTopLevelNonSealed.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java15/InputTopLevelNonSealed.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java15
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java15;
 
 public non-sealed class InputTopLevelNonSealed extends OtherClass {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java16/InputPatternVariableWithModifiers.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java16/InputPatternVariableWithModifiers.java
index c71b526c481..b4eedd8fb06 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java16/InputPatternVariableWithModifiers.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java16/InputPatternVariableWithModifiers.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.grammar.java16;
 
 public class InputPatternVariableWithModifiers {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateBasic.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateBasic.txt
new file mode 100644
index 00000000000..bda890d21a2
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateBasic.txt
@@ -0,0 +1,564 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [2:47]
+|   |--DOT -> . [2:47]
+|   |   |--DOT -> . [2:39]
+|   |   |   |--DOT -> . [2:28]
+|   |   |   |   |--DOT -> . [2:22]
+|   |   |   |   |   |--DOT -> . [2:11]
+|   |   |   |   |   |   |--IDENT -> com [2:8]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [2:12]
+|   |   |   |   |   `--IDENT -> tools [2:23]
+|   |   |   |   `--IDENT -> checkstyle [2:29]
+|   |   |   `--IDENT -> grammar [2:40]
+|   |   `--IDENT -> java21 [2:48]
+|   `--SEMI -> ; [2:54]
+|--IMPORT -> import [4:0]
+|   |--DOT -> . [4:16]
+|   |   |--DOT -> . [4:11]
+|   |   |   |--IDENT -> java [4:7]
+|   |   |   `--IDENT -> util [4:12]
+|   |   `--IDENT -> List [4:17]
+|   `--SEMI -> ; [4:21]
+`--CLASS_DEF -> CLASS_DEF [6:0]
+    |--MODIFIERS -> MODIFIERS [6:0]
+    |   `--LITERAL_PUBLIC -> public [6:0]
+    |--LITERAL_CLASS -> class [6:7]
+    |--IDENT -> InputStringTemplateBasic [6:13]
+    `--OBJBLOCK -> OBJBLOCK [6:38]
+        |--LCURLY -> { [6:38]
+        |--VARIABLE_DEF -> VARIABLE_DEF [7:4]
+        |   |--MODIFIERS -> MODIFIERS [7:4]
+        |   |--TYPE -> TYPE [7:4]
+        |   |   `--LITERAL_INT -> int [7:4]
+        |   |--IDENT -> x [7:8]
+        |   |--ASSIGN -> = [7:10]
+        |   |   `--EXPR -> EXPR [7:12]
+        |   |       `--NUM_INT -> 10 [7:12]
+        |   `--SEMI -> ; [7:14]
+        |--VARIABLE_DEF -> VARIABLE_DEF [8:4]
+        |   |--MODIFIERS -> MODIFIERS [8:4]
+        |   |--TYPE -> TYPE [8:4]
+        |   |   `--LITERAL_INT -> int [8:4]
+        |   |--IDENT -> y [8:8]
+        |   |--ASSIGN -> = [8:10]
+        |   |   `--EXPR -> EXPR [8:12]
+        |   |       `--NUM_INT -> 20 [8:12]
+        |   `--SEMI -> ; [8:14]
+        |--VARIABLE_DEF -> VARIABLE_DEF [11:4]
+        |   |--MODIFIERS -> MODIFIERS [11:4]
+        |   |--TYPE -> TYPE [11:4]
+        |   |   `--IDENT -> String [11:4]
+        |   |--IDENT -> result1 [11:11]
+        |   |--ASSIGN -> = [11:19]
+        |   |   `--EXPR -> EXPR [11:24]
+        |   |       `--DOT -> . [11:24]
+        |   |           |--IDENT -> STR [11:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [11:25]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  [11:26]
+        |   |               `--STRING_TEMPLATE_END -> " [11:26]
+        |   `--SEMI -> ; [11:27]
+        |--VARIABLE_DEF -> VARIABLE_DEF [13:4]
+        |   |--MODIFIERS -> MODIFIERS [13:4]
+        |   |--TYPE -> TYPE [13:4]
+        |   |   `--IDENT -> String [13:4]
+        |   |--IDENT -> result1_1 [13:11]
+        |   |--ASSIGN -> = [13:21]
+        |   |   `--EXPR -> EXPR [13:26]
+        |   |       `--DOT -> . [13:26]
+        |   |           |--IDENT -> STR [13:23]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [13:27]
+        |   |               |--STRING_TEMPLATE_CONTENT -> Hello world! [13:28]
+        |   |               `--STRING_TEMPLATE_END -> " [13:40]
+        |   `--SEMI -> ; [13:41]
+        |--VARIABLE_DEF -> VARIABLE_DEF [16:4]
+        |   |--MODIFIERS -> MODIFIERS [16:4]
+        |   |--TYPE -> TYPE [16:4]
+        |   |   `--IDENT -> String [16:4]
+        |   |--IDENT -> result1_2 [16:11]
+        |   |--ASSIGN -> = [16:21]
+        |   |   `--EXPR -> EXPR [16:26]
+        |   |       `--DOT -> . [16:26]
+        |   |           |--IDENT -> STR [16:23]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [16:27]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [16:28]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [16:32]
+        |   |               `--STRING_TEMPLATE_END -> " [16:33]
+        |   `--SEMI -> ; [16:34]
+        |--VARIABLE_DEF -> VARIABLE_DEF [19:4]
+        |   |--MODIFIERS -> MODIFIERS [19:4]
+        |   |--TYPE -> TYPE [19:4]
+        |   |   `--IDENT -> String [19:4]
+        |   |--IDENT -> result2 [19:11]
+        |   |--ASSIGN -> = [19:19]
+        |   |   `--EXPR -> EXPR [19:24]
+        |   |       `--DOT -> . [19:24]
+        |   |           |--IDENT -> STR [19:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [19:26]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [19:27]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [19:28]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [19:31]
+        |   |               |   `--IDENT -> x [19:31]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [19:33]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [19:34]
+        |   |               `--STRING_TEMPLATE_END -> " [19:35]
+        |   `--SEMI -> ; [19:36]
+        |--VARIABLE_DEF -> VARIABLE_DEF [22:4]
+        |   |--MODIFIERS -> MODIFIERS [22:4]
+        |   |--TYPE -> TYPE [22:4]
+        |   |   `--IDENT -> String [22:4]
+        |   |--IDENT -> result3 [22:11]
+        |   |--ASSIGN -> = [22:19]
+        |   |   `--EXPR -> EXPR [22:24]
+        |   |       `--DOT -> . [22:24]
+        |   |           |--IDENT -> STR [22:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [22:26]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [22:27]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [22:31]
+        |   |               |   `--METHOD_CALL -> ( [22:31]
+        |   |               |       |--IDENT -> y [22:30]
+        |   |               |       |--ELIST -> ELIST [22:33]
+        |   |               |       |   `--EXPR -> EXPR [22:33]
+        |   |               |       |       `--METHOD_CALL -> ( [22:33]
+        |   |               |       |           |--IDENT -> y [22:32]
+        |   |               |       |           |--ELIST -> ELIST [22:34]
+        |   |               |       |           |   `--EXPR -> EXPR [22:34]
+        |   |               |       |           |       `--STRING_LITERAL -> "y" [22:34]
+        |   |               |       |           `--RPAREN -> ) [22:37]
+        |   |               |       `--RPAREN -> ) [22:38]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [22:40]
+        |   |               `--STRING_TEMPLATE_END -> " [22:41]
+        |   `--SEMI -> ; [22:42]
+        |--VARIABLE_DEF -> VARIABLE_DEF [25:4]
+        |   |--MODIFIERS -> MODIFIERS [25:4]
+        |   |--TYPE -> TYPE [25:4]
+        |   |   `--IDENT -> String [25:4]
+        |   |--IDENT -> result4 [25:11]
+        |   |--ASSIGN -> = [25:19]
+        |   |   `--EXPR -> EXPR [25:36]
+        |   |       `--PLUS -> + [25:36]
+        |   |           |--DOT -> . [25:24]
+        |   |           |   |--IDENT -> STR [25:21]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [25:26]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [25:27]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [25:30]
+        |   |           |       |   `--IDENT -> x [25:30]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [25:32]
+        |   |           |       `--STRING_TEMPLATE_END -> " [25:33]
+        |   |           `--DOT -> . [25:41]
+        |   |               |--IDENT -> STR [25:38]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [25:43]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [25:44]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [25:47]
+        |   |                   |   `--IDENT -> y [25:47]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [25:49]
+        |   |                   `--STRING_TEMPLATE_END -> " [25:50]
+        |   `--SEMI -> ; [25:51]
+        |--VARIABLE_DEF -> VARIABLE_DEF [28:4]
+        |   |--MODIFIERS -> MODIFIERS [28:4]
+        |   |--TYPE -> TYPE [28:4]
+        |   |   `--IDENT -> String [28:4]
+        |   |--IDENT -> result5 [28:11]
+        |   |--ASSIGN -> = [28:19]
+        |   |   `--EXPR -> EXPR [28:44]
+        |   |       `--PLUS -> + [28:44]
+        |   |           |--DOT -> . [28:24]
+        |   |           |   |--IDENT -> STR [28:21]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [28:26]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [28:27]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [28:31]
+        |   |           |       |   `--METHOD_CALL -> ( [28:31]
+        |   |           |       |       |--IDENT -> y [28:30]
+        |   |           |       |       |--ELIST -> ELIST [28:33]
+        |   |           |       |       |   `--EXPR -> EXPR [28:33]
+        |   |           |       |       |       `--METHOD_CALL -> ( [28:33]
+        |   |           |       |       |           |--IDENT -> y [28:32]
+        |   |           |       |       |           |--ELIST -> ELIST [28:34]
+        |   |           |       |       |           |   `--EXPR -> EXPR [28:34]
+        |   |           |       |       |           |       `--STRING_LITERAL -> "y" [28:34]
+        |   |           |       |       |           `--RPAREN -> ) [28:37]
+        |   |           |       |       `--RPAREN -> ) [28:38]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [28:40]
+        |   |           |       `--STRING_TEMPLATE_END -> " [28:41]
+        |   |           `--DOT -> . [28:49]
+        |   |               |--IDENT -> STR [28:46]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [28:51]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [28:52]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [28:56]
+        |   |                   |   `--METHOD_CALL -> ( [28:56]
+        |   |                   |       |--IDENT -> y [28:55]
+        |   |                   |       |--ELIST -> ELIST [28:58]
+        |   |                   |       |   `--EXPR -> EXPR [28:58]
+        |   |                   |       |       `--METHOD_CALL -> ( [28:58]
+        |   |                   |       |           |--IDENT -> y [28:57]
+        |   |                   |       |           |--ELIST -> ELIST [28:59]
+        |   |                   |       |           |   `--EXPR -> EXPR [28:59]
+        |   |                   |       |           |       `--STRING_LITERAL -> "y" [28:59]
+        |   |                   |       |           `--RPAREN -> ) [28:62]
+        |   |                   |       `--RPAREN -> ) [28:63]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [28:65]
+        |   |                   `--STRING_TEMPLATE_END -> " [28:66]
+        |   `--SEMI -> ; [28:67]
+        |--VARIABLE_DEF -> VARIABLE_DEF [31:4]
+        |   |--MODIFIERS -> MODIFIERS [31:4]
+        |   |--TYPE -> TYPE [31:4]
+        |   |   `--IDENT -> String [31:4]
+        |   |--IDENT -> result6 [31:11]
+        |   |--ASSIGN -> = [31:19]
+        |   |   `--EXPR -> EXPR [31:36]
+        |   |       `--PLUS -> + [31:36]
+        |   |           |--DOT -> . [31:24]
+        |   |           |   |--IDENT -> STR [31:21]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [31:26]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [31:27]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [31:30]
+        |   |           |       |   `--IDENT -> x [31:30]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [31:32]
+        |   |           |       `--STRING_TEMPLATE_END -> " [31:33]
+        |   |           `--DOT -> . [31:41]
+        |   |               |--IDENT -> STR [31:38]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [31:43]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [31:44]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [31:47]
+        |   |                   |   `--IDENT -> y [31:47]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [31:49]
+        |   |                   `--STRING_TEMPLATE_END -> " [31:50]
+        |   `--SEMI -> ; [31:51]
+        |--VARIABLE_DEF -> VARIABLE_DEF [34:4]
+        |   |--MODIFIERS -> MODIFIERS [34:4]
+        |   |--TYPE -> TYPE [34:4]
+        |   |   `--IDENT -> String [34:4]
+        |   |--IDENT -> result7 [34:11]
+        |   |--ASSIGN -> = [34:19]
+        |   |   `--EXPR -> EXPR [34:24]
+        |   |       `--DOT -> . [34:24]
+        |   |           |--IDENT -> STR [34:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [34:26]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [34:27]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [34:32]
+        |   |               |   `--PLUS -> + [34:32]
+        |   |               |       |--IDENT -> x [34:30]
+        |   |               |       `--IDENT -> y [34:34]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [34:36]
+        |   |               `--STRING_TEMPLATE_END -> " [34:37]
+        |   `--SEMI -> ; [34:38]
+        |--VARIABLE_DEF -> VARIABLE_DEF [37:4]
+        |   |--MODIFIERS -> MODIFIERS [37:4]
+        |   |--TYPE -> TYPE [37:4]
+        |   |   `--IDENT -> String [37:4]
+        |   |--IDENT -> result8 [37:11]
+        |   |--ASSIGN -> = [37:19]
+        |   |   `--EXPR -> EXPR [37:24]
+        |   |       `--DOT -> . [37:24]
+        |   |           |--IDENT -> STR [37:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [37:26]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [37:27]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [37:31]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [37:44]
+        |   |               |   `--PLUS -> + [37:44]
+        |   |               |       |--METHOD_CALL -> ( [37:35]
+        |   |               |       |   |--IDENT -> y [37:34]
+        |   |               |       |   |--ELIST -> ELIST [37:37]
+        |   |               |       |   |   `--EXPR -> EXPR [37:37]
+        |   |               |       |   |       `--METHOD_CALL -> ( [37:37]
+        |   |               |       |   |           |--IDENT -> y [37:36]
+        |   |               |       |   |           |--ELIST -> ELIST [37:38]
+        |   |               |       |   |           |   `--EXPR -> EXPR [37:38]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [37:38]
+        |   |               |       |   |           `--RPAREN -> ) [37:41]
+        |   |               |       |   `--RPAREN -> ) [37:42]
+        |   |               |       `--METHOD_CALL -> ( [37:47]
+        |   |               |           |--IDENT -> y [37:46]
+        |   |               |           |--ELIST -> ELIST [37:49]
+        |   |               |           |   `--EXPR -> EXPR [37:49]
+        |   |               |           |       `--METHOD_CALL -> ( [37:49]
+        |   |               |           |           |--IDENT -> y [37:48]
+        |   |               |           |           |--ELIST -> ELIST [37:50]
+        |   |               |           |           |   `--EXPR -> EXPR [37:50]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [37:50]
+        |   |               |           |           `--RPAREN -> ) [37:53]
+        |   |               |           `--RPAREN -> ) [37:54]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [37:56]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there [37:57]
+        |   |               `--STRING_TEMPLATE_END -> " [37:63]
+        |   `--SEMI -> ; [37:64]
+        |--VARIABLE_DEF -> VARIABLE_DEF [40:4]
+        |   |--MODIFIERS -> MODIFIERS [40:4]
+        |   |--TYPE -> TYPE [40:4]
+        |   |   `--IDENT -> String [40:4]
+        |   |--IDENT -> result9 [40:11]
+        |   |--ASSIGN -> = [40:19]
+        |   |   `--EXPR -> EXPR [40:24]
+        |   |       `--DOT -> . [40:24]
+        |   |           |--IDENT -> STR [40:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [40:26]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [40:27]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [40:31]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [41:22]
+        |   |               |   `--PLUS -> + [41:22]
+        |   |               |       |--METHOD_CALL -> ( [41:13]
+        |   |               |       |   |--IDENT -> y [41:12]
+        |   |               |       |   |--ELIST -> ELIST [41:15]
+        |   |               |       |   |   `--EXPR -> EXPR [41:15]
+        |   |               |       |   |       `--METHOD_CALL -> ( [41:15]
+        |   |               |       |   |           |--IDENT -> y [41:14]
+        |   |               |       |   |           |--ELIST -> ELIST [41:16]
+        |   |               |       |   |           |   `--EXPR -> EXPR [41:16]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [41:16]
+        |   |               |       |   |           `--RPAREN -> ) [41:19]
+        |   |               |       |   `--RPAREN -> ) [41:20]
+        |   |               |       `--METHOD_CALL -> ( [41:25]
+        |   |               |           |--IDENT -> y [41:24]
+        |   |               |           |--ELIST -> ELIST [41:27]
+        |   |               |           |   `--EXPR -> EXPR [41:27]
+        |   |               |           |       `--METHOD_CALL -> ( [41:27]
+        |   |               |           |           |--IDENT -> y [41:26]
+        |   |               |           |           |--ELIST -> ELIST [41:28]
+        |   |               |           |           |   `--EXPR -> EXPR [41:28]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [41:28]
+        |   |               |           |           `--RPAREN -> ) [41:31]
+        |   |               |           `--RPAREN -> ) [41:32]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [42:12]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there [42:13]
+        |   |               `--STRING_TEMPLATE_END -> " [42:19]
+        |   `--SEMI -> ; [42:20]
+        |--VARIABLE_DEF -> VARIABLE_DEF [45:4]
+        |   |--MODIFIERS -> MODIFIERS [45:4]
+        |   |--TYPE -> TYPE [45:4]
+        |   |   `--IDENT -> String [45:4]
+        |   |--IDENT -> result10 [45:11]
+        |   |--ASSIGN -> = [45:20]
+        |   |   `--EXPR -> EXPR [45:25]
+        |   |       `--DOT -> . [45:25]
+        |   |           |--IDENT -> STR [45:22]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [45:27]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [45:28]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [45:32]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [46:22]
+        |   |               |   `--PLUS -> + [46:22]
+        |   |               |       |--METHOD_CALL -> ( [46:13]
+        |   |               |       |   |--IDENT -> y [46:12]
+        |   |               |       |   |--ELIST -> ELIST [46:15]
+        |   |               |       |   |   `--EXPR -> EXPR [46:15]
+        |   |               |       |   |       `--METHOD_CALL -> ( [46:15]
+        |   |               |       |   |           |--IDENT -> y [46:14]
+        |   |               |       |   |           |--ELIST -> ELIST [46:16]
+        |   |               |       |   |           |   `--EXPR -> EXPR [46:16]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [46:16]
+        |   |               |       |   |           `--RPAREN -> ) [46:19]
+        |   |               |       |   `--RPAREN -> ) [46:20]
+        |   |               |       `--METHOD_CALL -> ( [46:25]
+        |   |               |           |--IDENT -> y [46:24]
+        |   |               |           |--ELIST -> ELIST [46:27]
+        |   |               |           |   `--EXPR -> EXPR [46:27]
+        |   |               |           |       `--METHOD_CALL -> ( [46:27]
+        |   |               |           |           |--IDENT -> y [46:26]
+        |   |               |           |           |--ELIST -> ELIST [46:28]
+        |   |               |           |           |   `--EXPR -> EXPR [46:28]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [46:28]
+        |   |               |           |           `--RPAREN -> ) [46:31]
+        |   |               |           `--RPAREN -> ) [46:32]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [47:12]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there  [47:13]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [47:20]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [49:12]
+        |   |               |   `--PLUS -> + [49:12]
+        |   |               |       |--PLUS -> + [48:22]
+        |   |               |       |   |--METHOD_CALL -> ( [48:13]
+        |   |               |       |   |   |--IDENT -> y [48:12]
+        |   |               |       |   |   |--ELIST -> ELIST [48:15]
+        |   |               |       |   |   |   `--EXPR -> EXPR [48:15]
+        |   |               |       |   |   |       `--METHOD_CALL -> ( [48:15]
+        |   |               |       |   |   |           |--IDENT -> y [48:14]
+        |   |               |       |   |   |           |--ELIST -> ELIST [48:16]
+        |   |               |       |   |   |           |   `--EXPR -> EXPR [48:16]
+        |   |               |       |   |   |           |       `--STRING_LITERAL -> "y" [48:16]
+        |   |               |       |   |   |           `--RPAREN -> ) [48:19]
+        |   |               |       |   |   `--RPAREN -> ) [48:20]
+        |   |               |       |   `--METHOD_CALL -> ( [48:25]
+        |   |               |       |       |--IDENT -> y [48:24]
+        |   |               |       |       |--ELIST -> ELIST [48:27]
+        |   |               |       |       |   `--EXPR -> EXPR [48:27]
+        |   |               |       |       |       `--METHOD_CALL -> ( [48:27]
+        |   |               |       |       |           |--IDENT -> y [48:26]
+        |   |               |       |       |           |--ELIST -> ELIST [48:28]
+        |   |               |       |       |           |   `--EXPR -> EXPR [48:28]
+        |   |               |       |       |           |       `--STRING_LITERAL -> "y" [48:28]
+        |   |               |       |       |           `--RPAREN -> ) [48:31]
+        |   |               |       |       `--RPAREN -> ) [48:32]
+        |   |               |       `--DOT -> . [49:17]
+        |   |               |           |--IDENT -> STR [49:14]
+        |   |               |           `--STRING_TEMPLATE_BEGIN -> " [49:18]
+        |   |               |               |--STRING_TEMPLATE_CONTENT -> x [49:19]
+        |   |               |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [49:20]
+        |   |               |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [49:23]
+        |   |               |               |   `--IDENT -> x [49:23]
+        |   |               |               |--EMBEDDED_EXPRESSION_END -> } [49:25]
+        |   |               |               |--STRING_TEMPLATE_CONTENT -> x [49:26]
+        |   |               |               `--STRING_TEMPLATE_END -> " [49:27]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [50:12]
+        |   |               `--STRING_TEMPLATE_END -> " [50:13]
+        |   `--SEMI -> ; [50:14]
+        |--VARIABLE_DEF -> VARIABLE_DEF [52:4]
+        |   |--MODIFIERS -> MODIFIERS [52:4]
+        |   |--TYPE -> TYPE [52:4]
+        |   |   `--IDENT -> String [52:4]
+        |   |--IDENT -> name [52:11]
+        |   |--ASSIGN -> = [52:16]
+        |   |   `--EXPR -> EXPR [52:18]
+        |   |       `--STRING_LITERAL -> "world" [52:18]
+        |   `--SEMI -> ; [52:25]
+        |--VARIABLE_DEF -> VARIABLE_DEF [53:4]
+        |   |--MODIFIERS -> MODIFIERS [53:4]
+        |   |--TYPE -> TYPE [53:4]
+        |   |   `--IDENT -> String [53:4]
+        |   |--IDENT -> s [53:11]
+        |   |--ASSIGN -> = [53:13]
+        |   |   `--EXPR -> EXPR [53:18]
+        |   |       `--DOT -> . [53:18]
+        |   |           |--IDENT -> STR [53:15]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [53:19]
+        |   |               |--STRING_TEMPLATE_CONTENT -> Hello,  [53:20]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [53:27]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [53:30]
+        |   |               |   `--IDENT -> name [53:30]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [53:35]
+        |   |               |--STRING_TEMPLATE_CONTENT -> ! [53:36]
+        |   |               `--STRING_TEMPLATE_END -> " [53:37]
+        |   `--SEMI -> ; [53:38]
+        |--METHOD_DEF -> METHOD_DEF [55:4]
+        |   |--MODIFIERS -> MODIFIERS [55:4]
+        |   |   |--LITERAL_PRIVATE -> private [55:4]
+        |   |   `--LITERAL_STATIC -> static [55:12]
+        |   |--TYPE -> TYPE [55:19]
+        |   |   `--IDENT -> String [55:19]
+        |   |--IDENT -> y [55:26]
+        |   |--LPAREN -> ( [55:27]
+        |   |--PARAMETERS -> PARAMETERS [55:28]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [55:28]
+        |   |       |--MODIFIERS -> MODIFIERS [55:28]
+        |   |       |--TYPE -> TYPE [55:28]
+        |   |       |   `--IDENT -> String [55:28]
+        |   |       `--IDENT -> y [55:35]
+        |   |--RPAREN -> ) [55:36]
+        |   `--SLIST -> { [55:38]
+        |       |--LITERAL_RETURN -> return [56:8]
+        |       |   |--EXPR -> EXPR [56:15]
+        |       |   |   `--STRING_LITERAL -> "y" [56:15]
+        |       |   `--SEMI -> ; [56:18]
+        |       `--RCURLY -> } [57:4]
+        |--METHOD_DEF -> METHOD_DEF [60:4]
+        |   |--MODIFIERS -> MODIFIERS [60:4]
+        |   |--TYPE -> TYPE [60:4]
+        |   |   `--LITERAL_VOID -> void [60:4]
+        |   |--IDENT -> x [60:9]
+        |   |--LPAREN -> ( [60:10]
+        |   |--PARAMETERS -> PARAMETERS [60:11]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [60:11]
+        |   |       |--MODIFIERS -> MODIFIERS [60:11]
+        |   |       |--TYPE -> TYPE [60:11]
+        |   |       |   |--IDENT -> List [60:11]
+        |   |       |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [60:15]
+        |   |       |       |--GENERIC_START -> < [60:15]
+        |   |       |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:16]
+        |   |       |       |   |--WILDCARD_TYPE -> ? [60:16]
+        |   |       |       |   `--TYPE_UPPER_BOUNDS -> extends [60:18]
+        |   |       |       |       `--DOT -> . [60:40]
+        |   |       |       |           |--IDENT -> StringTemplate [60:26]
+        |   |       |       |           |--IDENT -> Processor [60:41]
+        |   |       |       |           `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [60:50]
+        |   |       |       |               |--GENERIC_START -> < [60:50]
+        |   |       |       |               |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:51]
+        |   |       |       |               |   `--IDENT -> String [60:51]
+        |   |       |       |               |--COMMA -> , [60:57]
+        |   |       |       |               |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:59]
+        |   |       |       |               |   `--IDENT -> RuntimeException [60:59]
+        |   |       |       |               `--GENERIC_END -> > [60:75]
+        |   |       |       `--GENERIC_END -> > [60:76]
+        |   |       `--IDENT -> list [60:78]
+        |   |--RPAREN -> ) [60:82]
+        |   `--SLIST -> { [60:84]
+        |       |--EXPR -> EXPR [61:19]
+        |       |   `--DOT -> . [61:19]
+        |       |       |--METHOD_CALL -> ( [61:16]
+        |       |       |   |--DOT -> . [61:12]
+        |       |       |   |   |--IDENT -> list [61:8]
+        |       |       |   |   `--IDENT -> get [61:13]
+        |       |       |   |--ELIST -> ELIST [61:17]
+        |       |       |   |   `--EXPR -> EXPR [61:17]
+        |       |       |   |       `--NUM_INT -> 0 [61:17]
+        |       |       |   `--RPAREN -> ) [61:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [61:20]
+        |       |           |--STRING_TEMPLATE_CONTENT ->  [61:21]
+        |       |           `--STRING_TEMPLATE_END -> " [61:21]
+        |       |--SEMI -> ; [61:22]
+        |       |--EXPR -> EXPR [62:19]
+        |       |   `--DOT -> . [62:19]
+        |       |       |--METHOD_CALL -> ( [62:16]
+        |       |       |   |--DOT -> . [62:12]
+        |       |       |   |   |--IDENT -> list [62:8]
+        |       |       |   |   `--IDENT -> get [62:13]
+        |       |       |   |--ELIST -> ELIST [62:17]
+        |       |       |   |   `--EXPR -> EXPR [62:17]
+        |       |       |   |       `--NUM_INT -> 0 [62:17]
+        |       |       |   `--RPAREN -> ) [62:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [62:20]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [62:21]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [62:25]
+        |       |           `--STRING_TEMPLATE_END -> " [62:26]
+        |       |--SEMI -> ; [62:27]
+        |       |--EXPR -> EXPR [63:19]
+        |       |   `--DOT -> . [63:19]
+        |       |       |--METHOD_CALL -> ( [63:16]
+        |       |       |   |--DOT -> . [63:12]
+        |       |       |   |   |--IDENT -> list [63:8]
+        |       |       |   |   `--IDENT -> get [63:13]
+        |       |       |   |--ELIST -> ELIST [63:17]
+        |       |       |   |   `--EXPR -> EXPR [63:17]
+        |       |       |   |       `--NUM_INT -> 0 [63:17]
+        |       |       |   `--RPAREN -> ) [63:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [63:21]
+        |       |           |--STRING_TEMPLATE_CONTENT -> x [63:22]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [63:23]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [63:26]
+        |       |           |   `--IDENT -> x [63:26]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [63:28]
+        |       |           |--STRING_TEMPLATE_CONTENT -> x [63:29]
+        |       |           `--STRING_TEMPLATE_END -> " [63:30]
+        |       |--SEMI -> ; [63:31]
+        |       |--EXPR -> EXPR [64:19]
+        |       |   `--DOT -> . [64:19]
+        |       |       |--METHOD_CALL -> ( [64:16]
+        |       |       |   |--DOT -> . [64:12]
+        |       |       |   |   |--IDENT -> list [64:8]
+        |       |       |   |   `--IDENT -> get [64:13]
+        |       |       |   |--ELIST -> ELIST [64:17]
+        |       |       |   |   `--EXPR -> EXPR [64:17]
+        |       |       |   |       `--NUM_INT -> 0 [64:17]
+        |       |       |   `--RPAREN -> ) [64:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [64:21]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:22]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:23]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:26]
+        |       |           |   `--IDENT -> x [64:26]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:28]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:29]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:30]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:33]
+        |       |           |   `--IDENT -> y [64:33]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:35]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:36]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:37]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:40]
+        |       |           |   `--IDENT -> x [64:40]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:42]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:43]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:44]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:46]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:47]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:48]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:50]
+        |       |           `--STRING_TEMPLATE_END -> " [64:51]
+        |       |--SEMI -> ; [64:52]
+        |       `--RCURLY -> } [65:4]
+        `--RCURLY -> } [66:0]
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateBasicWithTabs.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateBasicWithTabs.txt
new file mode 100644
index 00000000000..ecbb0b3520b
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateBasicWithTabs.txt
@@ -0,0 +1,564 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [2:47]
+|   |--DOT -> . [2:47]
+|   |   |--DOT -> . [2:39]
+|   |   |   |--DOT -> . [2:28]
+|   |   |   |   |--DOT -> . [2:22]
+|   |   |   |   |   |--DOT -> . [2:11]
+|   |   |   |   |   |   |--IDENT -> com [2:8]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [2:12]
+|   |   |   |   |   `--IDENT -> tools [2:23]
+|   |   |   |   `--IDENT -> checkstyle [2:29]
+|   |   |   `--IDENT -> grammar [2:40]
+|   |   `--IDENT -> java21 [2:48]
+|   `--SEMI -> ; [2:54]
+|--IMPORT -> import [4:0]
+|   |--DOT -> . [4:16]
+|   |   |--DOT -> . [4:11]
+|   |   |   |--IDENT -> java [4:7]
+|   |   |   `--IDENT -> util [4:12]
+|   |   `--IDENT -> List [4:17]
+|   `--SEMI -> ; [4:21]
+`--CLASS_DEF -> CLASS_DEF [6:0]
+    |--MODIFIERS -> MODIFIERS [6:0]
+    |   `--LITERAL_PUBLIC -> public [6:0]
+    |--LITERAL_CLASS -> class [6:7]
+    |--IDENT -> InputStringTemplateBasicWithTabs [6:13]
+    `--OBJBLOCK -> OBJBLOCK [6:46]
+        |--LCURLY -> { [6:46]
+        |--VARIABLE_DEF -> VARIABLE_DEF [7:1]
+        |   |--MODIFIERS -> MODIFIERS [7:1]
+        |   |--TYPE -> TYPE [7:1]
+        |   |   `--LITERAL_INT -> int [7:1]
+        |   |--IDENT -> x [7:5]
+        |   |--ASSIGN -> = [7:7]
+        |   |   `--EXPR -> EXPR [7:9]
+        |   |       `--NUM_INT -> 10 [7:9]
+        |   `--SEMI -> ; [7:11]
+        |--VARIABLE_DEF -> VARIABLE_DEF [8:1]
+        |   |--MODIFIERS -> MODIFIERS [8:1]
+        |   |--TYPE -> TYPE [8:1]
+        |   |   `--LITERAL_INT -> int [8:1]
+        |   |--IDENT -> y [8:5]
+        |   |--ASSIGN -> = [8:7]
+        |   |   `--EXPR -> EXPR [8:9]
+        |   |       `--NUM_INT -> 20 [8:9]
+        |   `--SEMI -> ; [8:11]
+        |--VARIABLE_DEF -> VARIABLE_DEF [11:1]
+        |   |--MODIFIERS -> MODIFIERS [11:1]
+        |   |--TYPE -> TYPE [11:1]
+        |   |   `--IDENT -> String [11:1]
+        |   |--IDENT -> result1 [11:8]
+        |   |--ASSIGN -> = [11:16]
+        |   |   `--EXPR -> EXPR [11:21]
+        |   |       `--DOT -> . [11:21]
+        |   |           |--IDENT -> STR [11:18]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [11:22]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  [11:23]
+        |   |               `--STRING_TEMPLATE_END -> " [11:23]
+        |   `--SEMI -> ; [11:24]
+        |--VARIABLE_DEF -> VARIABLE_DEF [13:1]
+        |   |--MODIFIERS -> MODIFIERS [13:1]
+        |   |--TYPE -> TYPE [13:1]
+        |   |   `--IDENT -> String [13:1]
+        |   |--IDENT -> result1_1 [13:8]
+        |   |--ASSIGN -> = [13:18]
+        |   |   `--EXPR -> EXPR [13:23]
+        |   |       `--DOT -> . [13:23]
+        |   |           |--IDENT -> STR [13:20]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [13:24]
+        |   |               |--STRING_TEMPLATE_CONTENT -> Hello world! [13:25]
+        |   |               `--STRING_TEMPLATE_END -> " [13:37]
+        |   `--SEMI -> ; [13:38]
+        |--VARIABLE_DEF -> VARIABLE_DEF [16:1]
+        |   |--MODIFIERS -> MODIFIERS [16:1]
+        |   |--TYPE -> TYPE [16:1]
+        |   |   `--IDENT -> String [16:1]
+        |   |--IDENT -> result1_2 [16:8]
+        |   |--ASSIGN -> = [16:18]
+        |   |   `--EXPR -> EXPR [16:23]
+        |   |       `--DOT -> . [16:23]
+        |   |           |--IDENT -> STR [16:20]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [16:24]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [16:25]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [16:29]
+        |   |               `--STRING_TEMPLATE_END -> " [16:30]
+        |   `--SEMI -> ; [16:31]
+        |--VARIABLE_DEF -> VARIABLE_DEF [19:1]
+        |   |--MODIFIERS -> MODIFIERS [19:1]
+        |   |--TYPE -> TYPE [19:1]
+        |   |   `--IDENT -> String [19:1]
+        |   |--IDENT -> result2 [19:8]
+        |   |--ASSIGN -> = [19:16]
+        |   |   `--EXPR -> EXPR [19:21]
+        |   |       `--DOT -> . [19:21]
+        |   |           |--IDENT -> STR [19:18]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [19:23]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [19:24]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [19:25]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [19:28]
+        |   |               |   `--IDENT -> x [19:28]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [19:30]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [19:31]
+        |   |               `--STRING_TEMPLATE_END -> " [19:32]
+        |   `--SEMI -> ; [19:33]
+        |--VARIABLE_DEF -> VARIABLE_DEF [22:1]
+        |   |--MODIFIERS -> MODIFIERS [22:1]
+        |   |--TYPE -> TYPE [22:1]
+        |   |   `--IDENT -> String [22:1]
+        |   |--IDENT -> result3 [22:8]
+        |   |--ASSIGN -> = [22:16]
+        |   |   `--EXPR -> EXPR [22:21]
+        |   |       `--DOT -> . [22:21]
+        |   |           |--IDENT -> STR [22:18]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [22:23]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [22:24]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [22:28]
+        |   |               |   `--METHOD_CALL -> ( [22:28]
+        |   |               |       |--IDENT -> y [22:27]
+        |   |               |       |--ELIST -> ELIST [22:30]
+        |   |               |       |   `--EXPR -> EXPR [22:30]
+        |   |               |       |       `--METHOD_CALL -> ( [22:30]
+        |   |               |       |           |--IDENT -> y [22:29]
+        |   |               |       |           |--ELIST -> ELIST [22:31]
+        |   |               |       |           |   `--EXPR -> EXPR [22:31]
+        |   |               |       |           |       `--STRING_LITERAL -> "y" [22:31]
+        |   |               |       |           `--RPAREN -> ) [22:34]
+        |   |               |       `--RPAREN -> ) [22:35]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [22:37]
+        |   |               `--STRING_TEMPLATE_END -> " [22:38]
+        |   `--SEMI -> ; [22:39]
+        |--VARIABLE_DEF -> VARIABLE_DEF [25:1]
+        |   |--MODIFIERS -> MODIFIERS [25:1]
+        |   |--TYPE -> TYPE [25:1]
+        |   |   `--IDENT -> String [25:1]
+        |   |--IDENT -> result4 [25:8]
+        |   |--ASSIGN -> = [25:16]
+        |   |   `--EXPR -> EXPR [25:33]
+        |   |       `--PLUS -> + [25:33]
+        |   |           |--DOT -> . [25:21]
+        |   |           |   |--IDENT -> STR [25:18]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [25:23]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [25:24]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [25:27]
+        |   |           |       |   `--IDENT -> x [25:27]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [25:29]
+        |   |           |       `--STRING_TEMPLATE_END -> " [25:30]
+        |   |           `--DOT -> . [25:38]
+        |   |               |--IDENT -> STR [25:35]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [25:40]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [25:41]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [25:44]
+        |   |                   |   `--IDENT -> y [25:44]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [25:46]
+        |   |                   `--STRING_TEMPLATE_END -> " [25:47]
+        |   `--SEMI -> ; [25:48]
+        |--VARIABLE_DEF -> VARIABLE_DEF [28:1]
+        |   |--MODIFIERS -> MODIFIERS [28:1]
+        |   |--TYPE -> TYPE [28:1]
+        |   |   `--IDENT -> String [28:1]
+        |   |--IDENT -> result5 [28:8]
+        |   |--ASSIGN -> = [28:16]
+        |   |   `--EXPR -> EXPR [28:41]
+        |   |       `--PLUS -> + [28:41]
+        |   |           |--DOT -> . [28:21]
+        |   |           |   |--IDENT -> STR [28:18]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [28:23]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [28:24]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [28:28]
+        |   |           |       |   `--METHOD_CALL -> ( [28:28]
+        |   |           |       |       |--IDENT -> y [28:27]
+        |   |           |       |       |--ELIST -> ELIST [28:30]
+        |   |           |       |       |   `--EXPR -> EXPR [28:30]
+        |   |           |       |       |       `--METHOD_CALL -> ( [28:30]
+        |   |           |       |       |           |--IDENT -> y [28:29]
+        |   |           |       |       |           |--ELIST -> ELIST [28:31]
+        |   |           |       |       |           |   `--EXPR -> EXPR [28:31]
+        |   |           |       |       |           |       `--STRING_LITERAL -> "y" [28:31]
+        |   |           |       |       |           `--RPAREN -> ) [28:34]
+        |   |           |       |       `--RPAREN -> ) [28:35]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [28:37]
+        |   |           |       `--STRING_TEMPLATE_END -> " [28:38]
+        |   |           `--DOT -> . [28:46]
+        |   |               |--IDENT -> STR [28:43]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [28:48]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [28:49]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [28:53]
+        |   |                   |   `--METHOD_CALL -> ( [28:53]
+        |   |                   |       |--IDENT -> y [28:52]
+        |   |                   |       |--ELIST -> ELIST [28:55]
+        |   |                   |       |   `--EXPR -> EXPR [28:55]
+        |   |                   |       |       `--METHOD_CALL -> ( [28:55]
+        |   |                   |       |           |--IDENT -> y [28:54]
+        |   |                   |       |           |--ELIST -> ELIST [28:56]
+        |   |                   |       |           |   `--EXPR -> EXPR [28:56]
+        |   |                   |       |           |       `--STRING_LITERAL -> "y" [28:56]
+        |   |                   |       |           `--RPAREN -> ) [28:59]
+        |   |                   |       `--RPAREN -> ) [28:60]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [28:62]
+        |   |                   `--STRING_TEMPLATE_END -> " [28:63]
+        |   `--SEMI -> ; [28:64]
+        |--VARIABLE_DEF -> VARIABLE_DEF [31:1]
+        |   |--MODIFIERS -> MODIFIERS [31:1]
+        |   |--TYPE -> TYPE [31:1]
+        |   |   `--IDENT -> String [31:1]
+        |   |--IDENT -> result6 [31:8]
+        |   |--ASSIGN -> = [31:16]
+        |   |   `--EXPR -> EXPR [31:33]
+        |   |       `--PLUS -> + [31:33]
+        |   |           |--DOT -> . [31:21]
+        |   |           |   |--IDENT -> STR [31:18]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [31:23]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [31:24]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [31:27]
+        |   |           |       |   `--IDENT -> x [31:27]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [31:29]
+        |   |           |       `--STRING_TEMPLATE_END -> " [31:30]
+        |   |           `--DOT -> . [31:38]
+        |   |               |--IDENT -> STR [31:35]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [31:40]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [31:41]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [31:44]
+        |   |                   |   `--IDENT -> y [31:44]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [31:46]
+        |   |                   `--STRING_TEMPLATE_END -> " [31:47]
+        |   `--SEMI -> ; [31:48]
+        |--VARIABLE_DEF -> VARIABLE_DEF [34:1]
+        |   |--MODIFIERS -> MODIFIERS [34:1]
+        |   |--TYPE -> TYPE [34:1]
+        |   |   `--IDENT -> String [34:1]
+        |   |--IDENT -> result7 [34:8]
+        |   |--ASSIGN -> = [34:16]
+        |   |   `--EXPR -> EXPR [34:21]
+        |   |       `--DOT -> . [34:21]
+        |   |           |--IDENT -> STR [34:18]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [34:23]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [34:24]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [34:29]
+        |   |               |   `--PLUS -> + [34:29]
+        |   |               |       |--IDENT -> x [34:27]
+        |   |               |       `--IDENT -> y [34:31]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [34:33]
+        |   |               `--STRING_TEMPLATE_END -> " [34:34]
+        |   `--SEMI -> ; [34:35]
+        |--VARIABLE_DEF -> VARIABLE_DEF [37:1]
+        |   |--MODIFIERS -> MODIFIERS [37:1]
+        |   |--TYPE -> TYPE [37:1]
+        |   |   `--IDENT -> String [37:1]
+        |   |--IDENT -> result8 [37:8]
+        |   |--ASSIGN -> = [37:16]
+        |   |   `--EXPR -> EXPR [37:21]
+        |   |       `--DOT -> . [37:21]
+        |   |           |--IDENT -> STR [37:18]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [37:23]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [37:24]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [37:28]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [37:41]
+        |   |               |   `--PLUS -> + [37:41]
+        |   |               |       |--METHOD_CALL -> ( [37:32]
+        |   |               |       |   |--IDENT -> y [37:31]
+        |   |               |       |   |--ELIST -> ELIST [37:34]
+        |   |               |       |   |   `--EXPR -> EXPR [37:34]
+        |   |               |       |   |       `--METHOD_CALL -> ( [37:34]
+        |   |               |       |   |           |--IDENT -> y [37:33]
+        |   |               |       |   |           |--ELIST -> ELIST [37:35]
+        |   |               |       |   |           |   `--EXPR -> EXPR [37:35]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [37:35]
+        |   |               |       |   |           `--RPAREN -> ) [37:38]
+        |   |               |       |   `--RPAREN -> ) [37:39]
+        |   |               |       `--METHOD_CALL -> ( [37:44]
+        |   |               |           |--IDENT -> y [37:43]
+        |   |               |           |--ELIST -> ELIST [37:46]
+        |   |               |           |   `--EXPR -> EXPR [37:46]
+        |   |               |           |       `--METHOD_CALL -> ( [37:46]
+        |   |               |           |           |--IDENT -> y [37:45]
+        |   |               |           |           |--ELIST -> ELIST [37:47]
+        |   |               |           |           |   `--EXPR -> EXPR [37:47]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [37:47]
+        |   |               |           |           `--RPAREN -> ) [37:50]
+        |   |               |           `--RPAREN -> ) [37:51]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [37:53]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there [37:54]
+        |   |               `--STRING_TEMPLATE_END -> " [37:60]
+        |   `--SEMI -> ; [37:61]
+        |--VARIABLE_DEF -> VARIABLE_DEF [40:1]
+        |   |--MODIFIERS -> MODIFIERS [40:1]
+        |   |--TYPE -> TYPE [40:1]
+        |   |   `--IDENT -> String [40:1]
+        |   |--IDENT -> result9 [40:8]
+        |   |--ASSIGN -> = [40:16]
+        |   |   `--EXPR -> EXPR [40:21]
+        |   |       `--DOT -> . [40:21]
+        |   |           |--IDENT -> STR [40:18]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [40:23]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [40:24]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [40:28]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [41:13]
+        |   |               |   `--PLUS -> + [41:13]
+        |   |               |       |--METHOD_CALL -> ( [41:4]
+        |   |               |       |   |--IDENT -> y [41:3]
+        |   |               |       |   |--ELIST -> ELIST [41:6]
+        |   |               |       |   |   `--EXPR -> EXPR [41:6]
+        |   |               |       |   |       `--METHOD_CALL -> ( [41:6]
+        |   |               |       |   |           |--IDENT -> y [41:5]
+        |   |               |       |   |           |--ELIST -> ELIST [41:7]
+        |   |               |       |   |           |   `--EXPR -> EXPR [41:7]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [41:7]
+        |   |               |       |   |           `--RPAREN -> ) [41:10]
+        |   |               |       |   `--RPAREN -> ) [41:11]
+        |   |               |       `--METHOD_CALL -> ( [41:16]
+        |   |               |           |--IDENT -> y [41:15]
+        |   |               |           |--ELIST -> ELIST [41:18]
+        |   |               |           |   `--EXPR -> EXPR [41:18]
+        |   |               |           |       `--METHOD_CALL -> ( [41:18]
+        |   |               |           |           |--IDENT -> y [41:17]
+        |   |               |           |           |--ELIST -> ELIST [41:19]
+        |   |               |           |           |   `--EXPR -> EXPR [41:19]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [41:19]
+        |   |               |           |           `--RPAREN -> ) [41:22]
+        |   |               |           `--RPAREN -> ) [41:23]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [42:3]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there [42:4]
+        |   |               `--STRING_TEMPLATE_END -> " [42:10]
+        |   `--SEMI -> ; [42:11]
+        |--VARIABLE_DEF -> VARIABLE_DEF [45:1]
+        |   |--MODIFIERS -> MODIFIERS [45:1]
+        |   |--TYPE -> TYPE [45:1]
+        |   |   `--IDENT -> String [45:1]
+        |   |--IDENT -> result10 [45:8]
+        |   |--ASSIGN -> = [45:17]
+        |   |   `--EXPR -> EXPR [45:22]
+        |   |       `--DOT -> . [45:22]
+        |   |           |--IDENT -> STR [45:19]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [45:24]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [45:25]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [45:29]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [46:13]
+        |   |               |   `--PLUS -> + [46:13]
+        |   |               |       |--METHOD_CALL -> ( [46:4]
+        |   |               |       |   |--IDENT -> y [46:3]
+        |   |               |       |   |--ELIST -> ELIST [46:6]
+        |   |               |       |   |   `--EXPR -> EXPR [46:6]
+        |   |               |       |   |       `--METHOD_CALL -> ( [46:6]
+        |   |               |       |   |           |--IDENT -> y [46:5]
+        |   |               |       |   |           |--ELIST -> ELIST [46:7]
+        |   |               |       |   |           |   `--EXPR -> EXPR [46:7]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [46:7]
+        |   |               |       |   |           `--RPAREN -> ) [46:10]
+        |   |               |       |   `--RPAREN -> ) [46:11]
+        |   |               |       `--METHOD_CALL -> ( [46:16]
+        |   |               |           |--IDENT -> y [46:15]
+        |   |               |           |--ELIST -> ELIST [46:18]
+        |   |               |           |   `--EXPR -> EXPR [46:18]
+        |   |               |           |       `--METHOD_CALL -> ( [46:18]
+        |   |               |           |           |--IDENT -> y [46:17]
+        |   |               |           |           |--ELIST -> ELIST [46:19]
+        |   |               |           |           |   `--EXPR -> EXPR [46:19]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [46:19]
+        |   |               |           |           `--RPAREN -> ) [46:22]
+        |   |               |           `--RPAREN -> ) [46:23]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [47:3]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there  [47:4]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [47:11]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [49:3]
+        |   |               |   `--PLUS -> + [49:3]
+        |   |               |       |--PLUS -> + [48:13]
+        |   |               |       |   |--METHOD_CALL -> ( [48:4]
+        |   |               |       |   |   |--IDENT -> y [48:3]
+        |   |               |       |   |   |--ELIST -> ELIST [48:6]
+        |   |               |       |   |   |   `--EXPR -> EXPR [48:6]
+        |   |               |       |   |   |       `--METHOD_CALL -> ( [48:6]
+        |   |               |       |   |   |           |--IDENT -> y [48:5]
+        |   |               |       |   |   |           |--ELIST -> ELIST [48:7]
+        |   |               |       |   |   |           |   `--EXPR -> EXPR [48:7]
+        |   |               |       |   |   |           |       `--STRING_LITERAL -> "y" [48:7]
+        |   |               |       |   |   |           `--RPAREN -> ) [48:10]
+        |   |               |       |   |   `--RPAREN -> ) [48:11]
+        |   |               |       |   `--METHOD_CALL -> ( [48:16]
+        |   |               |       |       |--IDENT -> y [48:15]
+        |   |               |       |       |--ELIST -> ELIST [48:18]
+        |   |               |       |       |   `--EXPR -> EXPR [48:18]
+        |   |               |       |       |       `--METHOD_CALL -> ( [48:18]
+        |   |               |       |       |           |--IDENT -> y [48:17]
+        |   |               |       |       |           |--ELIST -> ELIST [48:19]
+        |   |               |       |       |           |   `--EXPR -> EXPR [48:19]
+        |   |               |       |       |           |       `--STRING_LITERAL -> "y" [48:19]
+        |   |               |       |       |           `--RPAREN -> ) [48:22]
+        |   |               |       |       `--RPAREN -> ) [48:23]
+        |   |               |       `--DOT -> . [49:8]
+        |   |               |           |--IDENT -> STR [49:5]
+        |   |               |           `--STRING_TEMPLATE_BEGIN -> " [49:9]
+        |   |               |               |--STRING_TEMPLATE_CONTENT -> x [49:10]
+        |   |               |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [49:11]
+        |   |               |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [49:14]
+        |   |               |               |   `--IDENT -> x [49:14]
+        |   |               |               |--EMBEDDED_EXPRESSION_END -> } [49:16]
+        |   |               |               |--STRING_TEMPLATE_CONTENT -> x [49:17]
+        |   |               |               `--STRING_TEMPLATE_END -> " [49:18]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [50:3]
+        |   |               `--STRING_TEMPLATE_END -> " [50:4]
+        |   `--SEMI -> ; [50:5]
+        |--VARIABLE_DEF -> VARIABLE_DEF [52:1]
+        |   |--MODIFIERS -> MODIFIERS [52:1]
+        |   |--TYPE -> TYPE [52:1]
+        |   |   `--IDENT -> String [52:1]
+        |   |--IDENT -> name [52:8]
+        |   |--ASSIGN -> = [52:13]
+        |   |   `--EXPR -> EXPR [52:15]
+        |   |       `--STRING_LITERAL -> "world" [52:15]
+        |   `--SEMI -> ; [52:22]
+        |--VARIABLE_DEF -> VARIABLE_DEF [53:1]
+        |   |--MODIFIERS -> MODIFIERS [53:1]
+        |   |--TYPE -> TYPE [53:1]
+        |   |   `--IDENT -> String [53:1]
+        |   |--IDENT -> s [53:8]
+        |   |--ASSIGN -> = [53:10]
+        |   |   `--EXPR -> EXPR [53:15]
+        |   |       `--DOT -> . [53:15]
+        |   |           |--IDENT -> STR [53:12]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [53:16]
+        |   |               |--STRING_TEMPLATE_CONTENT -> Hello,  [53:17]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [53:24]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [53:27]
+        |   |               |   `--IDENT -> name [53:27]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [53:32]
+        |   |               |--STRING_TEMPLATE_CONTENT -> ! [53:33]
+        |   |               `--STRING_TEMPLATE_END -> " [53:34]
+        |   `--SEMI -> ; [53:35]
+        |--METHOD_DEF -> METHOD_DEF [55:1]
+        |   |--MODIFIERS -> MODIFIERS [55:1]
+        |   |   |--LITERAL_PRIVATE -> private [55:1]
+        |   |   `--LITERAL_STATIC -> static [55:9]
+        |   |--TYPE -> TYPE [55:16]
+        |   |   `--IDENT -> String [55:16]
+        |   |--IDENT -> y [55:23]
+        |   |--LPAREN -> ( [55:24]
+        |   |--PARAMETERS -> PARAMETERS [55:25]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [55:25]
+        |   |       |--MODIFIERS -> MODIFIERS [55:25]
+        |   |       |--TYPE -> TYPE [55:25]
+        |   |       |   `--IDENT -> String [55:25]
+        |   |       `--IDENT -> y [55:32]
+        |   |--RPAREN -> ) [55:33]
+        |   `--SLIST -> { [55:35]
+        |       |--LITERAL_RETURN -> return [56:2]
+        |       |   |--EXPR -> EXPR [56:9]
+        |       |   |   `--STRING_LITERAL -> "y" [56:9]
+        |       |   `--SEMI -> ; [56:12]
+        |       `--RCURLY -> } [57:1]
+        |--METHOD_DEF -> METHOD_DEF [60:1]
+        |   |--MODIFIERS -> MODIFIERS [60:1]
+        |   |--TYPE -> TYPE [60:1]
+        |   |   `--LITERAL_VOID -> void [60:1]
+        |   |--IDENT -> x [60:6]
+        |   |--LPAREN -> ( [60:7]
+        |   |--PARAMETERS -> PARAMETERS [60:8]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [60:8]
+        |   |       |--MODIFIERS -> MODIFIERS [60:8]
+        |   |       |--TYPE -> TYPE [60:8]
+        |   |       |   |--IDENT -> List [60:8]
+        |   |       |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [60:12]
+        |   |       |       |--GENERIC_START -> < [60:12]
+        |   |       |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:13]
+        |   |       |       |   |--WILDCARD_TYPE -> ? [60:13]
+        |   |       |       |   `--TYPE_UPPER_BOUNDS -> extends [60:15]
+        |   |       |       |       `--DOT -> . [60:37]
+        |   |       |       |           |--IDENT -> StringTemplate [60:23]
+        |   |       |       |           |--IDENT -> Processor [60:38]
+        |   |       |       |           `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [60:47]
+        |   |       |       |               |--GENERIC_START -> < [60:47]
+        |   |       |       |               |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:48]
+        |   |       |       |               |   `--IDENT -> String [60:48]
+        |   |       |       |               |--COMMA -> , [60:54]
+        |   |       |       |               |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:56]
+        |   |       |       |               |   `--IDENT -> RuntimeException [60:56]
+        |   |       |       |               `--GENERIC_END -> > [60:72]
+        |   |       |       `--GENERIC_END -> > [60:73]
+        |   |       `--IDENT -> list [60:75]
+        |   |--RPAREN -> ) [60:79]
+        |   `--SLIST -> { [60:81]
+        |       |--EXPR -> EXPR [61:13]
+        |       |   `--DOT -> . [61:13]
+        |       |       |--METHOD_CALL -> ( [61:10]
+        |       |       |   |--DOT -> . [61:6]
+        |       |       |   |   |--IDENT -> list [61:2]
+        |       |       |   |   `--IDENT -> get [61:7]
+        |       |       |   |--ELIST -> ELIST [61:11]
+        |       |       |   |   `--EXPR -> EXPR [61:11]
+        |       |       |   |       `--NUM_INT -> 0 [61:11]
+        |       |       |   `--RPAREN -> ) [61:12]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [61:14]
+        |       |           |--STRING_TEMPLATE_CONTENT ->  [61:15]
+        |       |           `--STRING_TEMPLATE_END -> " [61:15]
+        |       |--SEMI -> ; [61:16]
+        |       |--EXPR -> EXPR [62:13]
+        |       |   `--DOT -> . [62:13]
+        |       |       |--METHOD_CALL -> ( [62:10]
+        |       |       |   |--DOT -> . [62:6]
+        |       |       |   |   |--IDENT -> list [62:2]
+        |       |       |   |   `--IDENT -> get [62:7]
+        |       |       |   |--ELIST -> ELIST [62:11]
+        |       |       |   |   `--EXPR -> EXPR [62:11]
+        |       |       |   |       `--NUM_INT -> 0 [62:11]
+        |       |       |   `--RPAREN -> ) [62:12]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [62:14]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [62:15]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [62:19]
+        |       |           `--STRING_TEMPLATE_END -> " [62:20]
+        |       |--SEMI -> ; [62:21]
+        |       |--EXPR -> EXPR [63:13]
+        |       |   `--DOT -> . [63:13]
+        |       |       |--METHOD_CALL -> ( [63:10]
+        |       |       |   |--DOT -> . [63:6]
+        |       |       |   |   |--IDENT -> list [63:2]
+        |       |       |   |   `--IDENT -> get [63:7]
+        |       |       |   |--ELIST -> ELIST [63:11]
+        |       |       |   |   `--EXPR -> EXPR [63:11]
+        |       |       |   |       `--NUM_INT -> 0 [63:11]
+        |       |       |   `--RPAREN -> ) [63:12]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [63:15]
+        |       |           |--STRING_TEMPLATE_CONTENT -> x [63:16]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [63:17]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [63:20]
+        |       |           |   `--IDENT -> x [63:20]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [63:22]
+        |       |           |--STRING_TEMPLATE_CONTENT -> x [63:23]
+        |       |           `--STRING_TEMPLATE_END -> " [63:24]
+        |       |--SEMI -> ; [63:25]
+        |       |--EXPR -> EXPR [64:13]
+        |       |   `--DOT -> . [64:13]
+        |       |       |--METHOD_CALL -> ( [64:10]
+        |       |       |   |--DOT -> . [64:6]
+        |       |       |   |   |--IDENT -> list [64:2]
+        |       |       |   |   `--IDENT -> get [64:7]
+        |       |       |   |--ELIST -> ELIST [64:11]
+        |       |       |   |   `--EXPR -> EXPR [64:11]
+        |       |       |   |       `--NUM_INT -> 0 [64:11]
+        |       |       |   `--RPAREN -> ) [64:12]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [64:15]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:16]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:17]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:20]
+        |       |           |   `--IDENT -> x [64:20]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:22]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:23]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:24]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:27]
+        |       |           |   `--IDENT -> y [64:27]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:29]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:30]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:31]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:34]
+        |       |           |   `--IDENT -> x [64:34]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:36]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:37]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:38]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:40]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:41]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:42]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:44]
+        |       |           `--STRING_TEMPLATE_END -> " [64:45]
+        |       |--SEMI -> ; [64:46]
+        |       `--RCURLY -> } [65:1]
+        `--RCURLY -> } [66:0]
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateMultiLineWithComments.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateMultiLineWithComments.txt
new file mode 100644
index 00000000000..ccf1062f6b3
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateMultiLineWithComments.txt
@@ -0,0 +1,628 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--SINGLE_LINE_COMMENT -> // [1:0]
+|   `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java21\n [1:2]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [2:47]
+|   |--DOT -> . [2:47]
+|   |   |--DOT -> . [2:39]
+|   |   |   |--DOT -> . [2:28]
+|   |   |   |   |--DOT -> . [2:22]
+|   |   |   |   |   |--DOT -> . [2:11]
+|   |   |   |   |   |   |--IDENT -> com [2:8]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [2:12]
+|   |   |   |   |   `--IDENT -> tools [2:23]
+|   |   |   |   `--IDENT -> checkstyle [2:29]
+|   |   |   `--IDENT -> grammar [2:40]
+|   |   `--IDENT -> java21 [2:48]
+|   `--SEMI -> ; [2:54]
+|--IMPORT -> import [4:0]
+|   |--DOT -> . [4:16]
+|   |   |--DOT -> . [4:11]
+|   |   |   |--IDENT -> java [4:7]
+|   |   |   `--IDENT -> util [4:12]
+|   |   `--IDENT -> List [4:17]
+|   `--SEMI -> ; [4:21]
+`--CLASS_DEF -> CLASS_DEF [6:0]
+    |--MODIFIERS -> MODIFIERS [6:0]
+    |   `--LITERAL_PUBLIC -> public [6:0]
+    |--LITERAL_CLASS -> class [6:7]
+    |--IDENT -> InputStringTemplateMultiLineWithComments [6:13]
+    `--OBJBLOCK -> OBJBLOCK [6:54]
+        |--LCURLY -> { [6:54]
+        |--VARIABLE_DEF -> VARIABLE_DEF [7:4]
+        |   |--MODIFIERS -> MODIFIERS [7:4]
+        |   |--TYPE -> TYPE [7:4]
+        |   |   `--LITERAL_INT -> int [7:4]
+        |   |--IDENT -> x [7:8]
+        |   |--ASSIGN -> = [7:10]
+        |   |   `--EXPR -> EXPR [7:12]
+        |   |       `--NUM_INT -> 10 [7:12]
+        |   `--SEMI -> ; [7:14]
+        |--VARIABLE_DEF -> VARIABLE_DEF [8:4]
+        |   |--MODIFIERS -> MODIFIERS [8:4]
+        |   |--TYPE -> TYPE [8:4]
+        |   |   `--LITERAL_INT -> int [8:4]
+        |   |--IDENT -> y [8:8]
+        |   |--ASSIGN -> = [8:10]
+        |   |   `--EXPR -> EXPR [8:12]
+        |   |       `--NUM_INT -> 20 [8:12]
+        |   `--SEMI -> ; [8:14]
+        |--VARIABLE_DEF -> VARIABLE_DEF [11:4]
+        |   |--MODIFIERS -> MODIFIERS [11:4]
+        |   |--TYPE -> TYPE [11:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [10:4]
+        |   |   |   `--COMMENT_CONTENT ->  most basic example, empty string template expression\n [10:6]
+        |   |   `--IDENT -> String [11:4]
+        |   |--IDENT -> result1 [11:11]
+        |   |--ASSIGN -> = [11:19]
+        |   |   `--EXPR -> EXPR [11:24]
+        |   |       `--DOT -> . [11:24]
+        |   |           |--IDENT -> STR [11:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [11:25]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  [11:26]
+        |   |               `--STRING_TEMPLATE_END -> " [11:26]
+        |   `--SEMI -> ; [11:27]
+        |--VARIABLE_DEF -> VARIABLE_DEF [13:4]
+        |   |--MODIFIERS -> MODIFIERS [13:4]
+        |   |--TYPE -> TYPE [13:4]
+        |   |   `--IDENT -> String [13:4]
+        |   |--IDENT -> result1_1 [13:11]
+        |   |--ASSIGN -> = [13:21]
+        |   |   `--EXPR -> EXPR [13:26]
+        |   |       `--DOT -> . [13:26]
+        |   |           |--IDENT -> STR [13:23]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [13:27]
+        |   |               |--STRING_TEMPLATE_CONTENT -> Hello world! [13:28]
+        |   |               `--STRING_TEMPLATE_END -> " [13:40]
+        |   `--SEMI -> ; [13:41]
+        |--VARIABLE_DEF -> VARIABLE_DEF [16:4]
+        |   |--MODIFIERS -> MODIFIERS [16:4]
+        |   |--TYPE -> TYPE [16:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [15:4]
+        |   |   |   `--COMMENT_CONTENT ->  no content, no expression\n [15:6]
+        |   |   `--IDENT -> String [16:4]
+        |   |--IDENT -> result1_2 [16:11]
+        |   |--ASSIGN -> = [16:21]
+        |   |   `--EXPR -> EXPR [16:26]
+        |   |       `--DOT -> . [16:26]
+        |   |           |--IDENT -> STR [16:23]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [16:27]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [16:28]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [16:32]
+        |   |               `--STRING_TEMPLATE_END -> " [16:33]
+        |   `--SEMI -> ; [16:34]
+        |--VARIABLE_DEF -> VARIABLE_DEF [19:4]
+        |   |--MODIFIERS -> MODIFIERS [19:4]
+        |   |--TYPE -> TYPE [19:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [18:4]
+        |   |   |   `--COMMENT_CONTENT ->  simple single value interpolation\n [18:6]
+        |   |   `--IDENT -> String [19:4]
+        |   |--IDENT -> result2 [19:11]
+        |   |--ASSIGN -> = [19:19]
+        |   |   `--EXPR -> EXPR [19:24]
+        |   |       `--DOT -> . [19:24]
+        |   |           |--IDENT -> STR [19:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [19:26]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [19:27]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [19:28]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [19:31]
+        |   |               |   `--IDENT -> x [19:31]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [19:33]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [19:34]
+        |   |               `--STRING_TEMPLATE_END -> " [19:35]
+        |   `--SEMI -> ; [19:36]
+        |--VARIABLE_DEF -> VARIABLE_DEF [22:4]
+        |   |--MODIFIERS -> MODIFIERS [22:4]
+        |   |--TYPE -> TYPE [22:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [19:38]
+        |   |   |   `--COMMENT_CONTENT ->  comment\n [19:40]
+        |   |   |--SINGLE_LINE_COMMENT -> // [21:4]
+        |   |   |   `--COMMENT_CONTENT ->  simple single value interpolation with a method call\n [21:6]
+        |   |   `--IDENT -> String [22:4]
+        |   |--IDENT -> result3 [22:11]
+        |   |--ASSIGN -> = [22:19]
+        |   |   `--EXPR -> EXPR [22:24]
+        |   |       `--DOT -> . [22:24]
+        |   |           |--IDENT -> STR [22:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [22:26]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [22:27]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [22:31]
+        |   |               |   `--METHOD_CALL -> ( [22:31]
+        |   |               |       |--IDENT -> y [22:30]
+        |   |               |       |--ELIST -> ELIST [22:33]
+        |   |               |       |   `--EXPR -> EXPR [22:33]
+        |   |               |       |       `--METHOD_CALL -> ( [22:33]
+        |   |               |       |           |--IDENT -> y [22:32]
+        |   |               |       |           |--ELIST -> ELIST [22:34]
+        |   |               |       |           |   `--EXPR -> EXPR [22:34]
+        |   |               |       |           |       `--STRING_LITERAL -> "y" [22:34]
+        |   |               |       |           `--RPAREN -> ) [22:37]
+        |   |               |       `--RPAREN -> ) [22:38]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [22:40]
+        |   |               `--STRING_TEMPLATE_END -> " [22:41]
+        |   `--SEMI -> ; [22:42]
+        |--VARIABLE_DEF -> VARIABLE_DEF [25:4]
+        |   |--MODIFIERS -> MODIFIERS [25:4]
+        |   |--TYPE -> TYPE [25:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [24:4]
+        |   |   |   `--COMMENT_CONTENT ->  bit more complex example, multiple interpolations\n [24:6]
+        |   |   `--IDENT -> String [25:4]
+        |   |--IDENT -> result4 [25:11]
+        |   |--ASSIGN -> = [25:19]
+        |   |   `--EXPR -> EXPR [25:36]
+        |   |       `--PLUS -> + [25:36]
+        |   |           |--DOT -> . [25:24]
+        |   |           |   |--IDENT -> STR [25:21]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [25:26]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [25:27]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [25:30]
+        |   |           |       |   `--IDENT -> x [25:30]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [25:32]
+        |   |           |       `--STRING_TEMPLATE_END -> " [25:33]
+        |   |           `--DOT -> . [25:41]
+        |   |               |--IDENT -> STR [25:38]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [25:43]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [25:44]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [25:47]
+        |   |                   |   `--IDENT -> y [25:47]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [25:49]
+        |   |                   `--STRING_TEMPLATE_END -> " [25:50]
+        |   `--SEMI -> ; [25:51]
+        |--VARIABLE_DEF -> VARIABLE_DEF [28:4]
+        |   |--MODIFIERS -> MODIFIERS [28:4]
+        |   |--TYPE -> TYPE [28:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [27:4]
+        |   |   |   `--COMMENT_CONTENT ->  bit more complex example, multiple interpolations with method calls\n [27:6]
+        |   |   `--IDENT -> String [28:4]
+        |   |--IDENT -> result5 [28:11]
+        |   |--ASSIGN -> = [28:19]
+        |   |   `--EXPR -> EXPR [28:44]
+        |   |       `--PLUS -> + [28:44]
+        |   |           |--DOT -> . [28:24]
+        |   |           |   |--IDENT -> STR [28:21]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [28:26]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [28:27]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [28:31]
+        |   |           |       |   `--METHOD_CALL -> ( [28:31]
+        |   |           |       |       |--IDENT -> y [28:30]
+        |   |           |       |       |--ELIST -> ELIST [28:33]
+        |   |           |       |       |   `--EXPR -> EXPR [28:33]
+        |   |           |       |       |       `--METHOD_CALL -> ( [28:33]
+        |   |           |       |       |           |--IDENT -> y [28:32]
+        |   |           |       |       |           |--ELIST -> ELIST [28:34]
+        |   |           |       |       |           |   `--EXPR -> EXPR [28:34]
+        |   |           |       |       |           |       `--STRING_LITERAL -> "y" [28:34]
+        |   |           |       |       |           `--RPAREN -> ) [28:37]
+        |   |           |       |       `--RPAREN -> ) [28:38]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [28:40]
+        |   |           |       `--STRING_TEMPLATE_END -> " [28:41]
+        |   |           `--DOT -> . [28:49]
+        |   |               |--IDENT -> STR [28:46]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [28:51]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [28:52]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [28:56]
+        |   |                   |   `--METHOD_CALL -> ( [28:56]
+        |   |                   |       |--IDENT -> y [28:55]
+        |   |                   |       |--ELIST -> ELIST [28:58]
+        |   |                   |       |   `--EXPR -> EXPR [28:58]
+        |   |                   |       |       `--METHOD_CALL -> ( [28:58]
+        |   |                   |       |           |--IDENT -> y [28:57]
+        |   |                   |       |           |--ELIST -> ELIST [28:59]
+        |   |                   |       |           |   `--EXPR -> EXPR [28:59]
+        |   |                   |       |           |       `--STRING_LITERAL -> "y" [28:59]
+        |   |                   |       |           |--BLOCK_COMMENT_BEGIN -> /* [28:62]
+        |   |                   |       |           |   |--COMMENT_CONTENT -> yep, comment here, too [28:64]
+        |   |                   |       |           |   `--BLOCK_COMMENT_END -> */ [28:85]
+        |   |                   |       |           `--RPAREN -> ) [28:88]
+        |   |                   |       `--RPAREN -> ) [28:89]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [28:91]
+        |   |                   `--STRING_TEMPLATE_END -> " [28:92]
+        |   `--SEMI -> ; [28:93]
+        |--VARIABLE_DEF -> VARIABLE_DEF [31:4]
+        |   |--MODIFIERS -> MODIFIERS [31:4]
+        |   |--TYPE -> TYPE [31:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [30:4]
+        |   |   |   `--COMMENT_CONTENT ->  string template concatenation\n [30:6]
+        |   |   `--IDENT -> String [31:4]
+        |   |--IDENT -> result6 [31:11]
+        |   |--ASSIGN -> = [31:19]
+        |   |   `--EXPR -> EXPR [31:36]
+        |   |       `--PLUS -> + [31:36]
+        |   |           |--DOT -> . [31:24]
+        |   |           |   |--IDENT -> STR [31:21]
+        |   |           |   `--STRING_TEMPLATE_BEGIN -> " [31:26]
+        |   |           |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [31:27]
+        |   |           |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [31:30]
+        |   |           |       |   `--IDENT -> x [31:30]
+        |   |           |       |--EMBEDDED_EXPRESSION_END -> } [31:32]
+        |   |           |       `--STRING_TEMPLATE_END -> " [31:33]
+        |   |           `--DOT -> . [31:58]
+        |   |               |--BLOCK_COMMENT_BEGIN -> /* [31:38]
+        |   |               |   |--COMMENT_CONTENT -> comment here [31:40]
+        |   |               |   `--BLOCK_COMMENT_END -> */ [31:51]
+        |   |               |--IDENT -> STR [31:55]
+        |   |               `--STRING_TEMPLATE_BEGIN -> " [31:60]
+        |   |                   |--EMBEDDED_EXPRESSION_BEGIN -> \{ [31:61]
+        |   |                   |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [31:64]
+        |   |                   |   `--IDENT -> y [31:64]
+        |   |                   |--EMBEDDED_EXPRESSION_END -> } [31:66]
+        |   |                   `--STRING_TEMPLATE_END -> " [31:67]
+        |   `--SEMI -> ; [31:68]
+        |--VARIABLE_DEF -> VARIABLE_DEF [34:4]
+        |   |--MODIFIERS -> MODIFIERS [34:4]
+        |   |--TYPE -> TYPE [34:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [33:4]
+        |   |   |   `--COMMENT_CONTENT ->  concatentation in embedded expression\n [33:6]
+        |   |   `--IDENT -> String [34:4]
+        |   |--IDENT -> result7 [34:11]
+        |   |--ASSIGN -> = [34:19]
+        |   |   `--EXPR -> EXPR [34:24]
+        |   |       `--DOT -> . [34:24]
+        |   |           |--IDENT -> STR [34:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [34:26]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [34:27]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [34:32]
+        |   |               |   `--PLUS -> + [34:32]
+        |   |               |       |--IDENT -> x [34:30]
+        |   |               |       `--IDENT -> y [34:34]
+        |   |               |--BLOCK_COMMENT_BEGIN -> /* [34:36]
+        |   |               |   |--COMMENT_CONTENT -> comment here too [34:38]
+        |   |               |   `--BLOCK_COMMENT_END -> */ [34:53]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [34:57]
+        |   |               `--STRING_TEMPLATE_END -> " [34:58]
+        |   `--SEMI -> ; [34:59]
+        |--VARIABLE_DEF -> VARIABLE_DEF [37:4]
+        |   |--MODIFIERS -> MODIFIERS [37:4]
+        |   |--TYPE -> TYPE [37:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [36:4]
+        |   |   |   `--COMMENT_CONTENT ->  concatentation in embedded expression with method calls\n [36:6]
+        |   |   `--IDENT -> String [37:4]
+        |   |--IDENT -> result8 [37:11]
+        |   |--ASSIGN -> = [37:19]
+        |   |   `--EXPR -> EXPR [37:24]
+        |   |       `--DOT -> . [37:24]
+        |   |           |--IDENT -> STR [37:21]
+        |   |           |--BLOCK_COMMENT_BEGIN -> /* [37:25]
+        |   |           |   |--COMMENT_CONTENT -> comment here [37:27]
+        |   |           |   `--BLOCK_COMMENT_END -> */ [37:38]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [37:42]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [37:43]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [37:47]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [37:60]
+        |   |               |   `--PLUS -> + [37:60]
+        |   |               |       |--METHOD_CALL -> ( [37:51]
+        |   |               |       |   |--IDENT -> y [37:50]
+        |   |               |       |   |--ELIST -> ELIST [37:53]
+        |   |               |       |   |   `--EXPR -> EXPR [37:53]
+        |   |               |       |   |       `--METHOD_CALL -> ( [37:53]
+        |   |               |       |   |           |--IDENT -> y [37:52]
+        |   |               |       |   |           |--ELIST -> ELIST [37:54]
+        |   |               |       |   |           |   `--EXPR -> EXPR [37:54]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [37:54]
+        |   |               |       |   |           `--RPAREN -> ) [37:57]
+        |   |               |       |   `--RPAREN -> ) [37:58]
+        |   |               |       `--METHOD_CALL -> ( [37:63]
+        |   |               |           |--IDENT -> y [37:62]
+        |   |               |           |--ELIST -> ELIST [37:65]
+        |   |               |           |   `--EXPR -> EXPR [37:65]
+        |   |               |           |       `--METHOD_CALL -> ( [37:65]
+        |   |               |           |           |--IDENT -> y [37:64]
+        |   |               |           |           |--ELIST -> ELIST [37:66]
+        |   |               |           |           |   `--EXPR -> EXPR [37:66]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [37:66]
+        |   |               |           |           `--RPAREN -> ) [37:69]
+        |   |               |           `--RPAREN -> ) [37:70]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [37:72]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there [37:73]
+        |   |               `--STRING_TEMPLATE_END -> " [37:79]
+        |   `--SEMI -> ; [37:80]
+        |--VARIABLE_DEF -> VARIABLE_DEF [40:4]
+        |   |--MODIFIERS -> MODIFIERS [40:4]
+        |   |--TYPE -> TYPE [40:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [39:4]
+        |   |   |   `--COMMENT_CONTENT ->  multiple lines\n [39:6]
+        |   |   `--IDENT -> String [40:4]
+        |   |--IDENT -> result9 [40:11]
+        |   |--ASSIGN -> = [40:19]
+        |   |   `--EXPR -> EXPR [40:24]
+        |   |       `--DOT -> . [40:24]
+        |   |           |--IDENT -> STR [40:21]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [40:26]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [40:27]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [40:31]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [41:22]
+        |   |               |   `--PLUS -> + [41:22]
+        |   |               |       |--METHOD_CALL -> ( [41:13]
+        |   |               |       |   |--SINGLE_LINE_COMMENT -> // [40:34]
+        |   |               |       |   |   `--COMMENT_CONTENT ->  comment here\n [40:36]
+        |   |               |       |   |--IDENT -> y [41:12]
+        |   |               |       |   |--ELIST -> ELIST [41:15]
+        |   |               |       |   |   `--EXPR -> EXPR [41:15]
+        |   |               |       |   |       `--METHOD_CALL -> ( [41:15]
+        |   |               |       |   |           |--IDENT -> y [41:14]
+        |   |               |       |   |           |--ELIST -> ELIST [41:16]
+        |   |               |       |   |           |   `--EXPR -> EXPR [41:16]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [41:16]
+        |   |               |       |   |           `--RPAREN -> ) [41:19]
+        |   |               |       |   `--RPAREN -> ) [41:20]
+        |   |               |       `--METHOD_CALL -> ( [41:25]
+        |   |               |           |--IDENT -> y [41:24]
+        |   |               |           |--ELIST -> ELIST [41:27]
+        |   |               |           |   `--EXPR -> EXPR [41:27]
+        |   |               |           |       `--METHOD_CALL -> ( [41:27]
+        |   |               |           |           |--IDENT -> y [41:26]
+        |   |               |           |           |--ELIST -> ELIST [41:28]
+        |   |               |           |           |   `--EXPR -> EXPR [41:28]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [41:28]
+        |   |               |           |           `--RPAREN -> ) [41:31]
+        |   |               |           `--RPAREN -> ) [41:32]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [42:12]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there [42:13]
+        |   |               `--STRING_TEMPLATE_END -> " [42:19]
+        |   `--SEMI -> ; [42:20]
+        |--VARIABLE_DEF -> VARIABLE_DEF [45:4]
+        |   |--MODIFIERS -> MODIFIERS [45:4]
+        |   |--TYPE -> TYPE [45:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [44:4]
+        |   |   |   `--COMMENT_CONTENT ->  multiple lines with many expressions and comments\n [44:6]
+        |   |   `--IDENT -> String [45:4]
+        |   |--IDENT -> result10 [45:11]
+        |   |--ASSIGN -> = [45:20]
+        |   |   `--EXPR -> EXPR [45:25]
+        |   |       `--DOT -> . [45:25]
+        |   |           |--IDENT -> STR [45:22]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [45:27]
+        |   |               |--STRING_TEMPLATE_CONTENT -> hey  [45:28]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [45:32]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [46:22]
+        |   |               |   `--PLUS -> + [46:22]
+        |   |               |       |--METHOD_CALL -> ( [46:13]
+        |   |               |       |   |--BLOCK_COMMENT_BEGIN -> /* [45:35]
+        |   |               |       |   |   |--COMMENT_CONTENT -> ****comment here [45:37]
+        |   |               |       |   |   `--BLOCK_COMMENT_END -> */ [45:52]
+        |   |               |       |   |--SINGLE_LINE_COMMENT -> // [45:56]
+        |   |               |       |   |   `--COMMENT_CONTENT ->  comment here\n [45:58]
+        |   |               |       |   |--IDENT -> y [46:12]
+        |   |               |       |   |--ELIST -> ELIST [46:15]
+        |   |               |       |   |   `--EXPR -> EXPR [46:15]
+        |   |               |       |   |       `--METHOD_CALL -> ( [46:15]
+        |   |               |       |   |           |--IDENT -> y [46:14]
+        |   |               |       |   |           |--ELIST -> ELIST [46:16]
+        |   |               |       |   |           |   `--EXPR -> EXPR [46:16]
+        |   |               |       |   |           |       `--STRING_LITERAL -> "y" [46:16]
+        |   |               |       |   |           `--RPAREN -> ) [46:19]
+        |   |               |       |   `--RPAREN -> ) [46:20]
+        |   |               |       `--METHOD_CALL -> ( [46:25]
+        |   |               |           |--IDENT -> y [46:24]
+        |   |               |           |--ELIST -> ELIST [46:27]
+        |   |               |           |   `--EXPR -> EXPR [46:27]
+        |   |               |           |       `--METHOD_CALL -> ( [46:27]
+        |   |               |           |           |--IDENT -> y [46:26]
+        |   |               |           |           |--ELIST -> ELIST [46:28]
+        |   |               |           |           |   `--EXPR -> EXPR [46:28]
+        |   |               |           |           |       `--STRING_LITERAL -> "y" [46:28]
+        |   |               |           |           `--RPAREN -> ) [46:31]
+        |   |               |           `--RPAREN -> ) [46:32]
+        |   |               |--BLOCK_COMMENT_BEGIN -> /* [46:34]
+        |   |               |   |--COMMENT_CONTENT ->  comment here  [46:36]
+        |   |               |   `--BLOCK_COMMENT_END -> */ [46:49]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [47:12]
+        |   |               |--STRING_TEMPLATE_CONTENT ->  there  [47:13]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [47:20]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [49:12]
+        |   |               |   |--SINGLE_LINE_COMMENT -> // [48:34]
+        |   |               |   |   `--COMMENT_CONTENT ->  comment there\n [48:36]
+        |   |               |   `--PLUS -> + [49:12]
+        |   |               |       |--PLUS -> + [48:22]
+        |   |               |       |   |--METHOD_CALL -> ( [48:13]
+        |   |               |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [47:23]
+        |   |               |       |   |   |   |--COMMENT_CONTENT ->  [47:25]
+        |   |               |       |   |   |   `--BLOCK_COMMENT_END -> */ [47:24]
+        |   |               |       |   |   |--SINGLE_LINE_COMMENT -> // [47:28]
+        |   |               |       |   |   |   `--COMMENT_CONTENT ->  comment here\n [47:30]
+        |   |               |       |   |   |--IDENT -> y [48:12]
+        |   |               |       |   |   |--ELIST -> ELIST [48:15]
+        |   |               |       |   |   |   `--EXPR -> EXPR [48:15]
+        |   |               |       |   |   |       `--METHOD_CALL -> ( [48:15]
+        |   |               |       |   |   |           |--IDENT -> y [48:14]
+        |   |               |       |   |   |           |--ELIST -> ELIST [48:16]
+        |   |               |       |   |   |           |   `--EXPR -> EXPR [48:16]
+        |   |               |       |   |   |           |       `--STRING_LITERAL -> "y" [48:16]
+        |   |               |       |   |   |           `--RPAREN -> ) [48:19]
+        |   |               |       |   |   `--RPAREN -> ) [48:20]
+        |   |               |       |   `--METHOD_CALL -> ( [48:25]
+        |   |               |       |       |--IDENT -> y [48:24]
+        |   |               |       |       |--ELIST -> ELIST [48:27]
+        |   |               |       |       |   `--EXPR -> EXPR [48:27]
+        |   |               |       |       |       `--METHOD_CALL -> ( [48:27]
+        |   |               |       |       |           |--IDENT -> y [48:26]
+        |   |               |       |       |           |--ELIST -> ELIST [48:28]
+        |   |               |       |       |           |   `--EXPR -> EXPR [48:28]
+        |   |               |       |       |           |       `--STRING_LITERAL -> "y" [48:28]
+        |   |               |       |       |           `--RPAREN -> ) [48:31]
+        |   |               |       |       `--RPAREN -> ) [48:32]
+        |   |               |       `--DOT -> . [49:17]
+        |   |               |           |--IDENT -> STR [49:14]
+        |   |               |           `--STRING_TEMPLATE_BEGIN -> " [49:18]
+        |   |               |               |--STRING_TEMPLATE_CONTENT -> x [49:19]
+        |   |               |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [49:20]
+        |   |               |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [49:23]
+        |   |               |               |   `--IDENT -> x [49:23]
+        |   |               |               |--EMBEDDED_EXPRESSION_END -> } [49:25]
+        |   |               |               |--STRING_TEMPLATE_CONTENT -> x [49:26]
+        |   |               |               `--STRING_TEMPLATE_END -> " [49:27]
+        |   |               |--SINGLE_LINE_COMMENT -> // [49:29]
+        |   |               |   `--COMMENT_CONTENT ->  comment everywhere\n [49:31]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [50:12]
+        |   |               `--STRING_TEMPLATE_END -> " [50:13]
+        |   `--SEMI -> ; [50:14]
+        |--VARIABLE_DEF -> VARIABLE_DEF [52:4]
+        |   |--MODIFIERS -> MODIFIERS [52:4]
+        |   |--TYPE -> TYPE [52:4]
+        |   |   `--IDENT -> String [52:4]
+        |   |--IDENT -> name [52:11]
+        |   |--ASSIGN -> = [52:16]
+        |   |   `--EXPR -> EXPR [52:18]
+        |   |       `--STRING_LITERAL -> "world" [52:18]
+        |   `--SEMI -> ; [52:25]
+        |--VARIABLE_DEF -> VARIABLE_DEF [53:4]
+        |   |--MODIFIERS -> MODIFIERS [53:4]
+        |   |--TYPE -> TYPE [53:4]
+        |   |   `--IDENT -> String [53:4]
+        |   |--IDENT -> s [53:11]
+        |   |--ASSIGN -> = [53:13]
+        |   |   `--EXPR -> EXPR [53:18]
+        |   |       `--DOT -> . [53:18]
+        |   |           |--IDENT -> STR [53:15]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [53:19]
+        |   |               |--STRING_TEMPLATE_CONTENT -> Hello,  [53:20]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [53:27]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [53:30]
+        |   |               |   `--IDENT -> name [53:30]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [53:35]
+        |   |               |--STRING_TEMPLATE_CONTENT -> ! [53:36]
+        |   |               `--STRING_TEMPLATE_END -> " [53:37]
+        |   `--SEMI -> ; [53:38]
+        |--METHOD_DEF -> METHOD_DEF [55:4]
+        |   |--MODIFIERS -> MODIFIERS [55:4]
+        |   |   |--LITERAL_PRIVATE -> private [55:4]
+        |   |   `--LITERAL_STATIC -> static [55:12]
+        |   |--TYPE -> TYPE [55:19]
+        |   |   `--IDENT -> String [55:19]
+        |   |--IDENT -> y [55:26]
+        |   |--LPAREN -> ( [55:27]
+        |   |--PARAMETERS -> PARAMETERS [55:28]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [55:28]
+        |   |       |--MODIFIERS -> MODIFIERS [55:28]
+        |   |       |--TYPE -> TYPE [55:28]
+        |   |       |   `--IDENT -> String [55:28]
+        |   |       `--IDENT -> y [55:35]
+        |   |--RPAREN -> ) [55:36]
+        |   `--SLIST -> { [55:38]
+        |       |--LITERAL_RETURN -> return [56:8]
+        |       |   |--EXPR -> EXPR [56:15]
+        |       |   |   `--STRING_LITERAL -> "y" [56:15]
+        |       |   `--SEMI -> ; [56:18]
+        |       `--RCURLY -> } [57:4]
+        |--METHOD_DEF -> METHOD_DEF [60:4]
+        |   |--MODIFIERS -> MODIFIERS [60:4]
+        |   |--TYPE -> TYPE [60:4]
+        |   |   |--SINGLE_LINE_COMMENT -> // [59:4]
+        |   |   |   `--COMMENT_CONTENT ->  Verify proper behavior of TransType w.r.t. templated Strings\n [59:6]
+        |   |   `--LITERAL_VOID -> void [60:4]
+        |   |--IDENT -> x [60:9]
+        |   |--LPAREN -> ( [60:10]
+        |   |--PARAMETERS -> PARAMETERS [60:11]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [60:11]
+        |   |       |--MODIFIERS -> MODIFIERS [60:11]
+        |   |       |--TYPE -> TYPE [60:11]
+        |   |       |   |--IDENT -> List [60:11]
+        |   |       |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [60:15]
+        |   |       |       |--GENERIC_START -> < [60:15]
+        |   |       |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:16]
+        |   |       |       |   |--WILDCARD_TYPE -> ? [60:16]
+        |   |       |       |   `--TYPE_UPPER_BOUNDS -> extends [60:18]
+        |   |       |       |       `--DOT -> . [60:40]
+        |   |       |       |           |--IDENT -> StringTemplate [60:26]
+        |   |       |       |           |--IDENT -> Processor [60:41]
+        |   |       |       |           `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [60:50]
+        |   |       |       |               |--GENERIC_START -> < [60:50]
+        |   |       |       |               |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:51]
+        |   |       |       |               |   `--IDENT -> String [60:51]
+        |   |       |       |               |--COMMA -> , [60:57]
+        |   |       |       |               |--TYPE_ARGUMENT -> TYPE_ARGUMENT [60:59]
+        |   |       |       |               |   `--IDENT -> RuntimeException [60:59]
+        |   |       |       |               `--GENERIC_END -> > [60:75]
+        |   |       |       `--GENERIC_END -> > [60:76]
+        |   |       `--IDENT -> list [60:78]
+        |   |--RPAREN -> ) [60:82]
+        |   `--SLIST -> { [60:84]
+        |       |--EXPR -> EXPR [61:19]
+        |       |   `--DOT -> . [61:19]
+        |       |       |--METHOD_CALL -> ( [61:16]
+        |       |       |   |--DOT -> . [61:12]
+        |       |       |   |   |--IDENT -> list [61:8]
+        |       |       |   |   `--IDENT -> get [61:13]
+        |       |       |   |--ELIST -> ELIST [61:17]
+        |       |       |   |   `--EXPR -> EXPR [61:17]
+        |       |       |   |       `--NUM_INT -> 0 [61:17]
+        |       |       |   `--RPAREN -> ) [61:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [61:20]
+        |       |           |--STRING_TEMPLATE_CONTENT ->  [61:21]
+        |       |           `--STRING_TEMPLATE_END -> " [61:21]
+        |       |--SEMI -> ; [61:22]
+        |       |--EXPR -> EXPR [62:19]
+        |       |   `--DOT -> . [62:19]
+        |       |       |--METHOD_CALL -> ( [62:16]
+        |       |       |   |--DOT -> . [62:12]
+        |       |       |   |   |--IDENT -> list [62:8]
+        |       |       |   |   `--IDENT -> get [62:13]
+        |       |       |   |--ELIST -> ELIST [62:17]
+        |       |       |   |   `--EXPR -> EXPR [62:17]
+        |       |       |   |       `--NUM_INT -> 0 [62:17]
+        |       |       |   `--RPAREN -> ) [62:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [62:20]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [62:21]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [62:25]
+        |       |           `--STRING_TEMPLATE_END -> " [62:26]
+        |       |--SEMI -> ; [62:27]
+        |       |--EXPR -> EXPR [63:19]
+        |       |   `--DOT -> . [63:19]
+        |       |       |--METHOD_CALL -> ( [63:16]
+        |       |       |   |--DOT -> . [63:12]
+        |       |       |   |   |--IDENT -> list [63:8]
+        |       |       |   |   `--IDENT -> get [63:13]
+        |       |       |   |--ELIST -> ELIST [63:17]
+        |       |       |   |   `--EXPR -> EXPR [63:17]
+        |       |       |   |       `--NUM_INT -> 0 [63:17]
+        |       |       |   `--RPAREN -> ) [63:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [63:21]
+        |       |           |--STRING_TEMPLATE_CONTENT -> x [63:22]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [63:23]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [63:26]
+        |       |           |   `--IDENT -> x [63:26]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [63:28]
+        |       |           |--STRING_TEMPLATE_CONTENT -> x [63:29]
+        |       |           `--STRING_TEMPLATE_END -> " [63:30]
+        |       |--SEMI -> ; [63:31]
+        |       |--EXPR -> EXPR [64:19]
+        |       |   `--DOT -> . [64:19]
+        |       |       |--METHOD_CALL -> ( [64:16]
+        |       |       |   |--DOT -> . [64:12]
+        |       |       |   |   |--SINGLE_LINE_COMMENT -> // [63:33]
+        |       |       |   |   |   `--COMMENT_CONTENT ->  comments in here\n [63:35]
+        |       |       |   |   |--IDENT -> list [64:8]
+        |       |       |   |   `--IDENT -> get [64:13]
+        |       |       |   |--ELIST -> ELIST [64:17]
+        |       |       |   |   `--EXPR -> EXPR [64:17]
+        |       |       |   |       `--NUM_INT -> 0 [64:17]
+        |       |       |   `--RPAREN -> ) [64:18]
+        |       |       `--STRING_TEMPLATE_BEGIN -> " [64:21]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:22]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:23]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:26]
+        |       |           |   `--IDENT -> x [64:26]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:28]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:29]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:30]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:33]
+        |       |           |   `--IDENT -> y [64:33]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:35]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:36]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:37]
+        |       |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [64:40]
+        |       |           |   `--IDENT -> x [64:40]
+        |       |           |--BLOCK_COMMENT_BEGIN -> /* [64:42]
+        |       |           |   |--COMMENT_CONTENT -> comments in here, as well [64:44]
+        |       |           |   `--BLOCK_COMMENT_END -> */ [64:68]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:72]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:73]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:74]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:76]
+        |       |           |--STRING_TEMPLATE_CONTENT -> . [64:77]
+        |       |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [64:78]
+        |       |           |--EMBEDDED_EXPRESSION_END -> } [64:80]
+        |       |           `--STRING_TEMPLATE_END -> " [64:81]
+        |       |--SEMI -> ; [64:82]
+        |       `--RCURLY -> } [65:4]
+        `--RCURLY -> } [66:0]
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateNested.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateNested.txt
new file mode 100644
index 00000000000..e3b4ed36a19
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedStringTemplateNested.txt
@@ -0,0 +1,200 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [2:47]
+|   |--DOT -> . [2:47]
+|   |   |--DOT -> . [2:39]
+|   |   |   |--DOT -> . [2:28]
+|   |   |   |   |--DOT -> . [2:22]
+|   |   |   |   |   |--DOT -> . [2:11]
+|   |   |   |   |   |   |--IDENT -> com [2:8]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [2:12]
+|   |   |   |   |   `--IDENT -> tools [2:23]
+|   |   |   |   `--IDENT -> checkstyle [2:29]
+|   |   |   `--IDENT -> grammar [2:40]
+|   |   `--IDENT -> java21 [2:48]
+|   `--SEMI -> ; [2:54]
+|--IMPORT -> import [4:0]
+|   |--DOT -> . [4:25]
+|   |   |--DOT -> . [4:16]
+|   |   |   |--DOT -> . [4:11]
+|   |   |   |   |--IDENT -> java [4:7]
+|   |   |   |   `--IDENT -> util [4:12]
+|   |   |   `--IDENT -> function [4:17]
+|   |   `--IDENT -> Supplier [4:26]
+|   `--SEMI -> ; [4:34]
+`--CLASS_DEF -> CLASS_DEF [6:0]
+    |--MODIFIERS -> MODIFIERS [6:0]
+    |   `--LITERAL_PUBLIC -> public [6:0]
+    |--LITERAL_CLASS -> class [6:7]
+    |--IDENT -> InputStringTemplateNested [6:13]
+    `--OBJBLOCK -> OBJBLOCK [6:39]
+        |--LCURLY -> { [6:39]
+        |--VARIABLE_DEF -> VARIABLE_DEF [7:4]
+        |   |--MODIFIERS -> MODIFIERS [7:4]
+        |   |--TYPE -> TYPE [7:4]
+        |   |   `--LITERAL_INT -> int [7:4]
+        |   |--IDENT -> x [7:8]
+        |   |--ASSIGN -> = [7:10]
+        |   |   `--EXPR -> EXPR [7:12]
+        |   |       `--NUM_INT -> 2 [7:12]
+        |   `--SEMI -> ; [7:13]
+        |--VARIABLE_DEF -> VARIABLE_DEF [8:4]
+        |   |--MODIFIERS -> MODIFIERS [8:4]
+        |   |   `--FINAL -> final [8:4]
+        |   |--TYPE -> TYPE [8:10]
+        |   |   `--IDENT -> String [8:10]
+        |   |--IDENT -> s [8:17]
+        |   |--ASSIGN -> = [8:19]
+        |   |   `--EXPR -> EXPR [9:15]
+        |   |       `--DOT -> . [9:15]
+        |   |           |--IDENT -> STR [9:12]
+        |   |           `--STRING_TEMPLATE_BEGIN -> " [9:16]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [9:17]
+        |   |               |--EMBEDDED_EXPRESSION_BEGIN -> \{ [9:18]
+        |   |               |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [9:23]
+        |   |               |   `--METHOD_CALL -> ( [9:23]
+        |   |               |       |--IDENT -> sp [9:21]
+        |   |               |       |--ELIST -> ELIST [9:27]
+        |   |               |       |   `--LAMBDA -> -> [9:27]
+        |   |               |       |       |--LPAREN -> ( [9:24]
+        |   |               |       |       |--PARAMETERS -> PARAMETERS [9:25]
+        |   |               |       |       |--RPAREN -> ) [9:25]
+        |   |               |       |       `--SLIST -> { [9:30]
+        |   |               |       |           |--LITERAL_RETURN -> return [10:16]
+        |   |               |       |           |   |--EXPR -> EXPR [10:26]
+        |   |               |       |           |   |   `--DOT -> . [10:26]
+        |   |               |       |           |   |       |--IDENT -> STR [10:23]
+        |   |               |       |           |   |       `--STRING_TEMPLATE_BEGIN -> " [10:27]
+        |   |               |       |           |   |           |--STRING_TEMPLATE_CONTENT -> x [10:28]
+        |   |               |       |           |   |           |--EMBEDDED_EXPRESSION_BEGIN -> \{ [10:29]
+        |   |               |       |           |   |           |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [10:34]
+        |   |               |       |           |   |           |   `--METHOD_CALL -> ( [10:34]
+        |   |               |       |           |   |           |       |--IDENT -> sp [10:32]
+        |   |               |       |           |   |           |       |--ELIST -> ELIST [10:38]
+        |   |               |       |           |   |           |       |   `--LAMBDA -> -> [10:38]
+        |   |               |       |           |   |           |       |       |--LPAREN -> ( [10:35]
+        |   |               |       |           |   |           |       |       |--PARAMETERS -> PARAMETERS [10:36]
+        |   |               |       |           |   |           |       |       |--RPAREN -> ) [10:36]
+        |   |               |       |           |   |           |       |       `--SLIST -> { [10:41]
+        |   |               |       |           |   |           |       |           |--LITERAL_RETURN -> return [11:20]
+        |   |               |       |           |   |           |       |           |   |--EXPR -> EXPR [17:38]
+        |   |               |       |           |   |           |       |           |   |   `--PLUS -> + [17:38]
+        |   |               |       |           |   |           |       |           |   |       |--PLUS -> + [17:32]
+        |   |               |       |           |   |           |       |           |   |       |   |--DOT -> . [11:30]
+        |   |               |       |           |   |           |       |           |   |       |   |   |--IDENT -> STR [11:27]
+        |   |               |       |           |   |           |       |           |   |       |   |   `--STRING_TEMPLATE_BEGIN -> " [11:31]
+        |   |               |       |           |   |           |       |           |   |       |   |       |--STRING_TEMPLATE_CONTENT -> x [11:32]
+        |   |               |       |           |   |           |       |           |   |       |   |       |--EMBEDDED_EXPRESSION_BEGIN -> \{ [11:33]
+        |   |               |       |           |   |           |       |           |   |       |   |       |--EMBEDDED_EXPRESSION -> EMBEDDED_EXPRESSION [12:30]
+        |   |               |       |           |   |           |       |           |   |       |   |       |   `--METHOD_CALL -> ( [12:30]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |--IDENT -> sp [12:28]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |--ELIST -> ELIST [12:34]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |   `--LAMBDA -> -> [12:34]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |       |--LPAREN -> ( [12:31]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |       |--PARAMETERS -> PARAMETERS [12:32]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |       |--RPAREN -> ) [12:32]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |       `--SLIST -> { [12:37]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |--LITERAL_RETURN -> return [13:8]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |--EXPR -> EXPR [13:17]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |   `--METHOD_CALL -> ( [13:17]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |--IDENT -> sp [13:15]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |--ELIST -> ELIST [13:21]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |   `--LAMBDA -> -> [13:21]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |       |--LPAREN -> ( [13:18]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |       |--PARAMETERS -> PARAMETERS [13:19]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |       |--RPAREN -> ) [13:19]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |       `--SLIST -> { [13:24]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |--LITERAL_RETURN -> return [14:12]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |--EXPR -> EXPR [14:21]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |   `--METHOD_CALL -> ( [14:21]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |--IDENT -> sp [14:19]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |--ELIST -> ELIST [14:25]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |   `--LAMBDA -> -> [14:25]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |       |--LPAREN -> ( [14:22]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |       |--PARAMETERS -> PARAMETERS [14:23]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |       |--RPAREN -> ) [14:23]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |       `--SLIST -> { [14:28]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |--LITERAL_RETURN -> return [15:16]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |--EXPR -> EXPR [15:25]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |   `--METHOD_CALL -> ( [15:25]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |--IDENT -> sp [15:23]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |--ELIST -> ELIST [15:29]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |   `--LAMBDA -> -> [15:29]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |       |--LPAREN -> ( [15:26]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |       |--PARAMETERS -> PARAMETERS [15:27]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |       |--RPAREN -> ) [15:27]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |       `--SLIST -> { [15:32]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |--LITERAL_RETURN -> return [16:20]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |--EXPR -> EXPR [16:29]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |   `--METHOD_CALL -> ( [16:29]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |--IDENT -> sp [16:27]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |--ELIST -> ELIST [16:33]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |   `--LAMBDA -> -> [16:33]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |       |--LPAREN -> ( [16:30]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |       |--PARAMETERS -> PARAMETERS [16:31]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |       |--RPAREN -> ) [16:31]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |       `--EXPR -> EXPR [16:36]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       |           `--STRING_LITERAL -> "" [16:36]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   |       `--RPAREN -> ) [16:38]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           |   `--SEMI -> ; [16:39]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       |           `--RCURLY -> } [16:40]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   |       `--RPAREN -> ) [16:41]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           |   `--SEMI -> ; [16:42]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       |           `--RCURLY -> } [16:43]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   |       `--RPAREN -> ) [16:44]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           |   `--SEMI -> ; [16:45]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       |           `--RCURLY -> } [16:46]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   |       `--RPAREN -> ) [16:47]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           |   `--SEMI -> ; [16:48]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       |           `--RCURLY -> } [16:49]
+        |   |               |       |           |   |           |       |           |   |       |   |       |       `--RPAREN -> ) [16:50]
+        |   |               |       |           |   |           |       |           |   |       |   |       |--EMBEDDED_EXPRESSION_END -> } [17:28]
+        |   |               |       |           |   |           |       |           |   |       |   |       |--STRING_TEMPLATE_CONTENT -> x [17:29]
+        |   |               |       |           |   |           |       |           |   |       |   |       `--STRING_TEMPLATE_END -> " [17:30]
+        |   |               |       |           |   |           |       |           |   |       |   `--STRING_LITERAL -> "{" [17:34]
+        |   |               |       |           |   |           |       |           |   |       `--STRING_LITERAL -> "}}}" [17:40]
+        |   |               |       |           |   |           |       |           |   `--SEMI -> ; [17:45]
+        |   |               |       |           |   |           |       |           `--RCURLY -> } [18:16]
+        |   |               |       |           |   |           |       `--RPAREN -> ) [18:17]
+        |   |               |       |           |   |           |--EMBEDDED_EXPRESSION_END -> } [18:19]
+        |   |               |       |           |   |           |--STRING_TEMPLATE_CONTENT -> x [18:20]
+        |   |               |       |           |   |           `--STRING_TEMPLATE_END -> " [18:21]
+        |   |               |       |           |   `--SEMI -> ; [18:22]
+        |   |               |       |           `--RCURLY -> } [19:12]
+        |   |               |       `--RPAREN -> ) [19:13]
+        |   |               |--EMBEDDED_EXPRESSION_END -> } [19:14]
+        |   |               |--STRING_TEMPLATE_CONTENT -> x [19:15]
+        |   |               `--STRING_TEMPLATE_END -> " [19:16]
+        |   `--SEMI -> ; [19:17]
+        |--METHOD_DEF -> METHOD_DEF [21:4]
+        |   |--MODIFIERS -> MODIFIERS [21:4]
+        |   |   |--LITERAL_PRIVATE -> private [21:4]
+        |   |   `--LITERAL_STATIC -> static [21:12]
+        |   |--TYPE -> TYPE [21:19]
+        |   |   `--IDENT -> String [21:19]
+        |   |--IDENT -> sp [21:26]
+        |   |--LPAREN -> ( [21:28]
+        |   |--PARAMETERS -> PARAMETERS [21:29]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [21:29]
+        |   |       |--MODIFIERS -> MODIFIERS [21:29]
+        |   |       |--TYPE -> TYPE [21:29]
+        |   |       |   |--IDENT -> Supplier [21:29]
+        |   |       |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [21:37]
+        |   |       |       |--GENERIC_START -> < [21:37]
+        |   |       |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [21:38]
+        |   |       |       |   `--IDENT -> String [21:38]
+        |   |       |       `--GENERIC_END -> > [21:44]
+        |   |       `--IDENT -> y [21:46]
+        |   |--RPAREN -> ) [21:47]
+        |   `--SLIST -> { [21:49]
+        |       |--LITERAL_RETURN -> return [22:8]
+        |       |   |--EXPR -> EXPR [22:20]
+        |       |   |   `--METHOD_CALL -> ( [22:20]
+        |       |   |       |--DOT -> . [22:16]
+        |       |   |       |   |--IDENT -> y [22:15]
+        |       |   |       |   `--IDENT -> get [22:17]
+        |       |   |       |--ELIST -> ELIST [22:21]
+        |       |   |       `--RPAREN -> ) [22:21]
+        |       |   `--SEMI -> ; [22:22]
+        |       `--RCURLY -> } [23:4]
+        `--RCURLY -> } [24:0]
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedTextBlockConsecutiveEscapes.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedTextBlockConsecutiveEscapes.txt
new file mode 100644
index 00000000000..53e3d9f709b
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedTextBlockConsecutiveEscapes.txt
@@ -0,0 +1,146 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [2:47]
+|   |--DOT -> . [2:47]
+|   |   |--DOT -> . [2:39]
+|   |   |   |--DOT -> . [2:28]
+|   |   |   |   |--DOT -> . [2:22]
+|   |   |   |   |   |--DOT -> . [2:11]
+|   |   |   |   |   |   |--IDENT -> com [2:8]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [2:12]
+|   |   |   |   |   `--IDENT -> tools [2:23]
+|   |   |   |   `--IDENT -> checkstyle [2:29]
+|   |   |   `--IDENT -> grammar [2:40]
+|   |   `--IDENT -> java21 [2:48]
+|   `--SEMI -> ; [2:54]
+|--IMPORT -> import [4:0]
+|   |--DOT -> . [4:16]
+|   |   |--DOT -> . [4:11]
+|   |   |   |--IDENT -> java [4:7]
+|   |   |   `--IDENT -> util [4:12]
+|   |   `--IDENT -> List [4:17]
+|   `--SEMI -> ; [4:21]
+`--CLASS_DEF -> CLASS_DEF [6:0]
+    |--MODIFIERS -> MODIFIERS [6:0]
+    |   `--LITERAL_PUBLIC -> public [6:0]
+    |--LITERAL_CLASS -> class [6:7]
+    |--IDENT -> InputTextBlockConsecutiveEscapes [6:13]
+    `--OBJBLOCK -> OBJBLOCK [6:46]
+        |--LCURLY -> { [6:46]
+        |--VARIABLE_DEF -> VARIABLE_DEF [7:4]
+        |   |--MODIFIERS -> MODIFIERS [7:4]
+        |   |--TYPE -> TYPE [7:4]
+        |   |   `--IDENT -> String [7:4]
+        |   |--IDENT -> s [7:11]
+        |   |--ASSIGN -> = [7:13]
+        |   |   `--EXPR -> EXPR [7:15]
+        |   |       `--TEXT_BLOCK_LITERAL_BEGIN -> """ [7:15]
+        |   |           |--TEXT_BLOCK_CONTENT -> \n            \u03bc\t\n            \u03bc\s\n            \u03bc\s not all escaped chars\n            \u03bc\n not all escaped chars\n            \s\s\s\n\n            \u03bc\s\n            \s\s\s\n not all escaped chars\n            \u03bc\s not all escaped chars\n            \u03bc\n not all escaped chars\n            l\u03bc\n\n            \n       \u03bc\s\n            \u03bc\\n            \s\u03bc\\n             [7:18]
+        |   |           `--TEXT_BLOCK_LITERAL_END -> """ [21:12]
+        |   `--SEMI -> ; [21:15]
+        |--VARIABLE_DEF -> VARIABLE_DEF [23:12]
+        |   |--MODIFIERS -> MODIFIERS [23:12]
+        |   |   `--FINAL -> final [23:12]
+        |   |--TYPE -> TYPE [23:18]
+        |   |   |--IDENT -> List [23:18]
+        |   |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [23:22]
+        |   |       |--GENERIC_START -> < [23:22]
+        |   |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [23:23]
+        |   |       |   `--IDENT -> TestCase [23:23]
+        |   |       `--GENERIC_END -> > [23:31]
+        |   |--IDENT -> testCases [23:33]
+        |   |--ASSIGN -> = [23:43]
+        |   |   `--EXPR -> EXPR [23:52]
+        |   |       `--METHOD_CALL -> ( [23:52]
+        |   |           |--DOT -> . [23:49]
+        |   |           |   |--IDENT -> List [23:45]
+        |   |           |   `--IDENT -> of [23:50]
+        |   |           |--ELIST -> ELIST [24:16]
+        |   |           |   |--EXPR -> EXPR [24:16]
+        |   |           |   |   `--LITERAL_NEW -> new [24:16]
+        |   |           |   |       |--IDENT -> TestCase [24:20]
+        |   |           |   |       |--LPAREN -> ( [24:28]
+        |   |           |   |       |--ELIST -> ELIST [24:29]
+        |   |           |   |       |   |--EXPR -> EXPR [24:29]
+        |   |           |   |       |   |   `--TEXT_BLOCK_LITERAL_BEGIN -> """ [24:29]
+        |   |           |   |       |   |       |--TEXT_BLOCK_CONTENT -> \n                    {@snippet :\n                    hello there //   @highlight   regex ="\t**"\n                    } [24:32]
+        |   |           |   |       |   |       `--TEXT_BLOCK_LITERAL_END -> """ [27:21]
+        |   |           |   |       |   |--COMMA -> , [27:24]
+        |   |           |   |       |   `--EXPR -> EXPR [28:29]
+        |   |           |   |       |       `--TEXT_BLOCK_LITERAL_BEGIN -> """ [28:29]
+        |   |           |   |       |           |--TEXT_BLOCK_CONTENT -> \n                    error: snippet markup: invalid regex\n                    hello there //   @highlight   regex ="\t**"\n                                                          \t ^\n                     [28:32]
+        |   |           |   |       |           `--TEXT_BLOCK_LITERAL_END -> """ [32:20]
+        |   |           |   |       `--RPAREN -> ) [32:23]
+        |   |           |   |--COMMA -> , [32:24]
+        |   |           |   |--EXPR -> EXPR [33:16]
+        |   |           |   |   `--LITERAL_NEW -> new [33:16]
+        |   |           |   |       |--IDENT -> TestCase [33:20]
+        |   |           |   |       |--LPAREN -> ( [33:28]
+        |   |           |   |       |--ELIST -> ELIST [33:29]
+        |   |           |   |       |   |--EXPR -> EXPR [33:29]
+        |   |           |   |       |   |   `--TEXT_BLOCK_LITERAL_BEGIN -> """ [33:29]
+        |   |           |   |       |   |       |--TEXT_BLOCK_CONTENT -> \n                    {@snippet :\n                    hello there //   @highlight   regex ="\\t**"\n                    } [33:32]
+        |   |           |   |       |   |       `--TEXT_BLOCK_LITERAL_END -> """ [36:21]
+        |   |           |   |       |   |--COMMA -> , [36:24]
+        |   |           |   |       |   `--EXPR -> EXPR [37:24]
+        |   |           |   |       |       `--TEXT_BLOCK_LITERAL_BEGIN -> """ [37:24]
+        |   |           |   |       |           |--TEXT_BLOCK_CONTENT -> \n                    error: snippet markup: invalid regex\n                    hello there //   @highlight   regex ="\\t**"\n                                                             ^\n                     [37:27]
+        |   |           |   |       |           `--TEXT_BLOCK_LITERAL_END -> """ [41:20]
+        |   |           |   |       `--RPAREN -> ) [41:23]
+        |   |           |   |--COMMA -> , [41:24]
+        |   |           |   |--EXPR -> EXPR [42:16]
+        |   |           |   |   `--LITERAL_NEW -> new [42:16]
+        |   |           |   |       |--IDENT -> TestCase [42:20]
+        |   |           |   |       |--LPAREN -> ( [42:28]
+        |   |           |   |       |--ELIST -> ELIST [42:29]
+        |   |           |   |       |   |--EXPR -> EXPR [42:29]
+        |   |           |   |       |   |   `--TEXT_BLOCK_LITERAL_BEGIN -> """ [42:29]
+        |   |           |   |       |   |       |--TEXT_BLOCK_CONTENT -> \n                    {@snippet :\n                    hello there // @highlight regex="\\.\\*\\+\\E"\n                    } [42:32]
+        |   |           |   |       |   |       `--TEXT_BLOCK_LITERAL_END -> """ [45:21]
+        |   |           |   |       |   |--COMMA -> , [45:24]
+        |   |           |   |       |   `--EXPR -> EXPR [46:29]
+        |   |           |   |       |       `--TEXT_BLOCK_LITERAL_BEGIN -> """ [46:29]
+        |   |           |   |       |           |--TEXT_BLOCK_CONTENT -> \n                    error: snippet markup: invalid regex\n                    hello there // @highlight regex="\\.\\*\\+\\E"\n                                                     \s\s\s\s   ^\n                     [46:32]
+        |   |           |   |       |           `--TEXT_BLOCK_LITERAL_END -> """ [50:20]
+        |   |           |   |       `--RPAREN -> ) [50:23]
+        |   |           |   |--COMMA -> , [50:24]
+        |   |           |   `--EXPR -> EXPR [53:16]
+        |   |           |       `--LITERAL_NEW -> new [53:16]
+        |   |           |           |--IDENT -> TestCase [53:20]
+        |   |           |           |--LPAREN -> ( [53:28]
+        |   |           |           |--ELIST -> ELIST [53:29]
+        |   |           |           |   |--EXPR -> EXPR [53:29]
+        |   |           |           |   |   `--TEXT_BLOCK_LITERAL_BEGIN -> """ [53:29]
+        |   |           |           |   |       |--TEXT_BLOCK_CONTENT -> \n                    {@snippet :\n                    hello there //   @highlight  type="italics" regex ="  ["\n                    } [53:32]
+        |   |           |           |   |       `--TEXT_BLOCK_LITERAL_END -> """ [56:21]
+        |   |           |           |   |--COMMA -> , [56:24]
+        |   |           |           |   `--EXPR -> EXPR [57:24]
+        |   |           |           |       `--TEXT_BLOCK_LITERAL_BEGIN -> """ [57:24]
+        |   |           |           |           |--TEXT_BLOCK_CONTENT -> \n                    error: snippet markup: invalid regex\n                    hello there //   @highlight  type="italics" regex ="  ["\n                                                                          ^\n                     [57:27]
+        |   |           |           |           `--TEXT_BLOCK_LITERAL_END -> """ [61:20]
+        |   |           |           `--RPAREN -> ) [61:23]
+        |   |           `--RPAREN -> ) [62:16]
+        |   `--SEMI -> ; [62:17]
+        |--RECORD_DEF -> RECORD_DEF [64:4]
+        |   |--MODIFIERS -> MODIFIERS [64:4]
+        |   |   `--LITERAL_PRIVATE -> private [64:4]
+        |   |--LITERAL_RECORD -> record [64:12]
+        |   |--IDENT -> TestCase [64:19]
+        |   |--LPAREN -> ( [64:27]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [64:28]
+        |   |   |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [64:28]
+        |   |   |   |--ANNOTATIONS -> ANNOTATIONS [64:28]
+        |   |   |   |--TYPE -> TYPE [64:28]
+        |   |   |   |   `--IDENT -> String [64:28]
+        |   |   |   `--IDENT -> s1 [64:35]
+        |   |   |--COMMA -> , [64:37]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [64:39]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [64:39]
+        |   |       |--TYPE -> TYPE [64:39]
+        |   |       |   `--IDENT -> String [64:39]
+        |   |       `--IDENT -> s2 [64:46]
+        |   |--RPAREN -> ) [64:48]
+        |   `--OBJBLOCK -> OBJBLOCK [64:49]
+        |       |--LCURLY -> { [64:49]
+        |       `--RCURLY -> } [64:50]
+        `--RCURLY -> } [65:0]
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedUnnamedVariableBasic.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedUnnamedVariableBasic.txt
new file mode 100644
index 00000000000..fd6fd0f398e
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedUnnamedVariableBasic.txt
@@ -0,0 +1,809 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [2:47]
+|   |--DOT -> . [2:47]
+|   |   |--DOT -> . [2:39]
+|   |   |   |--DOT -> . [2:28]
+|   |   |   |   |--DOT -> . [2:22]
+|   |   |   |   |   |--DOT -> . [2:11]
+|   |   |   |   |   |   |--IDENT -> com [2:8]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [2:12]
+|   |   |   |   |   `--IDENT -> tools [2:23]
+|   |   |   |   `--IDENT -> checkstyle [2:29]
+|   |   |   `--IDENT -> grammar [2:40]
+|   |   `--IDENT -> java21 [2:48]
+|   `--SEMI -> ; [2:54]
+`--CLASS_DEF -> CLASS_DEF [4:0]
+    |--MODIFIERS -> MODIFIERS [4:0]
+    |   `--LITERAL_PUBLIC -> public [4:0]
+    |--LITERAL_CLASS -> class [4:7]
+    |--IDENT -> InputUnnamedVariableBasic [4:13]
+    `--OBJBLOCK -> OBJBLOCK [4:39]
+        |--LCURLY -> { [4:39]
+        |--METHOD_DEF -> METHOD_DEF [5:8]
+        |   |--MODIFIERS -> MODIFIERS [5:8]
+        |   |   `--LITERAL_PRIVATE -> private [5:8]
+        |   |--TYPE -> TYPE [5:16]
+        |   |   `--LITERAL_VOID -> void [5:16]
+        |   |--IDENT -> unnamedTest [5:21]
+        |   |--LPAREN -> ( [5:32]
+        |   |--PARAMETERS -> PARAMETERS [5:33]
+        |   |--RPAREN -> ) [5:33]
+        |   `--SLIST -> { [5:35]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [6:8]
+        |       |   |--MODIFIERS -> MODIFIERS [6:8]
+        |       |   |--TYPE -> TYPE [6:8]
+        |       |   |   `--LITERAL_INT -> int [6:8]
+        |       |   |--IDENT -> _ [6:12]
+        |       |   `--ASSIGN -> = [6:14]
+        |       |       `--EXPR -> EXPR [6:16]
+        |       |           `--NUM_INT -> 0 [6:16]
+        |       |--SEMI -> ; [6:17]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [7:8]
+        |       |   |--MODIFIERS -> MODIFIERS [7:8]
+        |       |   |--TYPE -> TYPE [7:8]
+        |       |   |   `--LITERAL_INT -> int [7:8]
+        |       |   |--IDENT -> _ [7:12]
+        |       |   `--ASSIGN -> = [7:14]
+        |       |       `--EXPR -> EXPR [7:16]
+        |       |           `--NUM_INT -> 1 [7:16]
+        |       |--SEMI -> ; [7:17]
+        |       |--LITERAL_TRY -> try [8:8]
+        |       |   |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [8:12]
+        |       |   |   |--LPAREN -> ( [8:12]
+        |       |   |   |--RESOURCES -> RESOURCES [8:13]
+        |       |   |   |   `--RESOURCE -> RESOURCE [8:13]
+        |       |   |   |       |--MODIFIERS -> MODIFIERS [8:13]
+        |       |   |   |       |--TYPE -> TYPE [8:13]
+        |       |   |   |       |   `--IDENT -> Lock [8:13]
+        |       |   |   |       |--IDENT -> _ [8:18]
+        |       |   |   |       `--ASSIGN -> = [8:20]
+        |       |   |   |           `--EXPR -> EXPR [8:22]
+        |       |   |   |               `--LITERAL_NULL -> null [8:22]
+        |       |   |   `--RPAREN -> ) [8:26]
+        |       |   `--SLIST -> { [8:28]
+        |       |       |--LITERAL_TRY -> try [9:12]
+        |       |       |   |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [9:16]
+        |       |       |   |   |--LPAREN -> ( [9:16]
+        |       |       |   |   |--RESOURCES -> RESOURCES [9:17]
+        |       |       |   |   |   `--RESOURCE -> RESOURCE [9:17]
+        |       |       |   |   |       |--MODIFIERS -> MODIFIERS [9:17]
+        |       |       |   |   |       |--TYPE -> TYPE [9:17]
+        |       |       |   |   |       |   `--IDENT -> Lock [9:17]
+        |       |       |   |   |       |--IDENT -> _ [9:22]
+        |       |       |   |   |       `--ASSIGN -> = [9:24]
+        |       |       |   |   |           `--EXPR -> EXPR [9:26]
+        |       |       |   |   |               `--LITERAL_NULL -> null [9:26]
+        |       |       |   |   `--RPAREN -> ) [9:30]
+        |       |       |   |--SLIST -> { [9:32]
+        |       |       |   |   `--RCURLY -> } [10:12]
+        |       |       |   `--LITERAL_CATCH -> catch [10:14]
+        |       |       |       |--LPAREN -> ( [10:20]
+        |       |       |       |--PARAMETER_DEF -> PARAMETER_DEF [10:21]
+        |       |       |       |   |--MODIFIERS -> MODIFIERS [10:21]
+        |       |       |       |   |--TYPE -> TYPE [10:21]
+        |       |       |       |   |   `--IDENT -> Exception [10:21]
+        |       |       |       |   `--IDENT -> _ [10:31]
+        |       |       |       |--RPAREN -> ) [10:32]
+        |       |       |       `--SLIST -> { [10:34]
+        |       |       |           |--LITERAL_TRY -> try [11:16]
+        |       |       |           |   |--SLIST -> { [11:20]
+        |       |       |           |   |   `--RCURLY -> } [12:16]
+        |       |       |           |   `--LITERAL_CATCH -> catch [12:18]
+        |       |       |           |       |--LPAREN -> ( [12:24]
+        |       |       |           |       |--PARAMETER_DEF -> PARAMETER_DEF [12:25]
+        |       |       |           |       |   |--MODIFIERS -> MODIFIERS [12:25]
+        |       |       |           |       |   |--TYPE -> TYPE [12:25]
+        |       |       |           |       |   |   `--IDENT -> Exception [12:25]
+        |       |       |           |       |   `--IDENT -> _ [12:35]
+        |       |       |           |       |--RPAREN -> ) [12:36]
+        |       |       |           |       `--SLIST -> { [12:38]
+        |       |       |           |           `--RCURLY -> } [12:39]
+        |       |       |           `--RCURLY -> } [13:12]
+        |       |       `--RCURLY -> } [14:8]
+        |       |--LITERAL_TRY -> try [15:8]
+        |       |   |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [15:12]
+        |       |   |   |--LPAREN -> ( [15:12]
+        |       |   |   |--RESOURCES -> RESOURCES [15:13]
+        |       |   |   |   `--RESOURCE -> RESOURCE [15:13]
+        |       |   |   |       |--MODIFIERS -> MODIFIERS [15:13]
+        |       |   |   |       |   `--FINAL -> final [15:13]
+        |       |   |   |       |--TYPE -> TYPE [15:19]
+        |       |   |   |       |   `--IDENT -> Lock [15:19]
+        |       |   |   |       |--IDENT -> _ [15:24]
+        |       |   |   |       `--ASSIGN -> = [15:26]
+        |       |   |   |           `--EXPR -> EXPR [15:28]
+        |       |   |   |               `--LITERAL_NULL -> null [15:28]
+        |       |   |   `--RPAREN -> ) [15:32]
+        |       |   `--SLIST -> { [15:34]
+        |       |       `--RCURLY -> } [15:36]
+        |       |--LITERAL_TRY -> try [16:8]
+        |       |   |--RESOURCE_SPECIFICATION -> RESOURCE_SPECIFICATION [16:12]
+        |       |   |   |--LPAREN -> ( [16:12]
+        |       |   |   |--RESOURCES -> RESOURCES [16:13]
+        |       |   |   |   `--RESOURCE -> RESOURCE [16:13]
+        |       |   |   |       |--MODIFIERS -> MODIFIERS [16:13]
+        |       |   |   |       |   `--ANNOTATION -> ANNOTATION [16:13]
+        |       |   |   |       |       |--AT -> @ [16:13]
+        |       |   |   |       |       `--IDENT -> Foo [16:14]
+        |       |   |   |       |--TYPE -> TYPE [16:18]
+        |       |   |   |       |   `--IDENT -> Lock [16:18]
+        |       |   |   |       |--IDENT -> _ [16:23]
+        |       |   |   |       `--ASSIGN -> = [16:25]
+        |       |   |   |           `--EXPR -> EXPR [16:27]
+        |       |   |   |               `--LITERAL_NULL -> null [16:27]
+        |       |   |   `--RPAREN -> ) [16:31]
+        |       |   `--SLIST -> { [16:33]
+        |       |       `--RCURLY -> } [16:35]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [18:8]
+        |       |   |--MODIFIERS -> MODIFIERS [18:8]
+        |       |   |--TYPE -> TYPE [18:8]
+        |       |   |   |--IDENT -> String [18:8]
+        |       |   |   `--ARRAY_DECLARATOR -> [ [18:14]
+        |       |   |       `--RBRACK -> ] [18:15]
+        |       |   |--IDENT -> strs [18:17]
+        |       |   `--ASSIGN -> = [18:22]
+        |       |       `--EXPR -> EXPR [18:24]
+        |       |           `--LITERAL_NEW -> new [18:24]
+        |       |               |--IDENT -> String [18:28]
+        |       |               |--ARRAY_DECLARATOR -> [ [18:34]
+        |       |               |   `--RBRACK -> ] [18:35]
+        |       |               `--ARRAY_INIT -> { [18:37]
+        |       |                   |--EXPR -> EXPR [18:39]
+        |       |                   |   `--STRING_LITERAL -> "str1" [18:39]
+        |       |                   |--COMMA -> , [18:45]
+        |       |                   |--EXPR -> EXPR [18:47]
+        |       |                   |   `--STRING_LITERAL -> "str2" [18:47]
+        |       |                   `--RCURLY -> } [18:54]
+        |       |--SEMI -> ; [18:55]
+        |       |--LITERAL_FOR -> for [19:8]
+        |       |   |--LPAREN -> ( [19:12]
+        |       |   |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [19:13]
+        |       |   |   |--VARIABLE_DEF -> VARIABLE_DEF [19:13]
+        |       |   |   |   |--MODIFIERS -> MODIFIERS [19:13]
+        |       |   |   |   |--TYPE -> TYPE [19:13]
+        |       |   |   |   |   `--IDENT -> var [19:13]
+        |       |   |   |   `--IDENT -> _ [19:17]
+        |       |   |   |--COLON -> : [19:19]
+        |       |   |   `--EXPR -> EXPR [19:21]
+        |       |   |       `--IDENT -> strs [19:21]
+        |       |   |--RPAREN -> ) [19:25]
+        |       |   `--SLIST -> { [19:27]
+        |       |       |--LITERAL_FOR -> for [20:12]
+        |       |       |   |--LPAREN -> ( [20:16]
+        |       |       |   |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [20:17]
+        |       |       |   |   |--VARIABLE_DEF -> VARIABLE_DEF [20:17]
+        |       |       |   |   |   |--MODIFIERS -> MODIFIERS [20:17]
+        |       |       |   |   |   |--TYPE -> TYPE [20:17]
+        |       |       |   |   |   |   `--IDENT -> var [20:17]
+        |       |       |   |   |   `--IDENT -> _ [20:21]
+        |       |       |   |   |--COLON -> : [20:23]
+        |       |       |   |   `--EXPR -> EXPR [20:25]
+        |       |       |   |       `--IDENT -> strs [20:25]
+        |       |       |   |--RPAREN -> ) [20:29]
+        |       |       |   `--SLIST -> { [20:31]
+        |       |       |       `--RCURLY -> } [21:12]
+        |       |       `--RCURLY -> } [22:8]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [23:8]
+        |       |   |--MODIFIERS -> MODIFIERS [23:8]
+        |       |   |--TYPE -> TYPE [23:8]
+        |       |   |   `--IDENT -> TwoParams [23:8]
+        |       |   |--IDENT -> p1 [23:18]
+        |       |   `--ASSIGN -> = [23:21]
+        |       |       `--LAMBDA -> -> [23:30]
+        |       |           |--LPAREN -> ( [23:23]
+        |       |           |--PARAMETERS -> PARAMETERS [23:24]
+        |       |           |   |--PARAMETER_DEF -> PARAMETER_DEF [23:24]
+        |       |           |   |   |--MODIFIERS -> MODIFIERS [23:24]
+        |       |           |   |   |--TYPE -> TYPE [23:24]
+        |       |           |   |   `--IDENT -> _ [23:24]
+        |       |           |   |--COMMA -> , [23:25]
+        |       |           |   `--PARAMETER_DEF -> PARAMETER_DEF [23:27]
+        |       |           |       |--MODIFIERS -> MODIFIERS [23:27]
+        |       |           |       |--TYPE -> TYPE [23:27]
+        |       |           |       `--IDENT -> _ [23:27]
+        |       |           |--RPAREN -> ) [23:28]
+        |       |           `--SLIST -> { [23:33]
+        |       |               `--RCURLY -> } [23:34]
+        |       |--SEMI -> ; [23:35]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [24:8]
+        |       |   |--MODIFIERS -> MODIFIERS [24:8]
+        |       |   |--TYPE -> TYPE [24:8]
+        |       |   |   `--IDENT -> TwoParams [24:8]
+        |       |   |--IDENT -> p2 [24:18]
+        |       |   `--ASSIGN -> = [24:21]
+        |       |       `--LAMBDA -> -> [24:38]
+        |       |           |--LPAREN -> ( [24:23]
+        |       |           |--PARAMETERS -> PARAMETERS [24:24]
+        |       |           |   |--PARAMETER_DEF -> PARAMETER_DEF [24:24]
+        |       |           |   |   |--MODIFIERS -> MODIFIERS [24:24]
+        |       |           |   |   |--TYPE -> TYPE [24:24]
+        |       |           |   |   |   `--IDENT -> var [24:24]
+        |       |           |   |   `--IDENT -> _ [24:28]
+        |       |           |   |--COMMA -> , [24:29]
+        |       |           |   `--PARAMETER_DEF -> PARAMETER_DEF [24:31]
+        |       |           |       |--MODIFIERS -> MODIFIERS [24:31]
+        |       |           |       |--TYPE -> TYPE [24:31]
+        |       |           |       |   `--IDENT -> var [24:31]
+        |       |           |       `--IDENT -> _ [24:35]
+        |       |           |--RPAREN -> ) [24:36]
+        |       |           `--SLIST -> { [24:41]
+        |       |               `--RCURLY -> } [24:42]
+        |       |--SEMI -> ; [24:43]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [25:8]
+        |       |   |--MODIFIERS -> MODIFIERS [25:8]
+        |       |   |--TYPE -> TYPE [25:8]
+        |       |   |   `--IDENT -> TwoIntParams [25:8]
+        |       |   |--IDENT -> p3 [25:21]
+        |       |   `--ASSIGN -> = [25:24]
+        |       |       `--LAMBDA -> -> [25:41]
+        |       |           |--LPAREN -> ( [25:26]
+        |       |           |--PARAMETERS -> PARAMETERS [25:27]
+        |       |           |   |--PARAMETER_DEF -> PARAMETER_DEF [25:27]
+        |       |           |   |   |--MODIFIERS -> MODIFIERS [25:27]
+        |       |           |   |   |--TYPE -> TYPE [25:27]
+        |       |           |   |   |   `--LITERAL_INT -> int [25:27]
+        |       |           |   |   `--IDENT -> _ [25:31]
+        |       |           |   |--COMMA -> , [25:32]
+        |       |           |   `--PARAMETER_DEF -> PARAMETER_DEF [25:34]
+        |       |           |       |--MODIFIERS -> MODIFIERS [25:34]
+        |       |           |       |--TYPE -> TYPE [25:34]
+        |       |           |       |   `--LITERAL_INT -> int [25:34]
+        |       |           |       `--IDENT -> b [25:38]
+        |       |           |--RPAREN -> ) [25:39]
+        |       |           `--SLIST -> { [25:44]
+        |       |               `--RCURLY -> } [25:45]
+        |       |--SEMI -> ; [25:46]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [26:8]
+        |       |   |--MODIFIERS -> MODIFIERS [26:8]
+        |       |   |--TYPE -> TYPE [26:8]
+        |       |   |   `--IDENT -> TwoIntParams [26:8]
+        |       |   |--IDENT -> p4 [26:21]
+        |       |   `--ASSIGN -> = [26:24]
+        |       |       `--LAMBDA -> -> [26:41]
+        |       |           |--LPAREN -> ( [26:26]
+        |       |           |--PARAMETERS -> PARAMETERS [26:27]
+        |       |           |   |--PARAMETER_DEF -> PARAMETER_DEF [26:27]
+        |       |           |   |   |--MODIFIERS -> MODIFIERS [26:27]
+        |       |           |   |   |--TYPE -> TYPE [26:27]
+        |       |           |   |   |   `--LITERAL_INT -> int [26:27]
+        |       |           |   |   `--IDENT -> _ [26:31]
+        |       |           |   |--COMMA -> , [26:32]
+        |       |           |   `--PARAMETER_DEF -> PARAMETER_DEF [26:34]
+        |       |           |       |--MODIFIERS -> MODIFIERS [26:34]
+        |       |           |       |--TYPE -> TYPE [26:34]
+        |       |           |       |   `--LITERAL_INT -> int [26:34]
+        |       |           |       `--IDENT -> _ [26:38]
+        |       |           |--RPAREN -> ) [26:39]
+        |       |           `--SLIST -> { [26:44]
+        |       |               `--RCURLY -> } [26:45]
+        |       |--SEMI -> ; [26:46]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [27:8]
+        |       |   |--MODIFIERS -> MODIFIERS [27:8]
+        |       |   |--TYPE -> TYPE [27:8]
+        |       |   |   `--IDENT -> TwoIntParamsIntRet [27:8]
+        |       |   |--IDENT -> p5 [27:27]
+        |       |   `--ASSIGN -> = [27:30]
+        |       |       `--LAMBDA -> -> [27:47]
+        |       |           |--LPAREN -> ( [27:32]
+        |       |           |--PARAMETERS -> PARAMETERS [27:33]
+        |       |           |   |--PARAMETER_DEF -> PARAMETER_DEF [27:33]
+        |       |           |   |   |--MODIFIERS -> MODIFIERS [27:33]
+        |       |           |   |   |--TYPE -> TYPE [27:33]
+        |       |           |   |   |   `--LITERAL_INT -> int [27:33]
+        |       |           |   |   `--IDENT -> _ [27:37]
+        |       |           |   |--COMMA -> , [27:38]
+        |       |           |   `--PARAMETER_DEF -> PARAMETER_DEF [27:40]
+        |       |           |       |--MODIFIERS -> MODIFIERS [27:40]
+        |       |           |       |--TYPE -> TYPE [27:40]
+        |       |           |       |   `--LITERAL_INT -> int [27:40]
+        |       |           |       `--IDENT -> _ [27:44]
+        |       |           |--RPAREN -> ) [27:45]
+        |       |           `--SLIST -> { [27:50]
+        |       |               |--LITERAL_RETURN -> return [27:52]
+        |       |               |   |--EXPR -> EXPR [27:59]
+        |       |               |   |   `--NUM_INT -> 1 [27:59]
+        |       |               |   `--SEMI -> ; [27:60]
+        |       |               `--RCURLY -> } [27:62]
+        |       |--SEMI -> ; [27:63]
+        |       |--EXPR -> EXPR [29:14]
+        |       |   `--METHOD_CALL -> ( [29:14]
+        |       |       |--DOT -> . [29:10]
+        |       |       |   |--IDENT -> p1 [29:8]
+        |       |       |   `--IDENT -> run [29:11]
+        |       |       |--ELIST -> ELIST [29:15]
+        |       |       |   |--EXPR -> EXPR [29:15]
+        |       |       |   |   `--NUM_INT -> 1 [29:15]
+        |       |       |   |--COMMA -> , [29:16]
+        |       |       |   `--EXPR -> EXPR [29:18]
+        |       |       |       `--NUM_INT -> 2 [29:18]
+        |       |       `--RPAREN -> ) [29:19]
+        |       |--SEMI -> ; [29:20]
+        |       |--EXPR -> EXPR [30:14]
+        |       |   `--METHOD_CALL -> ( [30:14]
+        |       |       |--DOT -> . [30:10]
+        |       |       |   |--IDENT -> p2 [30:8]
+        |       |       |   `--IDENT -> run [30:11]
+        |       |       |--ELIST -> ELIST [30:15]
+        |       |       |   |--EXPR -> EXPR [30:15]
+        |       |       |   |   `--NUM_INT -> 1 [30:15]
+        |       |       |   |--COMMA -> , [30:16]
+        |       |       |   `--EXPR -> EXPR [30:18]
+        |       |       |       `--NUM_INT -> 2 [30:18]
+        |       |       `--RPAREN -> ) [30:19]
+        |       |--SEMI -> ; [30:20]
+        |       |--EXPR -> EXPR [31:14]
+        |       |   `--METHOD_CALL -> ( [31:14]
+        |       |       |--DOT -> . [31:10]
+        |       |       |   |--IDENT -> p3 [31:8]
+        |       |       |   `--IDENT -> run [31:11]
+        |       |       |--ELIST -> ELIST [31:15]
+        |       |       |   |--EXPR -> EXPR [31:15]
+        |       |       |   |   `--NUM_INT -> 1 [31:15]
+        |       |       |   |--COMMA -> , [31:16]
+        |       |       |   `--EXPR -> EXPR [31:18]
+        |       |       |       `--NUM_INT -> 2 [31:18]
+        |       |       `--RPAREN -> ) [31:19]
+        |       |--SEMI -> ; [31:20]
+        |       |--EXPR -> EXPR [32:14]
+        |       |   `--METHOD_CALL -> ( [32:14]
+        |       |       |--DOT -> . [32:10]
+        |       |       |   |--IDENT -> p4 [32:8]
+        |       |       |   `--IDENT -> run [32:11]
+        |       |       |--ELIST -> ELIST [32:15]
+        |       |       |   |--EXPR -> EXPR [32:15]
+        |       |       |   |   `--NUM_INT -> 1 [32:15]
+        |       |       |   |--COMMA -> , [32:16]
+        |       |       |   `--EXPR -> EXPR [32:18]
+        |       |       |       `--NUM_INT -> 2 [32:18]
+        |       |       `--RPAREN -> ) [32:19]
+        |       |--SEMI -> ; [32:20]
+        |       |--EXPR -> EXPR [33:14]
+        |       |   `--METHOD_CALL -> ( [33:14]
+        |       |       |--DOT -> . [33:10]
+        |       |       |   |--IDENT -> p5 [33:8]
+        |       |       |   `--IDENT -> run [33:11]
+        |       |       |--ELIST -> ELIST [33:15]
+        |       |       |   |--EXPR -> EXPR [33:15]
+        |       |       |   |   `--NUM_INT -> 1 [33:15]
+        |       |       |   |--COMMA -> , [33:16]
+        |       |       |   `--EXPR -> EXPR [33:18]
+        |       |       |       `--NUM_INT -> 2 [33:18]
+        |       |       `--RPAREN -> ) [33:19]
+        |       |--SEMI -> ; [33:20]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [35:8]
+        |       |   |--MODIFIERS -> MODIFIERS [35:8]
+        |       |   |--TYPE -> TYPE [35:8]
+        |       |   |   `--IDENT -> R [35:8]
+        |       |   |--IDENT -> r [35:10]
+        |       |   `--ASSIGN -> = [35:12]
+        |       |       `--EXPR -> EXPR [35:14]
+        |       |           `--LITERAL_NEW -> new [35:14]
+        |       |               |--IDENT -> R [35:18]
+        |       |               |--LPAREN -> ( [35:19]
+        |       |               |--ELIST -> ELIST [35:20]
+        |       |               |   `--EXPR -> EXPR [35:20]
+        |       |               |       `--LITERAL_NULL -> null [35:20]
+        |       |               `--RPAREN -> ) [35:24]
+        |       |--SEMI -> ; [35:25]
+        |       |--LITERAL_IF -> if [36:8]
+        |       |   |--LPAREN -> ( [36:11]
+        |       |   |--EXPR -> EXPR [36:14]
+        |       |   |   `--LITERAL_INSTANCEOF -> instanceof [36:14]
+        |       |   |       |--IDENT -> r [36:12]
+        |       |   |       `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [36:25]
+        |       |   |           |--MODIFIERS -> MODIFIERS [36:25]
+        |       |   |           |--TYPE -> TYPE [36:25]
+        |       |   |           |   `--IDENT -> R [36:25]
+        |       |   |           `--IDENT -> _ [36:27]
+        |       |   |--RPAREN -> ) [36:28]
+        |       |   `--SLIST -> { [36:30]
+        |       |       `--RCURLY -> } [36:31]
+        |       |--LITERAL_IF -> if [37:8]
+        |       |   |--LPAREN -> ( [37:11]
+        |       |   |--EXPR -> EXPR [37:14]
+        |       |   |   `--LITERAL_INSTANCEOF -> instanceof [37:14]
+        |       |   |       |--IDENT -> r [37:12]
+        |       |   |       `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [37:25]
+        |       |   |           |--MODIFIERS -> MODIFIERS [37:25]
+        |       |   |           |--TYPE -> TYPE [37:25]
+        |       |   |           |   `--IDENT -> R [37:25]
+        |       |   |           |--LPAREN -> ( [37:26]
+        |       |   |           |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [37:27]
+        |       |   |           |   `--UNNAMED_PATTERN_DEF -> _ [37:27]
+        |       |   |           `--RPAREN -> ) [37:28]
+        |       |   |--RPAREN -> ) [37:29]
+        |       |   `--SLIST -> { [37:31]
+        |       |       `--RCURLY -> } [37:32]
+        |       |--LITERAL_FOR -> for [38:8]
+        |       |   |--LPAREN -> ( [38:12]
+        |       |   |--FOR_INIT -> FOR_INIT [38:13]
+        |       |   |   |--VARIABLE_DEF -> VARIABLE_DEF [38:13]
+        |       |   |   |   |--MODIFIERS -> MODIFIERS [38:13]
+        |       |   |   |   |--TYPE -> TYPE [38:13]
+        |       |   |   |   |   `--LITERAL_INT -> int [38:13]
+        |       |   |   |   |--IDENT -> _ [38:17]
+        |       |   |   |   `--ASSIGN -> = [38:19]
+        |       |   |   |       `--EXPR -> EXPR [38:21]
+        |       |   |   |           `--NUM_INT -> 0 [38:21]
+        |       |   |   |--COMMA -> , [38:22]
+        |       |   |   |--VARIABLE_DEF -> VARIABLE_DEF [38:13]
+        |       |   |   |   |--MODIFIERS -> MODIFIERS [38:13]
+        |       |   |   |   |--TYPE -> TYPE [38:13]
+        |       |   |   |   |   `--LITERAL_INT -> int [38:13]
+        |       |   |   |   |--IDENT -> _ [38:24]
+        |       |   |   |   `--ASSIGN -> = [38:26]
+        |       |   |   |       `--EXPR -> EXPR [38:28]
+        |       |   |   |           `--NUM_INT -> 1 [38:28]
+        |       |   |   |--COMMA -> , [38:29]
+        |       |   |   `--VARIABLE_DEF -> VARIABLE_DEF [38:13]
+        |       |   |       |--MODIFIERS -> MODIFIERS [38:13]
+        |       |   |       |--TYPE -> TYPE [38:13]
+        |       |   |       |   `--LITERAL_INT -> int [38:13]
+        |       |   |       |--IDENT -> x [38:31]
+        |       |   |       `--ASSIGN -> = [38:33]
+        |       |   |           `--EXPR -> EXPR [38:35]
+        |       |   |               `--NUM_INT -> 1 [38:35]
+        |       |   |--SEMI -> ; [38:36]
+        |       |   |--FOR_CONDITION -> FOR_CONDITION [38:40]
+        |       |   |   `--EXPR -> EXPR [38:40]
+        |       |   |       `--LE -> <= [38:40]
+        |       |   |           |--IDENT -> x [38:38]
+        |       |   |           `--NUM_INT -> 1 [38:43]
+        |       |   |--SEMI -> ; [38:45]
+        |       |   |--FOR_ITERATOR -> FOR_ITERATOR [38:48]
+        |       |   |   `--ELIST -> ELIST [38:48]
+        |       |   |       `--EXPR -> EXPR [38:48]
+        |       |   |           `--POST_INC -> ++ [38:48]
+        |       |   |               `--IDENT -> x [38:47]
+        |       |   |--RPAREN -> ) [38:50]
+        |       |   `--SLIST -> { [38:52]
+        |       |       `--RCURLY -> } [38:53]
+        |       `--RCURLY -> } [39:4]
+        |--RECORD_DEF -> RECORD_DEF [42:4]
+        |   |--MODIFIERS -> MODIFIERS [42:4]
+        |   |--LITERAL_RECORD -> record [42:4]
+        |   |--IDENT -> Point [42:11]
+        |   |--LPAREN -> ( [42:16]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [42:17]
+        |   |   |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [42:17]
+        |   |   |   |--ANNOTATIONS -> ANNOTATIONS [42:17]
+        |   |   |   |--TYPE -> TYPE [42:17]
+        |   |   |   |   `--LITERAL_INT -> int [42:17]
+        |   |   |   `--IDENT -> x [42:21]
+        |   |   |--COMMA -> , [42:22]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [42:24]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [42:24]
+        |   |       |--TYPE -> TYPE [42:24]
+        |   |       |   `--LITERAL_INT -> int [42:24]
+        |   |       `--IDENT -> y [42:28]
+        |   |--RPAREN -> ) [42:29]
+        |   `--OBJBLOCK -> OBJBLOCK [42:31]
+        |       |--LCURLY -> { [42:31]
+        |       `--RCURLY -> } [42:33]
+        |--ENUM_DEF -> ENUM_DEF [43:4]
+        |   |--MODIFIERS -> MODIFIERS [43:4]
+        |   |--ENUM -> enum [43:4]
+        |   |--IDENT -> Color [43:9]
+        |   `--OBJBLOCK -> OBJBLOCK [43:15]
+        |       |--LCURLY -> { [43:15]
+        |       |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [43:17]
+        |       |   |--ANNOTATIONS -> ANNOTATIONS [43:17]
+        |       |   `--IDENT -> RED [43:17]
+        |       |--COMMA -> , [43:20]
+        |       |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [43:22]
+        |       |   |--ANNOTATIONS -> ANNOTATIONS [43:22]
+        |       |   `--IDENT -> GREEN [43:22]
+        |       |--COMMA -> , [43:27]
+        |       |--ENUM_CONSTANT_DEF -> ENUM_CONSTANT_DEF [43:29]
+        |       |   |--ANNOTATIONS -> ANNOTATIONS [43:29]
+        |       |   `--IDENT -> BLUE [43:29]
+        |       `--RCURLY -> } [43:34]
+        |--RECORD_DEF -> RECORD_DEF [44:4]
+        |   |--MODIFIERS -> MODIFIERS [44:4]
+        |   |--LITERAL_RECORD -> record [44:4]
+        |   |--IDENT -> ColoredPoint [44:11]
+        |   |--LPAREN -> ( [44:23]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [44:24]
+        |   |   |--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [44:24]
+        |   |   |   |--ANNOTATIONS -> ANNOTATIONS [44:24]
+        |   |   |   |--TYPE -> TYPE [44:24]
+        |   |   |   |   `--IDENT -> Point [44:24]
+        |   |   |   `--IDENT -> p [44:30]
+        |   |   |--COMMA -> , [44:31]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [44:33]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [44:33]
+        |   |       |--TYPE -> TYPE [44:33]
+        |   |       |   `--IDENT -> Color [44:33]
+        |   |       `--IDENT -> c [44:39]
+        |   |--RPAREN -> ) [44:40]
+        |   `--OBJBLOCK -> OBJBLOCK [44:42]
+        |       |--LCURLY -> { [44:42]
+        |       `--RCURLY -> } [44:44]
+        |--METHOD_DEF -> METHOD_DEF [46:4]
+        |   |--MODIFIERS -> MODIFIERS [46:4]
+        |   |--TYPE -> TYPE [46:4]
+        |   |   `--LITERAL_VOID -> void [46:4]
+        |   |--IDENT -> jep443examples [46:9]
+        |   |--LPAREN -> ( [46:23]
+        |   |--PARAMETERS -> PARAMETERS [46:24]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [46:24]
+        |   |       |--MODIFIERS -> MODIFIERS [46:24]
+        |   |       |--TYPE -> TYPE [46:24]
+        |   |       |   `--IDENT -> ColoredPoint [46:24]
+        |   |       `--IDENT -> r [46:37]
+        |   |--RPAREN -> ) [46:38]
+        |   `--SLIST -> { [46:40]
+        |       |--LITERAL_IF -> if [47:8]
+        |       |   |--LPAREN -> ( [47:11]
+        |       |   |--EXPR -> EXPR [47:14]
+        |       |   |   `--LITERAL_INSTANCEOF -> instanceof [47:14]
+        |       |   |       |--IDENT -> r [47:12]
+        |       |   |       `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [47:25]
+        |       |   |           |--MODIFIERS -> MODIFIERS [47:25]
+        |       |   |           |--TYPE -> TYPE [47:25]
+        |       |   |           |   `--IDENT -> ColoredPoint [47:25]
+        |       |   |           |--LPAREN -> ( [47:37]
+        |       |   |           |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [47:38]
+        |       |   |           |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [47:38]
+        |       |   |           |   |   |--MODIFIERS -> MODIFIERS [47:38]
+        |       |   |           |   |   |--TYPE -> TYPE [47:38]
+        |       |   |           |   |   |   `--IDENT -> Point [47:38]
+        |       |   |           |   |   |--LPAREN -> ( [47:43]
+        |       |   |           |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [47:44]
+        |       |   |           |   |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [47:44]
+        |       |   |           |   |   |   |   |--MODIFIERS -> MODIFIERS [47:44]
+        |       |   |           |   |   |   |   |--TYPE -> TYPE [47:44]
+        |       |   |           |   |   |   |   |   `--LITERAL_INT -> int [47:44]
+        |       |   |           |   |   |   |   `--IDENT -> x [47:48]
+        |       |   |           |   |   |   |--COMMA -> , [47:49]
+        |       |   |           |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [47:51]
+        |       |   |           |   |   |       |--MODIFIERS -> MODIFIERS [47:51]
+        |       |   |           |   |   |       |--TYPE -> TYPE [47:51]
+        |       |   |           |   |   |       |   `--LITERAL_INT -> int [47:51]
+        |       |   |           |   |   |       `--IDENT -> y [47:55]
+        |       |   |           |   |   `--RPAREN -> ) [47:56]
+        |       |   |           |   |--COMMA -> , [47:57]
+        |       |   |           |   `--UNNAMED_PATTERN_DEF -> _ [47:59]
+        |       |   |           `--RPAREN -> ) [47:60]
+        |       |   |--RPAREN -> ) [47:61]
+        |       |   `--SLIST -> { [47:63]
+        |       |       `--RCURLY -> } [47:65]
+        |       |--LITERAL_IF -> if [48:8]
+        |       |   |--LPAREN -> ( [48:11]
+        |       |   |--EXPR -> EXPR [48:14]
+        |       |   |   `--LITERAL_INSTANCEOF -> instanceof [48:14]
+        |       |   |       |--IDENT -> r [48:12]
+        |       |   |       `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [48:25]
+        |       |   |           |--MODIFIERS -> MODIFIERS [48:25]
+        |       |   |           |--TYPE -> TYPE [48:25]
+        |       |   |           |   `--IDENT -> ColoredPoint [48:25]
+        |       |   |           |--LPAREN -> ( [48:37]
+        |       |   |           |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [48:38]
+        |       |   |           |   |--UNNAMED_PATTERN_DEF -> _ [48:38]
+        |       |   |           |   |--COMMA -> , [48:39]
+        |       |   |           |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [48:41]
+        |       |   |           |       |--MODIFIERS -> MODIFIERS [48:41]
+        |       |   |           |       |--TYPE -> TYPE [48:41]
+        |       |   |           |       |   `--IDENT -> Color [48:41]
+        |       |   |           |       `--IDENT -> c [48:47]
+        |       |   |           `--RPAREN -> ) [48:48]
+        |       |   |--RPAREN -> ) [48:49]
+        |       |   `--SLIST -> { [48:51]
+        |       |       `--RCURLY -> } [48:53]
+        |       |--LITERAL_IF -> if [49:8]
+        |       |   |--LPAREN -> ( [49:11]
+        |       |   |--EXPR -> EXPR [49:14]
+        |       |   |   `--LITERAL_INSTANCEOF -> instanceof [49:14]
+        |       |   |       |--IDENT -> r [49:12]
+        |       |   |       `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [49:25]
+        |       |   |           |--MODIFIERS -> MODIFIERS [49:25]
+        |       |   |           |--TYPE -> TYPE [49:25]
+        |       |   |           |   `--IDENT -> ColoredPoint [49:25]
+        |       |   |           |--LPAREN -> ( [49:37]
+        |       |   |           |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [49:38]
+        |       |   |           |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [49:38]
+        |       |   |           |   |   |--MODIFIERS -> MODIFIERS [49:38]
+        |       |   |           |   |   |--TYPE -> TYPE [49:38]
+        |       |   |           |   |   |   `--IDENT -> Point [49:38]
+        |       |   |           |   |   |--LPAREN -> ( [49:43]
+        |       |   |           |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [49:44]
+        |       |   |           |   |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [49:44]
+        |       |   |           |   |   |   |   |--MODIFIERS -> MODIFIERS [49:44]
+        |       |   |           |   |   |   |   |--TYPE -> TYPE [49:44]
+        |       |   |           |   |   |   |   |   `--LITERAL_INT -> int [49:44]
+        |       |   |           |   |   |   |   `--IDENT -> x [49:48]
+        |       |   |           |   |   |   |--COMMA -> , [49:49]
+        |       |   |           |   |   |   `--UNNAMED_PATTERN_DEF -> _ [49:51]
+        |       |   |           |   |   `--RPAREN -> ) [49:52]
+        |       |   |           |   |--COMMA -> , [49:53]
+        |       |   |           |   `--UNNAMED_PATTERN_DEF -> _ [49:55]
+        |       |   |           `--RPAREN -> ) [49:56]
+        |       |   |--RPAREN -> ) [49:57]
+        |       |   `--SLIST -> { [49:59]
+        |       |       `--RCURLY -> } [49:61]
+        |       |--LITERAL_IF -> if [50:8]
+        |       |   |--LPAREN -> ( [50:11]
+        |       |   |--EXPR -> EXPR [50:14]
+        |       |   |   `--LITERAL_INSTANCEOF -> instanceof [50:14]
+        |       |   |       |--IDENT -> r [50:12]
+        |       |   |       `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [50:25]
+        |       |   |           |--MODIFIERS -> MODIFIERS [50:25]
+        |       |   |           |--TYPE -> TYPE [50:25]
+        |       |   |           |   `--IDENT -> ColoredPoint [50:25]
+        |       |   |           |--LPAREN -> ( [50:37]
+        |       |   |           |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [50:38]
+        |       |   |           |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [50:38]
+        |       |   |           |   |   |--MODIFIERS -> MODIFIERS [50:38]
+        |       |   |           |   |   |--TYPE -> TYPE [50:38]
+        |       |   |           |   |   |   `--IDENT -> Point [50:38]
+        |       |   |           |   |   |--LPAREN -> ( [50:43]
+        |       |   |           |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [50:44]
+        |       |   |           |   |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [50:44]
+        |       |   |           |   |   |   |   |--MODIFIERS -> MODIFIERS [50:44]
+        |       |   |           |   |   |   |   |--TYPE -> TYPE [50:44]
+        |       |   |           |   |   |   |   |   `--LITERAL_INT -> int [50:44]
+        |       |   |           |   |   |   |   `--IDENT -> x [50:48]
+        |       |   |           |   |   |   |--COMMA -> , [50:49]
+        |       |   |           |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [50:51]
+        |       |   |           |   |   |       |--MODIFIERS -> MODIFIERS [50:51]
+        |       |   |           |   |   |       |--TYPE -> TYPE [50:51]
+        |       |   |           |   |   |       |   `--LITERAL_INT -> int [50:51]
+        |       |   |           |   |   |       `--IDENT -> _ [50:55]
+        |       |   |           |   |   `--RPAREN -> ) [50:56]
+        |       |   |           |   |--COMMA -> , [50:57]
+        |       |   |           |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [50:59]
+        |       |   |           |       |--MODIFIERS -> MODIFIERS [50:59]
+        |       |   |           |       |--TYPE -> TYPE [50:59]
+        |       |   |           |       |   `--IDENT -> Color [50:59]
+        |       |   |           |       `--IDENT -> _ [50:65]
+        |       |   |           `--RPAREN -> ) [50:66]
+        |       |   |--RPAREN -> ) [50:67]
+        |       |   `--SLIST -> { [50:69]
+        |       |       `--RCURLY -> } [50:71]
+        |       |--LITERAL_IF -> if [51:8]
+        |       |   |--LPAREN -> ( [51:11]
+        |       |   |--EXPR -> EXPR [51:14]
+        |       |   |   `--LITERAL_INSTANCEOF -> instanceof [51:14]
+        |       |   |       |--IDENT -> r [51:12]
+        |       |   |       `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [51:25]
+        |       |   |           |--MODIFIERS -> MODIFIERS [51:25]
+        |       |   |           |--TYPE -> TYPE [51:25]
+        |       |   |           |   `--IDENT -> ColoredPoint [51:25]
+        |       |   |           `--IDENT -> _ [51:38]
+        |       |   |--RPAREN -> ) [51:39]
+        |       |   `--SLIST -> { [51:41]
+        |       |       `--RCURLY -> } [51:43]
+        |       `--RCURLY -> } [52:4]
+        |--CLASS_DEF -> CLASS_DEF [54:4]
+        |   |--MODIFIERS -> MODIFIERS [54:4]
+        |   |--LITERAL_CLASS -> class [54:4]
+        |   |--IDENT -> Lock [54:10]
+        |   |--IMPLEMENTS_CLAUSE -> implements [54:15]
+        |   |   `--IDENT -> AutoCloseable [54:26]
+        |   `--OBJBLOCK -> OBJBLOCK [54:40]
+        |       |--LCURLY -> { [54:40]
+        |       |--METHOD_DEF -> METHOD_DEF [55:8]
+        |       |   |--MODIFIERS -> MODIFIERS [55:8]
+        |       |   |   |--ANNOTATION -> ANNOTATION [55:8]
+        |       |   |   |   |--AT -> @ [55:8]
+        |       |   |   |   `--IDENT -> Override [55:9]
+        |       |   |   `--LITERAL_PUBLIC -> public [56:8]
+        |       |   |--TYPE -> TYPE [56:15]
+        |       |   |   `--LITERAL_VOID -> void [56:15]
+        |       |   |--IDENT -> close [56:20]
+        |       |   |--LPAREN -> ( [56:25]
+        |       |   |--PARAMETERS -> PARAMETERS [56:26]
+        |       |   |--RPAREN -> ) [56:26]
+        |       |   `--SLIST -> { [56:28]
+        |       |       `--RCURLY -> } [56:29]
+        |       `--RCURLY -> } [57:4]
+        |--INTERFACE_DEF -> INTERFACE_DEF [58:4]
+        |   |--MODIFIERS -> MODIFIERS [58:4]
+        |   |--LITERAL_INTERFACE -> interface [58:4]
+        |   |--IDENT -> TwoParams [58:14]
+        |   `--OBJBLOCK -> OBJBLOCK [58:24]
+        |       |--LCURLY -> { [58:24]
+        |       |--METHOD_DEF -> METHOD_DEF [59:8]
+        |       |   |--MODIFIERS -> MODIFIERS [59:8]
+        |       |   |   `--LITERAL_PUBLIC -> public [59:8]
+        |       |   |--TYPE -> TYPE [59:15]
+        |       |   |   `--LITERAL_VOID -> void [59:15]
+        |       |   |--IDENT -> run [59:20]
+        |       |   |--LPAREN -> ( [59:23]
+        |       |   |--PARAMETERS -> PARAMETERS [59:24]
+        |       |   |   |--PARAMETER_DEF -> PARAMETER_DEF [59:24]
+        |       |   |   |   |--MODIFIERS -> MODIFIERS [59:24]
+        |       |   |   |   |--TYPE -> TYPE [59:24]
+        |       |   |   |   |   `--IDENT -> Object [59:24]
+        |       |   |   |   `--IDENT -> o1 [59:31]
+        |       |   |   |--COMMA -> , [59:33]
+        |       |   |   `--PARAMETER_DEF -> PARAMETER_DEF [59:35]
+        |       |   |       |--MODIFIERS -> MODIFIERS [59:35]
+        |       |   |       |--TYPE -> TYPE [59:35]
+        |       |   |       |   `--IDENT -> Object [59:35]
+        |       |   |       `--IDENT -> o2 [59:42]
+        |       |   |--RPAREN -> ) [59:44]
+        |       |   `--SEMI -> ; [59:45]
+        |       `--RCURLY -> } [60:4]
+        |--INTERFACE_DEF -> INTERFACE_DEF [61:4]
+        |   |--MODIFIERS -> MODIFIERS [61:4]
+        |   |--LITERAL_INTERFACE -> interface [61:4]
+        |   |--IDENT -> TwoIntParams [61:14]
+        |   `--OBJBLOCK -> OBJBLOCK [61:27]
+        |       |--LCURLY -> { [61:27]
+        |       |--METHOD_DEF -> METHOD_DEF [62:8]
+        |       |   |--MODIFIERS -> MODIFIERS [62:8]
+        |       |   |   `--LITERAL_PUBLIC -> public [62:8]
+        |       |   |--TYPE -> TYPE [62:15]
+        |       |   |   `--LITERAL_VOID -> void [62:15]
+        |       |   |--IDENT -> run [62:20]
+        |       |   |--LPAREN -> ( [62:23]
+        |       |   |--PARAMETERS -> PARAMETERS [62:24]
+        |       |   |   |--PARAMETER_DEF -> PARAMETER_DEF [62:24]
+        |       |   |   |   |--MODIFIERS -> MODIFIERS [62:24]
+        |       |   |   |   |--TYPE -> TYPE [62:24]
+        |       |   |   |   |   `--LITERAL_INT -> int [62:24]
+        |       |   |   |   `--IDENT -> o1 [62:28]
+        |       |   |   |--COMMA -> , [62:30]
+        |       |   |   `--PARAMETER_DEF -> PARAMETER_DEF [62:32]
+        |       |   |       |--MODIFIERS -> MODIFIERS [62:32]
+        |       |   |       |--TYPE -> TYPE [62:32]
+        |       |   |       |   `--LITERAL_INT -> int [62:32]
+        |       |   |       `--IDENT -> o2 [62:36]
+        |       |   |--RPAREN -> ) [62:38]
+        |       |   `--SEMI -> ; [62:39]
+        |       `--RCURLY -> } [63:4]
+        |--INTERFACE_DEF -> INTERFACE_DEF [64:4]
+        |   |--MODIFIERS -> MODIFIERS [64:4]
+        |   |--LITERAL_INTERFACE -> interface [64:4]
+        |   |--IDENT -> TwoIntParamsIntRet [64:14]
+        |   `--OBJBLOCK -> OBJBLOCK [64:33]
+        |       |--LCURLY -> { [64:33]
+        |       |--METHOD_DEF -> METHOD_DEF [65:8]
+        |       |   |--MODIFIERS -> MODIFIERS [65:8]
+        |       |   |   `--LITERAL_PUBLIC -> public [65:8]
+        |       |   |--TYPE -> TYPE [65:15]
+        |       |   |   `--LITERAL_INT -> int [65:15]
+        |       |   |--IDENT -> run [65:19]
+        |       |   |--LPAREN -> ( [65:22]
+        |       |   |--PARAMETERS -> PARAMETERS [65:23]
+        |       |   |   |--PARAMETER_DEF -> PARAMETER_DEF [65:23]
+        |       |   |   |   |--MODIFIERS -> MODIFIERS [65:23]
+        |       |   |   |   |--TYPE -> TYPE [65:23]
+        |       |   |   |   |   `--LITERAL_INT -> int [65:23]
+        |       |   |   |   `--IDENT -> a [65:27]
+        |       |   |   |--COMMA -> , [65:28]
+        |       |   |   `--PARAMETER_DEF -> PARAMETER_DEF [65:30]
+        |       |   |       |--MODIFIERS -> MODIFIERS [65:30]
+        |       |   |       |--TYPE -> TYPE [65:30]
+        |       |   |       |   `--LITERAL_INT -> int [65:30]
+        |       |   |       `--IDENT -> b [65:34]
+        |       |   |--RPAREN -> ) [65:35]
+        |       |   `--SEMI -> ; [65:36]
+        |       `--RCURLY -> } [66:4]
+        |--RECORD_DEF -> RECORD_DEF [67:4]
+        |   |--MODIFIERS -> MODIFIERS [67:4]
+        |   |--LITERAL_RECORD -> record [67:4]
+        |   |--IDENT -> R [67:11]
+        |   |--LPAREN -> ( [67:12]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [67:13]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [67:13]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [67:13]
+        |   |       |--TYPE -> TYPE [67:13]
+        |   |       |   `--IDENT -> Object [67:13]
+        |   |       `--IDENT -> o [67:20]
+        |   |--RPAREN -> ) [67:21]
+        |   `--OBJBLOCK -> OBJBLOCK [67:23]
+        |       |--LCURLY -> { [67:23]
+        |       `--RCURLY -> } [67:24]
+        |--ANNOTATION_DEF -> ANNOTATION_DEF [68:4]
+        |   |--MODIFIERS -> MODIFIERS [68:4]
+        |   |   `--LITERAL_PUBLIC -> public [68:4]
+        |   |--AT -> @ [68:11]
+        |   |--LITERAL_INTERFACE -> interface [68:12]
+        |   |--IDENT -> Foo [68:22]
+        |   `--OBJBLOCK -> OBJBLOCK [68:26]
+        |       |--LCURLY -> { [68:26]
+        |       `--RCURLY -> } [68:28]
+        `--RCURLY -> } [69:0]
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedUnnamedVariableSwitch.txt b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedUnnamedVariableSwitch.txt
new file mode 100644
index 00000000000..61db501e758
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/ExpectedUnnamedVariableSwitch.txt
@@ -0,0 +1,1061 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [2:47]
+|   |--DOT -> . [2:47]
+|   |   |--DOT -> . [2:39]
+|   |   |   |--DOT -> . [2:28]
+|   |   |   |   |--DOT -> . [2:22]
+|   |   |   |   |   |--DOT -> . [2:11]
+|   |   |   |   |   |   |--IDENT -> com [2:8]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [2:12]
+|   |   |   |   |   `--IDENT -> tools [2:23]
+|   |   |   |   `--IDENT -> checkstyle [2:29]
+|   |   |   `--IDENT -> grammar [2:40]
+|   |   `--IDENT -> java21 [2:48]
+|   `--SEMI -> ; [2:54]
+`--CLASS_DEF -> CLASS_DEF [4:0]
+    |--MODIFIERS -> MODIFIERS [4:0]
+    |   `--LITERAL_PUBLIC -> public [4:0]
+    |--LITERAL_CLASS -> class [4:7]
+    |--IDENT -> InputUnnamedVariableSwitch [4:13]
+    `--OBJBLOCK -> OBJBLOCK [4:40]
+        |--LCURLY -> { [4:40]
+        |--METHOD_DEF -> METHOD_DEF [5:8]
+        |   |--MODIFIERS -> MODIFIERS [5:8]
+        |   |--TYPE -> TYPE [5:8]
+        |   |   `--LITERAL_INT -> int [5:8]
+        |   |--IDENT -> testMultiValuesTopLevel [5:12]
+        |   |--LPAREN -> ( [5:35]
+        |   |--PARAMETERS -> PARAMETERS [5:36]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [5:36]
+        |   |       |--MODIFIERS -> MODIFIERS [5:36]
+        |   |       |--TYPE -> TYPE [5:36]
+        |   |       |   `--IDENT -> Object [5:36]
+        |   |       `--IDENT -> o [5:43]
+        |   |--RPAREN -> ) [5:44]
+        |   `--SLIST -> { [5:46]
+        |       |--LITERAL_RETURN -> return [6:8]
+        |       |   |--EXPR -> EXPR [6:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [6:15]
+        |       |   |       |--LPAREN -> ( [6:22]
+        |       |   |       |--EXPR -> EXPR [6:23]
+        |       |   |       |   `--IDENT -> o [6:23]
+        |       |   |       |--RPAREN -> ) [6:24]
+        |       |   |       |--LCURLY -> { [6:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [7:12]
+        |       |   |       |   |--LITERAL_CASE -> case [7:12]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [7:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [7:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [7:17]
+        |       |   |       |   |   |   |   `--IDENT -> R1 [7:17]
+        |       |   |       |   |   |   `--IDENT -> _ [7:20]
+        |       |   |       |   |   |--COMMA -> , [7:21]
+        |       |   |       |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [7:23]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [7:23]
+        |       |   |       |   |       |--TYPE -> TYPE [7:23]
+        |       |   |       |   |       |   `--IDENT -> R2 [7:23]
+        |       |   |       |   |       `--IDENT -> _ [7:26]
+        |       |   |       |   |--LAMBDA -> -> [7:28]
+        |       |   |       |   |--EXPR -> EXPR [7:31]
+        |       |   |       |   |   `--NUM_INT -> 1 [7:31]
+        |       |   |       |   `--SEMI -> ; [7:32]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [8:12]
+        |       |   |       |   |--LITERAL_DEFAULT -> default [8:12]
+        |       |   |       |   |--LAMBDA -> -> [8:20]
+        |       |   |       |   |--EXPR -> EXPR [8:23]
+        |       |   |       |   |   `--NUM_INT -> 2 [8:23]
+        |       |   |       |   `--SEMI -> ; [8:24]
+        |       |   |       `--RCURLY -> } [9:8]
+        |       |   `--SEMI -> ; [9:9]
+        |       `--RCURLY -> } [10:4]
+        |--METHOD_DEF -> METHOD_DEF [12:4]
+        |   |--MODIFIERS -> MODIFIERS [12:4]
+        |   |--TYPE -> TYPE [12:4]
+        |   |   `--LITERAL_INT -> int [12:4]
+        |   |--IDENT -> testMultiValuesTopLevel2 [12:8]
+        |   |--LPAREN -> ( [12:32]
+        |   |--PARAMETERS -> PARAMETERS [12:33]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [12:33]
+        |   |       |--MODIFIERS -> MODIFIERS [12:33]
+        |   |       |--TYPE -> TYPE [12:33]
+        |   |       |   `--IDENT -> Base [12:33]
+        |   |       `--IDENT -> o [12:38]
+        |   |--RPAREN -> ) [12:39]
+        |   `--SLIST -> { [12:41]
+        |       |--LITERAL_RETURN -> return [13:8]
+        |       |   |--EXPR -> EXPR [13:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [13:15]
+        |       |   |       |--LPAREN -> ( [13:22]
+        |       |   |       |--EXPR -> EXPR [13:23]
+        |       |   |       |   `--IDENT -> o [13:23]
+        |       |   |       |--RPAREN -> ) [13:24]
+        |       |   |       |--LCURLY -> { [13:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [14:12]
+        |       |   |       |   |--LITERAL_CASE -> case [14:12]
+        |       |   |       |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [14:17]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [14:17]
+        |       |   |       |   |       |--TYPE -> TYPE [14:17]
+        |       |   |       |   |       |   `--IDENT -> R1 [14:17]
+        |       |   |       |   |       `--IDENT -> r [14:20]
+        |       |   |       |   |--LAMBDA -> -> [14:22]
+        |       |   |       |   |--EXPR -> EXPR [14:25]
+        |       |   |       |   |   `--NUM_INT -> 1 [14:25]
+        |       |   |       |   `--SEMI -> ; [14:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [15:12]
+        |       |   |       |   |--LITERAL_CASE -> case [15:12]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [15:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [15:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [15:17]
+        |       |   |       |   |   |   |   `--IDENT -> R2 [15:17]
+        |       |   |       |   |   |   `--IDENT -> _ [15:20]
+        |       |   |       |   |   |--COMMA -> , [15:21]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [15:23]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [15:23]
+        |       |   |       |   |   |   |--TYPE -> TYPE [15:23]
+        |       |   |       |   |   |   |   `--IDENT -> R3 [15:23]
+        |       |   |       |   |   |   `--IDENT -> _ [15:26]
+        |       |   |       |   |   |--COMMA -> , [15:27]
+        |       |   |       |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [15:29]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [15:29]
+        |       |   |       |   |       |--TYPE -> TYPE [15:29]
+        |       |   |       |   |       |   `--IDENT -> R4 [15:29]
+        |       |   |       |   |       `--IDENT -> _ [15:32]
+        |       |   |       |   |--LAMBDA -> -> [15:34]
+        |       |   |       |   |--EXPR -> EXPR [15:37]
+        |       |   |       |   |   `--NUM_INT -> 2 [15:37]
+        |       |   |       |   `--SEMI -> ; [15:38]
+        |       |   |       `--RCURLY -> } [16:8]
+        |       |   `--SEMI -> ; [16:9]
+        |       `--RCURLY -> } [17:4]
+        |--METHOD_DEF -> METHOD_DEF [19:4]
+        |   |--MODIFIERS -> MODIFIERS [19:4]
+        |   |--TYPE -> TYPE [19:4]
+        |   |   `--LITERAL_INT -> int [19:4]
+        |   |--IDENT -> testMultiValuesNested [19:8]
+        |   |--LPAREN -> ( [19:29]
+        |   |--PARAMETERS -> PARAMETERS [19:30]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [19:30]
+        |   |       |--MODIFIERS -> MODIFIERS [19:30]
+        |   |       |--TYPE -> TYPE [19:30]
+        |   |       |   |--IDENT -> Box [19:30]
+        |   |       |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [19:33]
+        |   |       |       |--GENERIC_START -> < [19:33]
+        |   |       |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [19:34]
+        |   |       |       |   `--WILDCARD_TYPE -> ? [19:34]
+        |   |       |       `--GENERIC_END -> > [19:35]
+        |   |       `--IDENT -> b [19:37]
+        |   |--RPAREN -> ) [19:38]
+        |   `--SLIST -> { [19:40]
+        |       |--LITERAL_RETURN -> return [20:8]
+        |       |   |--EXPR -> EXPR [20:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [20:15]
+        |       |   |       |--LPAREN -> ( [20:22]
+        |       |   |       |--EXPR -> EXPR [20:23]
+        |       |   |       |   `--IDENT -> b [20:23]
+        |       |   |       |--RPAREN -> ) [20:24]
+        |       |   |       |--LCURLY -> { [20:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [21:12]
+        |       |   |       |   |--LITERAL_CASE -> case [21:12]
+        |       |   |       |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [21:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [21:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [21:17]
+        |       |   |       |   |   |   |   `--IDENT -> Box [21:17]
+        |       |   |       |   |   |   |--LPAREN -> ( [21:20]
+        |       |   |       |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [21:21]
+        |       |   |       |   |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [21:21]
+        |       |   |       |   |   |   |       |--MODIFIERS -> MODIFIERS [21:21]
+        |       |   |       |   |   |   |       |--TYPE -> TYPE [21:21]
+        |       |   |       |   |   |   |       |   `--IDENT -> R1 [21:21]
+        |       |   |       |   |   |   |       `--IDENT -> _ [21:24]
+        |       |   |       |   |   |   `--RPAREN -> ) [21:25]
+        |       |   |       |   |   |--COMMA -> , [21:26]
+        |       |   |       |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [21:28]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [21:28]
+        |       |   |       |   |       |--TYPE -> TYPE [21:28]
+        |       |   |       |   |       |   `--IDENT -> Box [21:28]
+        |       |   |       |   |       |--LPAREN -> ( [21:31]
+        |       |   |       |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [21:32]
+        |       |   |       |   |       |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [21:32]
+        |       |   |       |   |       |       |--MODIFIERS -> MODIFIERS [21:32]
+        |       |   |       |   |       |       |--TYPE -> TYPE [21:32]
+        |       |   |       |   |       |       |   `--IDENT -> R2 [21:32]
+        |       |   |       |   |       |       `--IDENT -> _ [21:35]
+        |       |   |       |   |       `--RPAREN -> ) [21:36]
+        |       |   |       |   |--LAMBDA -> -> [21:38]
+        |       |   |       |   |--EXPR -> EXPR [21:41]
+        |       |   |       |   |   `--NUM_INT -> 1 [21:41]
+        |       |   |       |   `--SEMI -> ; [21:42]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [22:12]
+        |       |   |       |   |--LITERAL_CASE -> case [22:12]
+        |       |   |       |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [22:17]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [22:17]
+        |       |   |       |   |       |--TYPE -> TYPE [22:17]
+        |       |   |       |   |       |   `--IDENT -> Box [22:17]
+        |       |   |       |   |       |--LPAREN -> ( [22:20]
+        |       |   |       |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [22:21]
+        |       |   |       |   |       |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [22:21]
+        |       |   |       |   |       |       |--MODIFIERS -> MODIFIERS [22:21]
+        |       |   |       |   |       |       |--TYPE -> TYPE [22:21]
+        |       |   |       |   |       |       |   `--IDENT -> R3 [22:21]
+        |       |   |       |   |       |       `--IDENT -> _ [22:24]
+        |       |   |       |   |       `--RPAREN -> ) [22:25]
+        |       |   |       |   |--LAMBDA -> -> [22:27]
+        |       |   |       |   |--EXPR -> EXPR [22:30]
+        |       |   |       |   |   `--NUM_INT -> 2 [22:30]
+        |       |   |       |   `--SEMI -> ; [22:31]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [23:12]
+        |       |   |       |   |--LITERAL_CASE -> case [23:12]
+        |       |   |       |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [23:17]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [23:17]
+        |       |   |       |   |       |--TYPE -> TYPE [23:17]
+        |       |   |       |   |       |   `--IDENT -> Box [23:17]
+        |       |   |       |   |       |--LPAREN -> ( [23:20]
+        |       |   |       |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [23:21]
+        |       |   |       |   |       |   `--UNNAMED_PATTERN_DEF -> _ [23:21]
+        |       |   |       |   |       `--RPAREN -> ) [23:22]
+        |       |   |       |   |--LAMBDA -> -> [23:25]
+        |       |   |       |   |--EXPR -> EXPR [23:28]
+        |       |   |       |   |   `--NUM_INT -> 3 [23:28]
+        |       |   |       |   `--SEMI -> ; [23:29]
+        |       |   |       `--RCURLY -> } [24:8]
+        |       |   `--SEMI -> ; [24:9]
+        |       `--RCURLY -> } [25:4]
+        |--METHOD_DEF -> METHOD_DEF [27:4]
+        |   |--MODIFIERS -> MODIFIERS [27:4]
+        |   |--TYPE -> TYPE [27:4]
+        |   |   `--LITERAL_INT -> int [27:4]
+        |   |--IDENT -> testMultiValuesNestedUnnamedVarAndPattern [27:8]
+        |   |--LPAREN -> ( [27:49]
+        |   |--PARAMETERS -> PARAMETERS [27:50]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [27:50]
+        |   |       |--MODIFIERS -> MODIFIERS [27:50]
+        |   |       |--TYPE -> TYPE [27:50]
+        |   |       |   |--IDENT -> Box [27:50]
+        |   |       |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [27:53]
+        |   |       |       |--GENERIC_START -> < [27:53]
+        |   |       |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [27:54]
+        |   |       |       |   `--WILDCARD_TYPE -> ? [27:54]
+        |   |       |       `--GENERIC_END -> > [27:55]
+        |   |       `--IDENT -> b [27:57]
+        |   |--RPAREN -> ) [27:58]
+        |   `--SLIST -> { [27:60]
+        |       |--LITERAL_RETURN -> return [28:8]
+        |       |   |--EXPR -> EXPR [28:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [28:15]
+        |       |   |       |--LPAREN -> ( [28:22]
+        |       |   |       |--EXPR -> EXPR [28:23]
+        |       |   |       |   `--IDENT -> b [28:23]
+        |       |   |       |--RPAREN -> ) [28:24]
+        |       |   |       |--LCURLY -> { [28:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [29:12]
+        |       |   |       |   |--LITERAL_CASE -> case [29:12]
+        |       |   |       |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [29:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [29:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [29:17]
+        |       |   |       |   |   |   |   `--IDENT -> Box [29:17]
+        |       |   |       |   |   |   |--LPAREN -> ( [29:20]
+        |       |   |       |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [29:21]
+        |       |   |       |   |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [29:21]
+        |       |   |       |   |   |   |       |--MODIFIERS -> MODIFIERS [29:21]
+        |       |   |       |   |   |   |       |--TYPE -> TYPE [29:21]
+        |       |   |       |   |   |   |       |   `--IDENT -> R1 [29:21]
+        |       |   |       |   |   |   |       `--IDENT -> _ [29:24]
+        |       |   |       |   |   |   `--RPAREN -> ) [29:25]
+        |       |   |       |   |   |--COMMA -> , [29:26]
+        |       |   |       |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [29:28]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [29:28]
+        |       |   |       |   |       |--TYPE -> TYPE [29:28]
+        |       |   |       |   |       |   `--IDENT -> Box [29:28]
+        |       |   |       |   |       |--LPAREN -> ( [29:31]
+        |       |   |       |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [29:32]
+        |       |   |       |   |       |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [29:32]
+        |       |   |       |   |       |       |--MODIFIERS -> MODIFIERS [29:32]
+        |       |   |       |   |       |       |--TYPE -> TYPE [29:32]
+        |       |   |       |   |       |       |   `--IDENT -> R2 [29:32]
+        |       |   |       |   |       |       `--IDENT -> _ [29:35]
+        |       |   |       |   |       `--RPAREN -> ) [29:36]
+        |       |   |       |   |--LAMBDA -> -> [29:38]
+        |       |   |       |   |--EXPR -> EXPR [29:41]
+        |       |   |       |   |   `--NUM_INT -> 1 [29:41]
+        |       |   |       |   `--SEMI -> ; [29:42]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [30:12]
+        |       |   |       |   |--LITERAL_CASE -> case [30:12]
+        |       |   |       |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [30:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [30:17]
+        |       |   |       |   |   |   |   `--IDENT -> Box [30:17]
+        |       |   |       |   |   |   |--LPAREN -> ( [30:20]
+        |       |   |       |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:21]
+        |       |   |       |   |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [30:21]
+        |       |   |       |   |   |   |       |--MODIFIERS -> MODIFIERS [30:21]
+        |       |   |       |   |   |   |       |--TYPE -> TYPE [30:21]
+        |       |   |       |   |   |   |       |   `--IDENT -> R3 [30:21]
+        |       |   |       |   |   |   |       `--IDENT -> _ [30:24]
+        |       |   |       |   |   |   `--RPAREN -> ) [30:25]
+        |       |   |       |   |   |--COMMA -> , [30:26]
+        |       |   |       |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [30:28]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [30:28]
+        |       |   |       |   |       |--TYPE -> TYPE [30:28]
+        |       |   |       |   |       |   `--IDENT -> Box [30:28]
+        |       |   |       |   |       |--LPAREN -> ( [30:31]
+        |       |   |       |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [30:32]
+        |       |   |       |   |       |   `--UNNAMED_PATTERN_DEF -> _ [30:32]
+        |       |   |       |   |       `--RPAREN -> ) [30:33]
+        |       |   |       |   |--LAMBDA -> -> [30:35]
+        |       |   |       |   |--EXPR -> EXPR [30:38]
+        |       |   |       |   |   `--NUM_INT -> 2 [30:38]
+        |       |   |       |   `--SEMI -> ; [30:39]
+        |       |   |       `--RCURLY -> } [31:8]
+        |       |   `--SEMI -> ; [31:9]
+        |       `--RCURLY -> } [32:4]
+        |--METHOD_DEF -> METHOD_DEF [34:4]
+        |   |--MODIFIERS -> MODIFIERS [34:4]
+        |   |--TYPE -> TYPE [34:4]
+        |   |   `--LITERAL_INT -> int [34:4]
+        |   |--IDENT -> testMultiValuesNestedMix [34:8]
+        |   |--LPAREN -> ( [34:32]
+        |   |--PARAMETERS -> PARAMETERS [34:33]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [34:33]
+        |   |       |--MODIFIERS -> MODIFIERS [34:33]
+        |   |       |--TYPE -> TYPE [34:33]
+        |   |       |   `--IDENT -> Object [34:33]
+        |   |       `--IDENT -> b [34:40]
+        |   |--RPAREN -> ) [34:41]
+        |   `--SLIST -> { [34:43]
+        |       |--LITERAL_RETURN -> return [35:8]
+        |       |   |--EXPR -> EXPR [35:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [35:15]
+        |       |   |       |--LPAREN -> ( [35:22]
+        |       |   |       |--EXPR -> EXPR [35:23]
+        |       |   |       |   `--IDENT -> b [35:23]
+        |       |   |       |--RPAREN -> ) [35:24]
+        |       |   |       |--LCURLY -> { [35:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [36:12]
+        |       |   |       |   |--LITERAL_CASE -> case [36:12]
+        |       |   |       |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [36:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [36:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [36:17]
+        |       |   |       |   |   |   |   `--IDENT -> Box [36:17]
+        |       |   |       |   |   |   |--LPAREN -> ( [36:20]
+        |       |   |       |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [36:21]
+        |       |   |       |   |   |   |   `--UNNAMED_PATTERN_DEF -> _ [36:21]
+        |       |   |       |   |   |   `--RPAREN -> ) [36:22]
+        |       |   |       |   |   |--COMMA -> , [36:23]
+        |       |   |       |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [36:25]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [36:25]
+        |       |   |       |   |       |--TYPE -> TYPE [36:25]
+        |       |   |       |   |       |   `--IDENT -> Box2 [36:25]
+        |       |   |       |   |       |--LPAREN -> ( [36:29]
+        |       |   |       |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [36:30]
+        |       |   |       |   |       |   `--UNNAMED_PATTERN_DEF -> _ [36:30]
+        |       |   |       |   |       `--RPAREN -> ) [36:31]
+        |       |   |       |   |--LAMBDA -> -> [36:33]
+        |       |   |       |   |--EXPR -> EXPR [36:36]
+        |       |   |       |   |   `--NUM_INT -> 1 [36:36]
+        |       |   |       |   `--SEMI -> ; [36:37]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [37:12]
+        |       |   |       |   |--LITERAL_DEFAULT -> default [37:12]
+        |       |   |       |   |--LAMBDA -> -> [37:20]
+        |       |   |       |   |--EXPR -> EXPR [37:23]
+        |       |   |       |   |   `--NUM_INT -> 2 [37:23]
+        |       |   |       |   `--SEMI -> ; [37:24]
+        |       |   |       `--RCURLY -> } [38:8]
+        |       |   `--SEMI -> ; [38:9]
+        |       `--RCURLY -> } [39:4]
+        |--METHOD_DEF -> METHOD_DEF [41:4]
+        |   |--MODIFIERS -> MODIFIERS [41:4]
+        |   |--TYPE -> TYPE [41:4]
+        |   |   `--LITERAL_INT -> int [41:4]
+        |   |--IDENT -> testMultiValuesNestedMix2 [41:8]
+        |   |--LPAREN -> ( [41:33]
+        |   |--PARAMETERS -> PARAMETERS [41:34]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [41:34]
+        |   |       |--MODIFIERS -> MODIFIERS [41:34]
+        |   |       |--TYPE -> TYPE [41:34]
+        |   |       |   `--IDENT -> Object [41:34]
+        |   |       `--IDENT -> b [41:41]
+        |   |--RPAREN -> ) [41:42]
+        |   `--SLIST -> { [41:44]
+        |       |--LITERAL_RETURN -> return [42:8]
+        |       |   |--EXPR -> EXPR [42:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [42:15]
+        |       |   |       |--LPAREN -> ( [42:22]
+        |       |   |       |--EXPR -> EXPR [42:23]
+        |       |   |       |   `--IDENT -> b [42:23]
+        |       |   |       |--RPAREN -> ) [42:24]
+        |       |   |       |--LCURLY -> { [42:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [43:12]
+        |       |   |       |   |--LITERAL_CASE -> case [43:12]
+        |       |   |       |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [43:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [43:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [43:17]
+        |       |   |       |   |   |   |   `--IDENT -> Box [43:17]
+        |       |   |       |   |   |   |--LPAREN -> ( [43:20]
+        |       |   |       |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [43:21]
+        |       |   |       |   |   |   |   `--UNNAMED_PATTERN_DEF -> _ [43:21]
+        |       |   |       |   |   |   `--RPAREN -> ) [43:22]
+        |       |   |       |   |   |--COMMA -> , [43:23]
+        |       |   |       |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [43:25]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [43:25]
+        |       |   |       |   |       |--TYPE -> TYPE [43:25]
+        |       |   |       |   |       |   `--IDENT -> String [43:25]
+        |       |   |       |   |       `--IDENT -> _ [43:32]
+        |       |   |       |   |--LAMBDA -> -> [43:34]
+        |       |   |       |   |--EXPR -> EXPR [43:37]
+        |       |   |       |   |   `--NUM_INT -> 1 [43:37]
+        |       |   |       |   `--SEMI -> ; [43:38]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [44:12]
+        |       |   |       |   |--LITERAL_DEFAULT -> default [44:12]
+        |       |   |       |   |--LAMBDA -> -> [44:20]
+        |       |   |       |   |--EXPR -> EXPR [44:23]
+        |       |   |       |   |   `--NUM_INT -> 2 [44:23]
+        |       |   |       |   `--SEMI -> ; [44:24]
+        |       |   |       `--RCURLY -> } [45:8]
+        |       |   `--SEMI -> ; [45:9]
+        |       `--RCURLY -> } [46:4]
+        |--METHOD_DEF -> METHOD_DEF [48:4]
+        |   |--MODIFIERS -> MODIFIERS [48:4]
+        |   |--TYPE -> TYPE [48:4]
+        |   |   `--LITERAL_INT -> int [48:4]
+        |   |--IDENT -> testMultiValuesStatementBlock2 [48:8]
+        |   |--LPAREN -> ( [48:38]
+        |   |--PARAMETERS -> PARAMETERS [48:39]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [48:39]
+        |   |       |--MODIFIERS -> MODIFIERS [48:39]
+        |   |       |--TYPE -> TYPE [48:39]
+        |   |       |   `--IDENT -> Object [48:39]
+        |   |       `--IDENT -> o [48:46]
+        |   |--RPAREN -> ) [48:47]
+        |   `--SLIST -> { [48:49]
+        |       |--LITERAL_SWITCH -> switch [49:8]
+        |       |   |--LPAREN -> ( [49:15]
+        |       |   |--EXPR -> EXPR [49:16]
+        |       |   |   `--IDENT -> o [49:16]
+        |       |   |--RPAREN -> ) [49:17]
+        |       |   |--LCURLY -> { [49:19]
+        |       |   |--CASE_GROUP -> CASE_GROUP [50:12]
+        |       |   |   |--LITERAL_CASE -> case [50:12]
+        |       |   |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [50:17]
+        |       |   |   |   |   |--MODIFIERS -> MODIFIERS [50:17]
+        |       |   |   |   |   |--TYPE -> TYPE [50:17]
+        |       |   |   |   |   |   `--IDENT -> Box [50:17]
+        |       |   |   |   |   |--LPAREN -> ( [50:20]
+        |       |   |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [50:21]
+        |       |   |   |   |   |   `--UNNAMED_PATTERN_DEF -> _ [50:21]
+        |       |   |   |   |   `--RPAREN -> ) [50:22]
+        |       |   |   |   `--COLON -> : [50:23]
+        |       |   |   |--LITERAL_CASE -> case [51:12]
+        |       |   |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [51:17]
+        |       |   |   |   |   |--MODIFIERS -> MODIFIERS [51:17]
+        |       |   |   |   |   |--TYPE -> TYPE [51:17]
+        |       |   |   |   |   |   `--IDENT -> String [51:17]
+        |       |   |   |   |   `--IDENT -> _ [51:24]
+        |       |   |   |   `--COLON -> : [51:25]
+        |       |   |   `--SLIST -> SLIST [52:16]
+        |       |   |       `--LITERAL_RETURN -> return [52:16]
+        |       |   |           |--EXPR -> EXPR [52:23]
+        |       |   |           |   `--NUM_INT -> 1 [52:23]
+        |       |   |           `--SEMI -> ; [52:24]
+        |       |   |--CASE_GROUP -> CASE_GROUP [53:12]
+        |       |   |   |--LITERAL_DEFAULT -> default [53:12]
+        |       |   |   |   `--COLON -> : [53:19]
+        |       |   |   `--SLIST -> SLIST [54:16]
+        |       |   |       `--LITERAL_RETURN -> return [54:16]
+        |       |   |           |--EXPR -> EXPR [54:23]
+        |       |   |           |   `--NUM_INT -> 2 [54:23]
+        |       |   |           `--SEMI -> ; [54:24]
+        |       |   `--RCURLY -> } [55:8]
+        |       `--RCURLY -> } [56:4]
+        |--METHOD_DEF -> METHOD_DEF [58:4]
+        |   |--MODIFIERS -> MODIFIERS [58:4]
+        |   |--TYPE -> TYPE [58:4]
+        |   |   `--LITERAL_INT -> int [58:4]
+        |   |--IDENT -> testMultiValuesGuards [58:8]
+        |   |--LPAREN -> ( [58:29]
+        |   |--PARAMETERS -> PARAMETERS [58:30]
+        |   |   |--PARAMETER_DEF -> PARAMETER_DEF [58:30]
+        |   |   |   |--MODIFIERS -> MODIFIERS [58:30]
+        |   |   |   |--TYPE -> TYPE [58:30]
+        |   |   |   |   `--IDENT -> Base [58:30]
+        |   |   |   `--IDENT -> b [58:35]
+        |   |   |--COMMA -> , [58:36]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [58:38]
+        |   |       |--MODIFIERS -> MODIFIERS [58:38]
+        |   |       |--TYPE -> TYPE [58:38]
+        |   |       |   `--LITERAL_INT -> int [58:38]
+        |   |       `--IDENT -> x [58:42]
+        |   |--RPAREN -> ) [58:43]
+        |   `--SLIST -> { [58:45]
+        |       |--LITERAL_RETURN -> return [59:8]
+        |       |   |--EXPR -> EXPR [59:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [59:15]
+        |       |   |       |--LPAREN -> ( [59:22]
+        |       |   |       |--EXPR -> EXPR [59:23]
+        |       |   |       |   `--IDENT -> b [59:23]
+        |       |   |       |--RPAREN -> ) [59:24]
+        |       |   |       |--LCURLY -> { [59:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [60:12]
+        |       |   |       |   |--LITERAL_CASE -> case [60:12]
+        |       |   |       |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [60:17]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [60:17]
+        |       |   |       |   |       |--TYPE -> TYPE [60:17]
+        |       |   |       |   |       |   `--IDENT -> R1 [60:17]
+        |       |   |       |   |       `--IDENT -> r [60:20]
+        |       |   |       |   |--LAMBDA -> -> [60:22]
+        |       |   |       |   |--EXPR -> EXPR [60:25]
+        |       |   |       |   |   `--NUM_INT -> 1 [60:25]
+        |       |   |       |   `--SEMI -> ; [60:26]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [61:12]
+        |       |   |       |   |--LITERAL_CASE -> case [61:12]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [61:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [61:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [61:17]
+        |       |   |       |   |   |   |   `--IDENT -> R2 [61:17]
+        |       |   |       |   |   |   `--IDENT -> _ [61:20]
+        |       |   |       |   |   |--COMMA -> , [61:21]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [61:23]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [61:23]
+        |       |   |       |   |   |   |--TYPE -> TYPE [61:23]
+        |       |   |       |   |   |   |   `--IDENT -> R3 [61:23]
+        |       |   |       |   |   |   `--IDENT -> _ [61:26]
+        |       |   |       |   |   |--COMMA -> , [61:27]
+        |       |   |       |   |   `--PATTERN_DEF -> PATTERN_DEF [61:34]
+        |       |   |       |   |       `--LITERAL_WHEN -> when [61:34]
+        |       |   |       |   |           |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [61:29]
+        |       |   |       |   |           |   |--MODIFIERS -> MODIFIERS [61:29]
+        |       |   |       |   |           |   |--TYPE -> TYPE [61:29]
+        |       |   |       |   |           |   |   `--IDENT -> R4 [61:29]
+        |       |   |       |   |           |   `--IDENT -> _ [61:32]
+        |       |   |       |   |           `--EQUAL -> == [61:41]
+        |       |   |       |   |               |--IDENT -> x [61:39]
+        |       |   |       |   |               `--NUM_INT -> 1 [61:44]
+        |       |   |       |   |--LAMBDA -> -> [61:46]
+        |       |   |       |   |--EXPR -> EXPR [61:49]
+        |       |   |       |   |   `--NUM_INT -> 2 [61:49]
+        |       |   |       |   `--SEMI -> ; [61:50]
+        |       |   |       |--SWITCH_RULE -> SWITCH_RULE [62:12]
+        |       |   |       |   |--LITERAL_CASE -> case [62:12]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [62:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [62:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [62:17]
+        |       |   |       |   |   |   |   `--IDENT -> R2 [62:17]
+        |       |   |       |   |   |   `--IDENT -> _ [62:20]
+        |       |   |       |   |   |--COMMA -> , [62:21]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [62:23]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [62:23]
+        |       |   |       |   |   |   |--TYPE -> TYPE [62:23]
+        |       |   |       |   |   |   |   `--IDENT -> R3 [62:23]
+        |       |   |       |   |   |   `--IDENT -> _ [62:26]
+        |       |   |       |   |   |--COMMA -> , [62:27]
+        |       |   |       |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [62:29]
+        |       |   |       |   |       |--MODIFIERS -> MODIFIERS [62:29]
+        |       |   |       |   |       |--TYPE -> TYPE [62:29]
+        |       |   |       |   |       |   `--IDENT -> R4 [62:29]
+        |       |   |       |   |       `--IDENT -> _ [62:32]
+        |       |   |       |   |--LAMBDA -> -> [62:34]
+        |       |   |       |   |--EXPR -> EXPR [62:37]
+        |       |   |       |   |   `--NUM_INT -> 3 [62:37]
+        |       |   |       |   `--SEMI -> ; [62:38]
+        |       |   |       `--RCURLY -> } [63:8]
+        |       |   `--SEMI -> ; [63:9]
+        |       `--RCURLY -> } [64:4]
+        |--METHOD_DEF -> METHOD_DEF [66:4]
+        |   |--MODIFIERS -> MODIFIERS [66:4]
+        |   |--TYPE -> TYPE [66:4]
+        |   |   `--LITERAL_INT -> int [66:4]
+        |   |--IDENT -> testMixVarWithExplicit [66:8]
+        |   |--LPAREN -> ( [66:30]
+        |   |--PARAMETERS -> PARAMETERS [66:31]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [66:31]
+        |   |       |--MODIFIERS -> MODIFIERS [66:31]
+        |   |       |--TYPE -> TYPE [66:31]
+        |   |       |   |--IDENT -> Box [66:31]
+        |   |       |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [66:34]
+        |   |       |       |--GENERIC_START -> < [66:34]
+        |   |       |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [66:35]
+        |   |       |       |   `--WILDCARD_TYPE -> ? [66:35]
+        |   |       |       `--GENERIC_END -> > [66:36]
+        |   |       `--IDENT -> t [66:38]
+        |   |--RPAREN -> ) [66:39]
+        |   `--SLIST -> { [66:41]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [67:8]
+        |       |   |--MODIFIERS -> MODIFIERS [67:8]
+        |       |   |--TYPE -> TYPE [67:8]
+        |       |   |   `--LITERAL_INT -> int [67:8]
+        |       |   |--IDENT -> success [67:12]
+        |       |   `--ASSIGN -> = [67:20]
+        |       |       `--EXPR -> EXPR [67:22]
+        |       |           `--UNARY_MINUS -> - [67:22]
+        |       |               `--NUM_INT -> 1 [67:23]
+        |       |--SEMI -> ; [67:24]
+        |       |--EXPR -> EXPR [68:16]
+        |       |   `--ASSIGN -> = [68:16]
+        |       |       |--IDENT -> success [68:8]
+        |       |       `--LITERAL_SWITCH -> switch [68:18]
+        |       |           |--LPAREN -> ( [68:24]
+        |       |           |--EXPR -> EXPR [68:25]
+        |       |           |   `--IDENT -> t [68:25]
+        |       |           |--RPAREN -> ) [68:26]
+        |       |           |--LCURLY -> { [68:28]
+        |       |           |--CASE_GROUP -> CASE_GROUP [69:12]
+        |       |           |   |--LITERAL_CASE -> case [69:12]
+        |       |           |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [69:17]
+        |       |           |   |   |   |--MODIFIERS -> MODIFIERS [69:17]
+        |       |           |   |   |   |--TYPE -> TYPE [69:17]
+        |       |           |   |   |   |   `--IDENT -> Box [69:17]
+        |       |           |   |   |   |--LPAREN -> ( [69:20]
+        |       |           |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [69:21]
+        |       |           |   |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [69:21]
+        |       |           |   |   |   |       |--MODIFIERS -> MODIFIERS [69:21]
+        |       |           |   |   |   |       |--TYPE -> TYPE [69:21]
+        |       |           |   |   |   |       |   `--IDENT -> R1 [69:21]
+        |       |           |   |   |   |       `--IDENT -> _ [69:24]
+        |       |           |   |   |   `--RPAREN -> ) [69:25]
+        |       |           |   |   `--COLON -> : [69:27]
+        |       |           |   `--SLIST -> SLIST [69:29]
+        |       |           |       `--SLIST -> { [69:29]
+        |       |           |           |--LITERAL_YIELD -> yield [70:16]
+        |       |           |           |   |--EXPR -> EXPR [70:22]
+        |       |           |           |   |   `--NUM_INT -> 1 [70:22]
+        |       |           |           |   `--SEMI -> ; [70:23]
+        |       |           |           `--RCURLY -> } [71:12]
+        |       |           |--CASE_GROUP -> CASE_GROUP [72:12]
+        |       |           |   |--LITERAL_CASE -> case [72:12]
+        |       |           |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [72:17]
+        |       |           |   |   |   |--MODIFIERS -> MODIFIERS [72:17]
+        |       |           |   |   |   |--TYPE -> TYPE [72:17]
+        |       |           |   |   |   |   `--IDENT -> Box [72:17]
+        |       |           |   |   |   |--LPAREN -> ( [72:20]
+        |       |           |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [72:21]
+        |       |           |   |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [72:21]
+        |       |           |   |   |   |       |--MODIFIERS -> MODIFIERS [72:21]
+        |       |           |   |   |   |       |--TYPE -> TYPE [72:21]
+        |       |           |   |   |   |       |   `--IDENT -> R2 [72:21]
+        |       |           |   |   |   |       `--IDENT -> _ [72:24]
+        |       |           |   |   |   `--RPAREN -> ) [72:25]
+        |       |           |   |   |--COMMA -> , [72:26]
+        |       |           |   |   |--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [72:28]
+        |       |           |   |   |   |--MODIFIERS -> MODIFIERS [72:28]
+        |       |           |   |   |   |--TYPE -> TYPE [72:28]
+        |       |           |   |   |   |   `--IDENT -> Box [72:28]
+        |       |           |   |   |   |--LPAREN -> ( [72:31]
+        |       |           |   |   |   |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [72:32]
+        |       |           |   |   |   |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [72:32]
+        |       |           |   |   |   |       |--MODIFIERS -> MODIFIERS [72:32]
+        |       |           |   |   |   |       |--TYPE -> TYPE [72:32]
+        |       |           |   |   |   |       |   `--IDENT -> var [72:32]
+        |       |           |   |   |   |       `--IDENT -> _ [72:36]
+        |       |           |   |   |   `--RPAREN -> ) [72:37]
+        |       |           |   |   `--COLON -> : [72:39]
+        |       |           |   `--SLIST -> SLIST [72:41]
+        |       |           |       `--SLIST -> { [72:41]
+        |       |           |           |--LITERAL_YIELD -> yield [73:16]
+        |       |           |           |   |--EXPR -> EXPR [73:22]
+        |       |           |           |   |   `--NUM_INT -> 2 [73:22]
+        |       |           |           |   `--SEMI -> ; [73:23]
+        |       |           |           `--RCURLY -> } [74:12]
+        |       |           |--CASE_GROUP -> CASE_GROUP [75:12]
+        |       |           |   |--LITERAL_DEFAULT -> default [75:12]
+        |       |           |   |   `--COLON -> : [75:20]
+        |       |           |   `--SLIST -> SLIST [75:22]
+        |       |           |       `--SLIST -> { [75:22]
+        |       |           |           |--LITERAL_YIELD -> yield [76:16]
+        |       |           |           |   |--EXPR -> EXPR [76:22]
+        |       |           |           |   |   `--UNARY_MINUS -> - [76:22]
+        |       |           |           |   |       `--NUM_INT -> 2 [76:23]
+        |       |           |           |   `--SEMI -> ; [76:24]
+        |       |           |           `--RCURLY -> } [77:12]
+        |       |           `--RCURLY -> } [78:8]
+        |       |--SEMI -> ; [78:9]
+        |       |--LITERAL_RETURN -> return [79:8]
+        |       |   |--EXPR -> EXPR [79:15]
+        |       |   |   `--IDENT -> success [79:15]
+        |       |   `--SEMI -> ; [79:22]
+        |       `--RCURLY -> } [80:4]
+        |--METHOD_DEF -> METHOD_DEF [82:4]
+        |   |--MODIFIERS -> MODIFIERS [82:4]
+        |   |--TYPE -> TYPE [82:4]
+        |   |   `--IDENT -> String [82:4]
+        |   |--IDENT -> unnamedGuardAddsBindings [82:11]
+        |   |--LPAREN -> ( [82:35]
+        |   |--PARAMETERS -> PARAMETERS [82:36]
+        |   |   |--PARAMETER_DEF -> PARAMETER_DEF [82:36]
+        |   |   |   |--MODIFIERS -> MODIFIERS [82:36]
+        |   |   |   |--TYPE -> TYPE [82:36]
+        |   |   |   |   `--IDENT -> Object [82:36]
+        |   |   |   `--IDENT -> o1 [82:43]
+        |   |   |--COMMA -> , [82:45]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [82:47]
+        |   |       |--MODIFIERS -> MODIFIERS [82:47]
+        |   |       |--TYPE -> TYPE [82:47]
+        |   |       |   `--IDENT -> Object [82:47]
+        |   |       `--IDENT -> o2 [82:54]
+        |   |--RPAREN -> ) [82:56]
+        |   `--SLIST -> { [82:58]
+        |       |--LITERAL_RETURN -> return [83:8]
+        |       |   |--EXPR -> EXPR [83:15]
+        |       |   |   `--LITERAL_SWITCH -> switch [83:15]
+        |       |   |       |--LPAREN -> ( [83:22]
+        |       |   |       |--EXPR -> EXPR [83:23]
+        |       |   |       |   `--IDENT -> o1 [83:23]
+        |       |   |       |--RPAREN -> ) [83:25]
+        |       |   |       |--LCURLY -> { [83:27]
+        |       |   |       |--CASE_GROUP -> CASE_GROUP [84:12]
+        |       |   |       |   |--LITERAL_CASE -> case [84:12]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [84:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [84:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [84:17]
+        |       |   |       |   |   |   |   `--IDENT -> String [84:17]
+        |       |   |       |   |   |   `--IDENT -> _ [84:24]
+        |       |   |       |   |   |--COMMA -> , [84:25]
+        |       |   |       |   |   |--PATTERN_DEF -> PATTERN_DEF [84:36]
+        |       |   |       |   |   |   `--LITERAL_WHEN -> when [84:36]
+        |       |   |       |   |   |       |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [84:27]
+        |       |   |       |   |   |       |   |--MODIFIERS -> MODIFIERS [84:27]
+        |       |   |       |   |   |       |   |--TYPE -> TYPE [84:27]
+        |       |   |       |   |   |       |   |   `--IDENT -> Object [84:27]
+        |       |   |       |   |   |       |   `--IDENT -> _ [84:34]
+        |       |   |       |   |   |       `--LITERAL_INSTANCEOF -> instanceof [84:44]
+        |       |   |       |   |   |           |--IDENT -> o2 [84:41]
+        |       |   |       |   |   |           `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [84:55]
+        |       |   |       |   |   |               |--MODIFIERS -> MODIFIERS [84:55]
+        |       |   |       |   |   |               |--TYPE -> TYPE [84:55]
+        |       |   |       |   |   |               |   `--IDENT -> String [84:55]
+        |       |   |       |   |   |               `--IDENT -> s [84:62]
+        |       |   |       |   |   `--COLON -> : [84:63]
+        |       |   |       |   `--SLIST -> SLIST [84:65]
+        |       |   |       |       `--LITERAL_YIELD -> yield [84:65]
+        |       |   |       |           |--EXPR -> EXPR [84:71]
+        |       |   |       |           |   `--IDENT -> s [84:71]
+        |       |   |       |           `--SEMI -> ; [84:72]
+        |       |   |       |--CASE_GROUP -> CASE_GROUP [85:12]
+        |       |   |       |   |--LITERAL_CASE -> case [85:12]
+        |       |   |       |   |   |--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [85:17]
+        |       |   |       |   |   |   |--MODIFIERS -> MODIFIERS [85:17]
+        |       |   |       |   |   |   |--TYPE -> TYPE [85:17]
+        |       |   |       |   |   |   |   `--IDENT -> Object [85:17]
+        |       |   |       |   |   |   `--IDENT -> _ [85:24]
+        |       |   |       |   |   `--COLON -> : [85:25]
+        |       |   |       |   `--SLIST -> SLIST [85:27]
+        |       |   |       |       `--LITERAL_YIELD -> yield [85:27]
+        |       |   |       |           |--EXPR -> EXPR [85:33]
+        |       |   |       |           |   `--STRING_LITERAL -> "any" [85:33]
+        |       |   |       |           `--SEMI -> ; [85:38]
+        |       |   |       `--RCURLY -> } [86:8]
+        |       |   `--SEMI -> ; [86:9]
+        |       `--RCURLY -> } [87:4]
+        |--METHOD_DEF -> METHOD_DEF [89:4]
+        |   |--MODIFIERS -> MODIFIERS [89:4]
+        |   |--TYPE -> TYPE [89:4]
+        |   |   `--LITERAL_BOOLEAN -> boolean [89:4]
+        |   |--IDENT -> testUnnamedPrimitiveAndExhaustiveness [89:12]
+        |   |--LPAREN -> ( [89:49]
+        |   |--PARAMETERS -> PARAMETERS [89:50]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [89:50]
+        |   |       |--MODIFIERS -> MODIFIERS [89:50]
+        |   |       |--TYPE -> TYPE [89:50]
+        |   |       |   `--IDENT -> RecordWithPrimitive [89:50]
+        |   |       `--IDENT -> a [89:70]
+        |   |--RPAREN -> ) [89:71]
+        |   `--SLIST -> { [89:73]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [90:8]
+        |       |   |--MODIFIERS -> MODIFIERS [90:8]
+        |       |   |--TYPE -> TYPE [90:8]
+        |       |   |   `--LITERAL_BOOLEAN -> boolean [90:8]
+        |       |   |--IDENT -> r1 [90:16]
+        |       |   `--ASSIGN -> = [90:19]
+        |       |       `--EXPR -> EXPR [90:21]
+        |       |           `--LITERAL_SWITCH -> switch [90:21]
+        |       |               |--LPAREN -> ( [90:28]
+        |       |               |--EXPR -> EXPR [90:29]
+        |       |               |   `--IDENT -> a [90:29]
+        |       |               |--RPAREN -> ) [90:30]
+        |       |               |--LCURLY -> { [90:32]
+        |       |               |--SWITCH_RULE -> SWITCH_RULE [91:12]
+        |       |               |   |--LITERAL_CASE -> case [91:12]
+        |       |               |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [91:17]
+        |       |               |   |       |--MODIFIERS -> MODIFIERS [91:17]
+        |       |               |   |       |--TYPE -> TYPE [91:17]
+        |       |               |   |       |   `--IDENT -> Prim1 [91:17]
+        |       |               |   |       |--LPAREN -> ( [91:22]
+        |       |               |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [91:23]
+        |       |               |   |       |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [91:23]
+        |       |               |   |       |       |--MODIFIERS -> MODIFIERS [91:23]
+        |       |               |   |       |       |--TYPE -> TYPE [91:23]
+        |       |               |   |       |       |   `--IDENT -> var [91:23]
+        |       |               |   |       |       `--IDENT -> _ [91:27]
+        |       |               |   |       `--RPAREN -> ) [91:28]
+        |       |               |   |--LAMBDA -> -> [91:30]
+        |       |               |   |--EXPR -> EXPR [91:33]
+        |       |               |   |   `--LITERAL_TRUE -> true [91:33]
+        |       |               |   `--SEMI -> ; [91:37]
+        |       |               |--SWITCH_RULE -> SWITCH_RULE [92:12]
+        |       |               |   |--LITERAL_CASE -> case [92:12]
+        |       |               |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [92:17]
+        |       |               |   |       |--MODIFIERS -> MODIFIERS [92:17]
+        |       |               |   |       |--TYPE -> TYPE [92:17]
+        |       |               |   |       |   `--IDENT -> Prim2 [92:17]
+        |       |               |   |       |--LPAREN -> ( [92:22]
+        |       |               |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [92:23]
+        |       |               |   |       |   `--UNNAMED_PATTERN_DEF -> _ [92:23]
+        |       |               |   |       `--RPAREN -> ) [92:24]
+        |       |               |   |--LAMBDA -> -> [92:26]
+        |       |               |   |--EXPR -> EXPR [92:29]
+        |       |               |   |   `--LITERAL_FALSE -> false [92:29]
+        |       |               |   `--SEMI -> ; [92:34]
+        |       |               `--RCURLY -> } [93:8]
+        |       |--SEMI -> ; [93:9]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [95:8]
+        |       |   |--MODIFIERS -> MODIFIERS [95:8]
+        |       |   |--TYPE -> TYPE [95:8]
+        |       |   |   `--LITERAL_BOOLEAN -> boolean [95:8]
+        |       |   |--IDENT -> r2 [95:16]
+        |       |   `--ASSIGN -> = [95:19]
+        |       |       `--EXPR -> EXPR [95:21]
+        |       |           `--LITERAL_SWITCH -> switch [95:21]
+        |       |               |--LPAREN -> ( [95:28]
+        |       |               |--EXPR -> EXPR [95:29]
+        |       |               |   `--IDENT -> a [95:29]
+        |       |               |--RPAREN -> ) [95:30]
+        |       |               |--LCURLY -> { [95:32]
+        |       |               |--SWITCH_RULE -> SWITCH_RULE [96:12]
+        |       |               |   |--LITERAL_CASE -> case [96:12]
+        |       |               |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [96:17]
+        |       |               |   |       |--MODIFIERS -> MODIFIERS [96:17]
+        |       |               |   |       |--TYPE -> TYPE [96:17]
+        |       |               |   |       |   `--IDENT -> Prim1 [96:17]
+        |       |               |   |       |--LPAREN -> ( [96:22]
+        |       |               |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [96:23]
+        |       |               |   |       |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [96:23]
+        |       |               |   |       |       |--MODIFIERS -> MODIFIERS [96:23]
+        |       |               |   |       |       |--TYPE -> TYPE [96:23]
+        |       |               |   |       |       |   `--IDENT -> var [96:23]
+        |       |               |   |       |       `--IDENT -> _ [96:27]
+        |       |               |   |       `--RPAREN -> ) [96:28]
+        |       |               |   |--LAMBDA -> -> [96:30]
+        |       |               |   |--EXPR -> EXPR [96:33]
+        |       |               |   |   `--LITERAL_TRUE -> true [96:33]
+        |       |               |   `--SEMI -> ; [96:37]
+        |       |               |--SWITCH_RULE -> SWITCH_RULE [97:12]
+        |       |               |   |--LITERAL_CASE -> case [97:12]
+        |       |               |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [97:17]
+        |       |               |   |       |--MODIFIERS -> MODIFIERS [97:17]
+        |       |               |   |       |--TYPE -> TYPE [97:17]
+        |       |               |   |       |   `--IDENT -> Prim2 [97:17]
+        |       |               |   |       |--LPAREN -> ( [97:22]
+        |       |               |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [97:23]
+        |       |               |   |       |   `--PATTERN_VARIABLE_DEF -> PATTERN_VARIABLE_DEF [97:23]
+        |       |               |   |       |       |--MODIFIERS -> MODIFIERS [97:23]
+        |       |               |   |       |       |--TYPE -> TYPE [97:23]
+        |       |               |   |       |       |   `--IDENT -> var [97:23]
+        |       |               |   |       |       `--IDENT -> _ [97:27]
+        |       |               |   |       `--RPAREN -> ) [97:28]
+        |       |               |   |--LAMBDA -> -> [97:30]
+        |       |               |   |--EXPR -> EXPR [97:33]
+        |       |               |   |   `--LITERAL_FALSE -> false [97:33]
+        |       |               |   `--SEMI -> ; [97:38]
+        |       |               `--RCURLY -> } [98:8]
+        |       |--SEMI -> ; [98:9]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [100:8]
+        |       |   |--MODIFIERS -> MODIFIERS [100:8]
+        |       |   |--TYPE -> TYPE [100:8]
+        |       |   |   `--LITERAL_BOOLEAN -> boolean [100:8]
+        |       |   |--IDENT -> r3 [100:16]
+        |       |   `--ASSIGN -> = [100:19]
+        |       |       `--EXPR -> EXPR [100:21]
+        |       |           `--LITERAL_SWITCH -> switch [100:21]
+        |       |               |--LPAREN -> ( [100:28]
+        |       |               |--EXPR -> EXPR [100:29]
+        |       |               |   `--IDENT -> a [100:29]
+        |       |               |--RPAREN -> ) [100:30]
+        |       |               |--LCURLY -> { [100:32]
+        |       |               |--SWITCH_RULE -> SWITCH_RULE [101:12]
+        |       |               |   |--LITERAL_CASE -> case [101:12]
+        |       |               |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [101:17]
+        |       |               |   |       |--MODIFIERS -> MODIFIERS [101:17]
+        |       |               |   |       |--TYPE -> TYPE [101:17]
+        |       |               |   |       |   `--IDENT -> Prim1 [101:17]
+        |       |               |   |       |--LPAREN -> ( [101:22]
+        |       |               |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [101:23]
+        |       |               |   |       |   `--UNNAMED_PATTERN_DEF -> _ [101:23]
+        |       |               |   |       `--RPAREN -> ) [101:24]
+        |       |               |   |--LAMBDA -> -> [101:26]
+        |       |               |   |--EXPR -> EXPR [101:29]
+        |       |               |   |   `--LITERAL_TRUE -> true [101:29]
+        |       |               |   `--SEMI -> ; [101:33]
+        |       |               |--SWITCH_RULE -> SWITCH_RULE [102:12]
+        |       |               |   |--LITERAL_CASE -> case [102:12]
+        |       |               |   |   `--RECORD_PATTERN_DEF -> RECORD_PATTERN_DEF [102:17]
+        |       |               |   |       |--MODIFIERS -> MODIFIERS [102:17]
+        |       |               |   |       |--TYPE -> TYPE [102:17]
+        |       |               |   |       |   `--IDENT -> Prim2 [102:17]
+        |       |               |   |       |--LPAREN -> ( [102:22]
+        |       |               |   |       |--RECORD_PATTERN_COMPONENTS -> RECORD_PATTERN_COMPONENTS [102:23]
+        |       |               |   |       |   `--UNNAMED_PATTERN_DEF -> _ [102:23]
+        |       |               |   |       `--RPAREN -> ) [102:24]
+        |       |               |   |--LAMBDA -> -> [102:26]
+        |       |               |   |--EXPR -> EXPR [102:29]
+        |       |               |   |   `--LITERAL_FALSE -> false [102:29]
+        |       |               |   `--SEMI -> ; [102:34]
+        |       |               `--RCURLY -> } [103:8]
+        |       |--SEMI -> ; [103:9]
+        |       |--LITERAL_RETURN -> return [105:8]
+        |       |   |--EXPR -> EXPR [105:24]
+        |       |   |   `--LAND -> && [105:24]
+        |       |   |       |--LAND -> && [105:18]
+        |       |   |       |   |--IDENT -> r1 [105:15]
+        |       |   |       |   `--IDENT -> r2 [105:21]
+        |       |   |       `--IDENT -> r3 [105:27]
+        |       |   `--SEMI -> ; [105:29]
+        |       `--RCURLY -> } [106:4]
+        |--CLASS_DEF -> CLASS_DEF [108:4]
+        |   |--MODIFIERS -> MODIFIERS [108:4]
+        |   |   |--ABSTRACT -> abstract [108:4]
+        |   |   `--LITERAL_SEALED -> sealed [108:13]
+        |   |--LITERAL_CLASS -> class [108:20]
+        |   |--IDENT -> Base [108:26]
+        |   |--PERMITS_CLAUSE -> permits [108:31]
+        |   |   |--IDENT -> R1 [108:39]
+        |   |   |--COMMA -> , [108:41]
+        |   |   |--IDENT -> R2 [108:43]
+        |   |   |--COMMA -> , [108:45]
+        |   |   |--IDENT -> R3 [108:47]
+        |   |   |--COMMA -> , [108:49]
+        |   |   `--IDENT -> R4 [108:51]
+        |   `--OBJBLOCK -> OBJBLOCK [108:54]
+        |       |--LCURLY -> { [108:54]
+        |       `--RCURLY -> } [108:56]
+        |--CLASS_DEF -> CLASS_DEF [109:4]
+        |   |--MODIFIERS -> MODIFIERS [109:4]
+        |   |   `--FINAL -> final [109:4]
+        |   |--LITERAL_CLASS -> class [109:11]
+        |   |--IDENT -> R1 [109:17]
+        |   |--EXTENDS_CLAUSE -> extends [109:21]
+        |   |   `--IDENT -> Base [109:29]
+        |   `--OBJBLOCK -> OBJBLOCK [109:34]
+        |       |--LCURLY -> { [109:34]
+        |       `--RCURLY -> } [109:36]
+        |--CLASS_DEF -> CLASS_DEF [110:4]
+        |   |--MODIFIERS -> MODIFIERS [110:4]
+        |   |   `--FINAL -> final [110:4]
+        |   |--LITERAL_CLASS -> class [110:11]
+        |   |--IDENT -> R2 [110:17]
+        |   |--EXTENDS_CLAUSE -> extends [110:21]
+        |   |   `--IDENT -> Base [110:29]
+        |   `--OBJBLOCK -> OBJBLOCK [110:34]
+        |       |--LCURLY -> { [110:34]
+        |       `--RCURLY -> } [110:36]
+        |--CLASS_DEF -> CLASS_DEF [111:4]
+        |   |--MODIFIERS -> MODIFIERS [111:4]
+        |   |   `--FINAL -> final [111:4]
+        |   |--LITERAL_CLASS -> class [111:11]
+        |   |--IDENT -> R3 [111:17]
+        |   |--EXTENDS_CLAUSE -> extends [111:21]
+        |   |   `--IDENT -> Base [111:29]
+        |   `--OBJBLOCK -> OBJBLOCK [111:34]
+        |       |--LCURLY -> { [111:34]
+        |       `--RCURLY -> } [111:36]
+        |--CLASS_DEF -> CLASS_DEF [112:4]
+        |   |--MODIFIERS -> MODIFIERS [112:4]
+        |   |   `--FINAL -> final [112:4]
+        |   |--LITERAL_CLASS -> class [112:11]
+        |   |--IDENT -> R4 [112:17]
+        |   |--EXTENDS_CLAUSE -> extends [112:21]
+        |   |   `--IDENT -> Base [112:29]
+        |   `--OBJBLOCK -> OBJBLOCK [112:34]
+        |       |--LCURLY -> { [112:34]
+        |       `--RCURLY -> } [112:36]
+        |--INTERFACE_DEF -> INTERFACE_DEF [113:4]
+        |   |--MODIFIERS -> MODIFIERS [113:4]
+        |   |   `--LITERAL_SEALED -> sealed [113:4]
+        |   |--LITERAL_INTERFACE -> interface [113:11]
+        |   |--IDENT -> RecordWithPrimitive [113:21]
+        |   |--PERMITS_CLAUSE -> permits [113:41]
+        |   |   |--IDENT -> Prim1 [113:49]
+        |   |   |--COMMA -> , [113:54]
+        |   |   `--IDENT -> Prim2 [113:56]
+        |   `--OBJBLOCK -> OBJBLOCK [113:62]
+        |       |--LCURLY -> { [113:62]
+        |       `--RCURLY -> } [113:63]
+        |--SEMI -> ; [113:64]
+        |--RECORD_DEF -> RECORD_DEF [114:4]
+        |   |--MODIFIERS -> MODIFIERS [114:4]
+        |   |--LITERAL_RECORD -> record [114:4]
+        |   |--IDENT -> Prim1 [114:11]
+        |   |--LPAREN -> ( [114:16]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [114:17]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [114:17]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [114:17]
+        |   |       |--TYPE -> TYPE [114:17]
+        |   |       |   `--LITERAL_INT -> int [114:17]
+        |   |       `--IDENT -> n1 [114:21]
+        |   |--RPAREN -> ) [114:23]
+        |   |--IMPLEMENTS_CLAUSE -> implements [114:25]
+        |   |   `--IDENT -> RecordWithPrimitive [114:36]
+        |   `--OBJBLOCK -> OBJBLOCK [114:56]
+        |       |--LCURLY -> { [114:56]
+        |       `--RCURLY -> } [114:57]
+        |--SEMI -> ; [114:58]
+        |--RECORD_DEF -> RECORD_DEF [115:4]
+        |   |--MODIFIERS -> MODIFIERS [115:4]
+        |   |--LITERAL_RECORD -> record [115:4]
+        |   |--IDENT -> Prim2 [115:11]
+        |   |--LPAREN -> ( [115:16]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [115:17]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [115:17]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [115:17]
+        |   |       |--TYPE -> TYPE [115:17]
+        |   |       |   `--LITERAL_INT -> int [115:17]
+        |   |       `--IDENT -> n2 [115:21]
+        |   |--RPAREN -> ) [115:23]
+        |   |--IMPLEMENTS_CLAUSE -> implements [115:25]
+        |   |   `--IDENT -> RecordWithPrimitive [115:36]
+        |   `--OBJBLOCK -> OBJBLOCK [115:56]
+        |       |--LCURLY -> { [115:56]
+        |       `--RCURLY -> } [115:57]
+        |--SEMI -> ; [115:58]
+        |--RECORD_DEF -> RECORD_DEF [116:4]
+        |   |--MODIFIERS -> MODIFIERS [116:4]
+        |   |--LITERAL_RECORD -> record [116:4]
+        |   |--IDENT -> Box [116:11]
+        |   |--TYPE_PARAMETERS -> TYPE_PARAMETERS [116:14]
+        |   |   |--GENERIC_START -> < [116:14]
+        |   |   |--TYPE_PARAMETER -> TYPE_PARAMETER [116:15]
+        |   |   |   |--IDENT -> T [116:15]
+        |   |   |   `--TYPE_UPPER_BOUNDS -> extends [116:17]
+        |   |   |       `--IDENT -> Base [116:25]
+        |   |   `--GENERIC_END -> > [116:29]
+        |   |--LPAREN -> ( [116:30]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [116:31]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [116:31]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [116:31]
+        |   |       |--TYPE -> TYPE [116:31]
+        |   |       |   `--IDENT -> T [116:31]
+        |   |       `--IDENT -> content [116:33]
+        |   |--RPAREN -> ) [116:40]
+        |   `--OBJBLOCK -> OBJBLOCK [116:42]
+        |       |--LCURLY -> { [116:42]
+        |       `--RCURLY -> } [116:44]
+        |--RECORD_DEF -> RECORD_DEF [117:4]
+        |   |--MODIFIERS -> MODIFIERS [117:4]
+        |   |--LITERAL_RECORD -> record [117:4]
+        |   |--IDENT -> Box2 [117:11]
+        |   |--TYPE_PARAMETERS -> TYPE_PARAMETERS [117:15]
+        |   |   |--GENERIC_START -> < [117:15]
+        |   |   |--TYPE_PARAMETER -> TYPE_PARAMETER [117:16]
+        |   |   |   |--IDENT -> T [117:16]
+        |   |   |   `--TYPE_UPPER_BOUNDS -> extends [117:18]
+        |   |   |       `--IDENT -> Base [117:26]
+        |   |   `--GENERIC_END -> > [117:30]
+        |   |--LPAREN -> ( [117:31]
+        |   |--RECORD_COMPONENTS -> RECORD_COMPONENTS [117:32]
+        |   |   `--RECORD_COMPONENT_DEF -> RECORD_COMPONENT_DEF [117:32]
+        |   |       |--ANNOTATIONS -> ANNOTATIONS [117:32]
+        |   |       |--TYPE -> TYPE [117:32]
+        |   |       |   `--IDENT -> T [117:32]
+        |   |       `--IDENT -> content [117:34]
+        |   |--RPAREN -> ) [117:41]
+        |   `--OBJBLOCK -> OBJBLOCK [117:43]
+        |       |--LCURLY -> { [117:43]
+        |       `--RCURLY -> } [117:45]
+        `--RCURLY -> } [118:0]
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateBasic.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateBasic.java
new file mode 100644
index 00000000000..8a74d2cdde2
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateBasic.java
@@ -0,0 +1,66 @@
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+import java.util.List;
+
+public class InputStringTemplateBasic {
+    int x = 10;
+    int y = 20;
+
+    // most basic example, empty string template expression
+    String result1 = STR."";
+
+    String result1_1 = STR."Hello world!";
+
+    // no content, no expression
+    String result1_2 = STR."\{  }";
+
+    // simple single value interpolation
+    String result2 = STR. "x\{ x }x";
+
+    // simple single value interpolation with a method call
+    String result3 = STR. "\{ y(y("y")) }";
+
+    // bit more complex example, multiple interpolations
+    String result4 = STR. "\{ x }"  + STR. "\{ y }";
+
+    // bit more complex example, multiple interpolations with method calls
+    String result5 = STR. "\{ y(y("y")) }"  + STR. "\{ y(y("y")) }";
+
+    // string template concatenation
+    String result6 = STR. "\{ x }"  + STR. "\{ y }";
+
+    // concatentation in embedded expression
+    String result7 = STR. "\{ x + y }";
+
+    // concatentation in embedded expression with method calls
+    String result8 = STR. "hey \{ y(y("y")) + y(y("y")) } there";
+
+    // multiple lines
+    String result9 = STR. "hey \{
+            y(y("y")) + y(y("y"))
+            } there";
+
+    // multiple lines with many expressions
+    String result10 = STR. "hey \{
+            y(y("y")) + y(y("y"))
+            } there \{
+            y(y("y")) + y(y("y"))
+            + STR."x\{ x }x"
+            }";
+
+    String name = "world";
+    String s = STR."Hello, \{ name }!";
+
+    private static String y(String y) {
+        return "y";
+    }
+
+    // Verify proper behavior of TransType w.r.t. templated Strings
+    void x(List<? extends StringTemplate.Processor<String, RuntimeException>> list) {
+        list.get(0)."";
+        list.get(0)."\{  }";
+        list.get(0). "x\{ x }x";
+        list.get(0). ".\{ x }.\{ y }.\{ x }.\{}.\{}";
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateBasicWithTabs.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateBasicWithTabs.java
new file mode 100644
index 00000000000..10b4344fde7
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateBasicWithTabs.java
@@ -0,0 +1,66 @@
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+import java.util.List;
+
+public class InputStringTemplateBasicWithTabs {
+	int x = 10;
+	int y = 20;
+
+	// most basic example, empty string template expression
+	String result1 = STR."";
+
+	String result1_1 = STR."Hello world!";
+
+	// no content, no expression
+	String result1_2 = STR."\{  }";
+
+	// simple single value interpolation
+	String result2 = STR. "x\{ x }x";
+
+	// simple single value interpolation with a method call
+	String result3 = STR. "\{ y(y("y")) }";
+
+	// bit more complex example, multiple interpolations
+	String result4 = STR. "\{ x }"  + STR. "\{ y }";
+
+	// bit more complex example, multiple interpolations with method calls
+	String result5 = STR. "\{ y(y("y")) }"  + STR. "\{ y(y("y")) }";
+
+	// string template concatenation
+	String result6 = STR. "\{ x }"  + STR. "\{ y }";
+
+	// concatentation in embedded expression
+	String result7 = STR. "\{ x + y }";
+
+	// concatentation in embedded expression with method calls
+	String result8 = STR. "hey \{ y(y("y")) + y(y("y")) } there";
+
+	// multiple lines
+	String result9 = STR. "hey \{
+			y(y("y")) + y(y("y"))
+			} there";
+
+	// multiple lines with many expressions
+	String result10 = STR. "hey \{
+			y(y("y")) + y(y("y"))
+			} there \{
+			y(y("y")) + y(y("y"))
+			+ STR."x\{ x }x"
+			}";
+
+	String name = "world";
+	String s = STR."Hello, \{ name }!";
+
+	private static String y(String y) {
+		return "y";
+	}
+
+	// Verify proper behavior of TransType w.r.t. templated Strings
+	void x(List<? extends StringTemplate.Processor<String, RuntimeException>> list) {
+		list.get(0)."";
+		list.get(0)."\{  }";
+		list.get(0). "x\{ x }x";
+		list.get(0). ".\{ x }.\{ y }.\{ x }.\{}.\{}";
+	}
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateMultiLineWithComments.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateMultiLineWithComments.java
new file mode 100644
index 00000000000..84f80e2b8e6
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateMultiLineWithComments.java
@@ -0,0 +1,66 @@
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+import java.util.List;
+
+public class InputStringTemplateMultiLineWithComments {
+    int x = 10;
+    int y = 20;
+
+    // most basic example, empty string template expression
+    String result1 = STR."";
+
+    String result1_1 = STR."Hello world!";
+
+    // no content, no expression
+    String result1_2 = STR."\{  }";
+
+    // simple single value interpolation
+    String result2 = STR. "x\{ x }x"; // comment
+
+    // simple single value interpolation with a method call
+    String result3 = STR. "\{ y(y("y")) }";
+
+    // bit more complex example, multiple interpolations
+    String result4 = STR. "\{ x }"  + STR. "\{ y }";
+
+    // bit more complex example, multiple interpolations with method calls
+    String result5 = STR. "\{ y(y("y")) }"  + STR. "\{ y(y("y"/*yep, comment here, too*/)) }";
+
+    // string template concatenation
+    String result6 = STR. "\{ x }"  + /*comment here*/ STR. "\{ y }";
+
+    // concatentation in embedded expression
+    String result7 = STR. "\{ x + y /*comment here too*/ }";
+
+    // concatentation in embedded expression with method calls
+    String result8 = STR./*comment here*/ "hey \{ y(y("y")) + y(y("y")) } there";
+
+    // multiple lines
+    String result9 = STR. "hey \{ // comment here
+            y(y("y")) + y(y("y"))
+            } there";
+
+    // multiple lines with many expressions and comments
+    String result10 = STR. "hey \{ /*****comment here*/ // comment here
+            y(y("y")) + y(y("y")) /* comment here */
+            } there \{ /**/ // comment here
+            y(y("y")) + y(y("y")) // comment there
+            + STR."x\{ x }x" // comment everywhere
+            }";
+
+    String name = "world";
+    String s = STR."Hello, \{ name }!";
+
+    private static String y(String y) {
+        return "y";
+    }
+
+    // Verify proper behavior of TransType w.r.t. templated Strings
+    void x(List<? extends StringTemplate.Processor<String, RuntimeException>> list) {
+        list.get(0)."";
+        list.get(0)."\{  }";
+        list.get(0). "x\{ x }x"; // comments in here
+        list.get(0). ".\{ x }.\{ y }.\{ x /*comments in here, as well*/ }.\{}.\{}";
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateNested.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateNested.java
new file mode 100644
index 00000000000..1fca229fe27
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputStringTemplateNested.java
@@ -0,0 +1,24 @@
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+import java.util.function.Supplier;
+
+public class InputStringTemplateNested {
+    int x = 2;
+    final String s =
+            STR."x\{ sp(() -> {
+                return STR."x\{ sp(() -> {
+                    return STR."x\{
+                            sp(() -> {
+        return sp(() -> {
+            return sp(() -> {
+                return sp(() -> {
+                    return sp(() -> "");});});});})
+                            }x" + "{" + "}}}";
+                }) }x";
+            })}x";
+
+    private static String sp(Supplier<String> y) {
+        return y.get();
+    }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputTextBlockConsecutiveEscapes.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputTextBlockConsecutiveEscapes.java
new file mode 100644
index 00000000000..8065f2d3d98
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputTextBlockConsecutiveEscapes.java
@@ -0,0 +1,65 @@
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+import java.util.List;
+
+public class InputTextBlockConsecutiveEscapes {
+    String s = """
+            \u03bc\t
+            \u03bc\s
+            \u03bc\s not all escaped chars
+            \u03bc\n not all escaped chars
+            \s\s\s\n
+            \u03bc\s
+            \s\s\s\n not all escaped chars
+            \u03bc\s not all escaped chars
+            \u03bc\n not all escaped chars
+            l\u03bc\n
+            \n       \u03bc\s
+            \u03bc\
+            \s\u03bc\
+            """;
+
+            final List<TestCase> testCases = List.of(
+                new TestCase("""
+                    {@snippet :
+                    hello there //   @highlight   regex ="\t**"
+                    }""",
+                             """
+                    error: snippet markup: invalid regex
+                    hello there //   @highlight   regex ="\t**"
+                                                          \t ^
+                    """),
+                new TestCase("""
+                    {@snippet :
+                    hello there //   @highlight   regex ="\\t**"
+                    }""",
+                        """
+                    error: snippet markup: invalid regex
+                    hello there //   @highlight   regex ="\\t**"
+                                                             ^
+                    """),
+                new TestCase("""
+                    {@snippet :
+                    hello there // @highlight regex="\\.\\*\\+\\E"
+                    }""",
+                             """
+                    error: snippet markup: invalid regex
+                    hello there // @highlight regex="\\.\\*\\+\\E"
+                                                     \s\s\s\s   ^
+                    """),
+                    // use \s to counteract shift introduced
+                    // by \\ so as to visually align ^ right below E
+                new TestCase("""
+                    {@snippet :
+                    hello there //   @highlight  type="italics" regex ="  ["
+                    }""",
+                        """
+                    error: snippet markup: invalid regex
+                    hello there //   @highlight  type="italics" regex ="  ["
+                                                                          ^
+                    """)
+                );
+
+    private record TestCase(String s1, String s2){}
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputTextBlockParsingFail.java.fail b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputTextBlockParsingFail.java.fail
new file mode 100644
index 00000000000..d97da582bcc
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputTextBlockParsingFail.java.fail
@@ -0,0 +1,15 @@
+//non-compiled with javac, we should fail to parse this file
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+public class InputTextBlockParsingFail {
+
+    // This should fail to parse since it is not
+    // compilable with javac; String templates must be on the
+    // RHS of a template processor expression. Our grammar
+    // previously parsed this code as a text block,
+    // but this is not a legal escape to be used
+    // in a text block.
+    String s = """
+            \{}
+            """;
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputUnnamedVariableBasic.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputUnnamedVariableBasic.java
new file mode 100644
index 00000000000..4a788d97a45
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputUnnamedVariableBasic.java
@@ -0,0 +1,69 @@
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+public class InputUnnamedVariableBasic {
+        private void unnamedTest() {
+        int _ = 0;
+        int _ = 1;
+        try (Lock _ = null) {
+            try (Lock _ = null) {
+            } catch (Exception _) {
+                try {
+                } catch (Exception _) {}
+            }
+        }
+        try (final Lock _ = null) { }
+        try (@Foo Lock _ = null) { }
+
+        String[] strs = new String[] { "str1", "str2" };
+        for (var _ : strs) {
+            for (var _ : strs) {
+            }
+        }
+        TwoParams p1 = (_, _) -> {};
+        TwoParams p2 = (var _, var _) -> {};
+        TwoIntParams p3 = (int _, int b) -> {};
+        TwoIntParams p4 = (int _, int _) -> {};
+        TwoIntParamsIntRet p5 = (int _, int _) -> { return 1; };
+
+        p1.run(1, 2);
+        p2.run(1, 2);
+        p3.run(1, 2);
+        p4.run(1, 2);
+        p5.run(1, 2);
+
+        R r = new R(null);
+        if (r instanceof R _) {}
+        if (r instanceof R(_)) {}
+        for (int _ = 0, _ = 1, x = 1; x <= 1 ; x++) {}
+    }
+
+        // JEP 443 examples
+    record Point(int x, int y) { }
+    enum Color { RED, GREEN, BLUE }
+    record ColoredPoint(Point p, Color c) { }
+
+    void jep443examples(ColoredPoint r) {
+        if (r instanceof ColoredPoint(Point(int x, int y), _)) { }
+        if (r instanceof ColoredPoint(_, Color c)) { }
+        if (r instanceof ColoredPoint(Point(int x, _), _)) { }
+        if (r instanceof ColoredPoint(Point(int x, int _), Color _)) { }
+        if (r instanceof ColoredPoint _) { }
+    }
+
+    class Lock implements AutoCloseable {
+        @Override
+        public void close() {}
+    }
+    interface TwoParams {
+        public void run(Object o1, Object o2);
+    }
+    interface TwoIntParams {
+        public void run(int o1, int o2);
+    }
+    interface TwoIntParamsIntRet {
+        public int run(int a, int b);
+    }
+    record R(Object o) {}
+    public @interface Foo { }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputUnnamedVariableSwitch.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputUnnamedVariableSwitch.java
new file mode 100644
index 00000000000..9b558952882
--- /dev/null
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java21/InputUnnamedVariableSwitch.java
@@ -0,0 +1,118 @@
+//non-compiled with javac: Compilable with Java21
+package com.puppycrawl.tools.checkstyle.grammar.java21;
+
+public class InputUnnamedVariableSwitch {
+        int testMultiValuesTopLevel(Object o) {
+        return switch (o) {
+            case R1 _, R2 _ -> 1;
+            default -> 2;
+        };
+    }
+
+    int testMultiValuesTopLevel2(Base o) {
+        return switch (o) {
+            case R1 r -> 1;
+            case R2 _, R3 _, R4 _ -> 2;
+        };
+    }
+
+    int testMultiValuesNested(Box<?> b) {
+        return switch (b) {
+            case Box(R1 _), Box(R2 _) -> 1;
+            case Box(R3 _) -> 2;
+            case Box(_)  -> 3;
+        };
+    }
+
+    int testMultiValuesNestedUnnamedVarAndPattern(Box<?> b) {
+        return switch (b) {
+            case Box(R1 _), Box(R2 _) -> 1;
+            case Box(R3 _), Box(_) -> 2;
+        };
+    }
+
+    int testMultiValuesNestedMix(Object b) {
+        return switch (b) {
+            case Box(_), Box2(_) -> 1;
+            default -> 2;
+        };
+    }
+
+    int testMultiValuesNestedMix2(Object b) {
+        return switch (b) {
+            case Box(_), String _ -> 1;
+            default -> 2;
+        };
+    }
+
+    int testMultiValuesStatementBlock2(Object o) {
+        switch (o) {
+            case Box(_):
+            case String _:
+                return 1;
+            default:
+                return 2;
+        }
+    }
+
+    int testMultiValuesGuards(Base b, int x) {
+        return switch (b) {
+            case R1 r -> 1;
+            case R2 _, R3 _, R4 _ when x == 1 -> 2;
+            case R2 _, R3 _, R4 _ -> 3;
+        };
+    }
+
+    int testMixVarWithExplicit(Box<?> t) {
+        int success = -1;
+        success = switch(t) {
+            case Box(R1 _) : {
+                yield 1;
+            }
+            case Box(R2 _), Box(var _) : {
+                yield 2;
+            }
+            default : {
+                yield -2;
+            }
+        };
+        return success;
+    }
+
+    String unnamedGuardAddsBindings(Object o1, Object o2) {
+        return switch (o1) {
+            case String _, Object _ when o2 instanceof String s: yield s;
+            case Object _: yield "any";
+        };
+    }
+
+    boolean testUnnamedPrimitiveAndExhaustiveness(RecordWithPrimitive a) {
+        boolean r1 = switch (a) {
+            case Prim1(var _) -> true;
+            case Prim2(_) -> false;
+        };
+
+        boolean r2 = switch (a) {
+            case Prim1(var _) -> true;
+            case Prim2(var _) -> false;
+        };
+
+        boolean r3 = switch (a) {
+            case Prim1(_) -> true;
+            case Prim2(_) -> false;
+        };
+
+        return r1 && r2 && r3;
+    }
+
+    abstract sealed class Base permits R1, R2, R3, R4 { }
+    final  class R1  extends Base { }
+    final  class R2  extends Base { }
+    final  class R3  extends Base { }
+    final  class R4  extends Base { }
+    sealed interface RecordWithPrimitive permits Prim1, Prim2 {};
+    record Prim1(int n1) implements RecordWithPrimitive {};
+    record Prim2(int n2) implements RecordWithPrimitive {};
+    record Box<T extends Base>(T content) { }
+    record Box2<T extends Base>(T content) { }
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserFullJavaIdentifierSupport.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserFullJavaIdentifierSupport.java
index c791fa752d7..d2489d7989f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserFullJavaIdentifierSupport.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserFullJavaIdentifierSupport.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java15
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.javaparser;
 
 public class InputJavaParserFullJavaIdentifierSupport {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoFreezeOnDeeplyNestedLambdas.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoFreezeOnDeeplyNestedLambdas.java
index 2bb3f4e6a0b..bbd4a81cd67 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoFreezeOnDeeplyNestedLambdas.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoFreezeOnDeeplyNestedLambdas.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java16
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.javaparser;
 
 import java.util.concurrent.Callable;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserTextBlocks.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserTextBlocks.java
index b803642709d..e4a5658fa34 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserTextBlocks.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserTextBlocks.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.javaparser;
 
 public class InputJavaParserTextBlocks {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnCompactCtor.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnCompactCtor.java
index d0152afca1c..a6558d3ae18 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnCompactCtor.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnCompactCtor.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.utils.blockcommentposition;
 
 public record InputBlockCommentPositionOnCompactCtor() {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnRecord.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnRecord.java
index a3f8ace6efb..e4a38d77608 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnRecord.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnRecord.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.utils.blockcommentposition;
 /**
  * I'm a javadoc
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/checkutil/InputCheckUtil1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/checkutil/InputCheckUtil1.java
deleted file mode 100644
index 25b490fc2b5..00000000000
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/utils/checkutil/InputCheckUtil1.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck
-allowMissingPropertyJavadoc = true
-
-
-*/
-
-//non-compiled with javac: Compilable with Java14
-package com.puppycrawl.tools.checkstyle.utils.checkutil;
-
-public class InputCheckUtil1 {
-
-    public void validAssign(String result) { // violation 'Missing a Javadoc comment'
-         result = switch ("in") {
-              case "correct" -> "true";
-              default -> "also correct";
-          };
-    }
-}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathmapper/InputXpathMapperTextBlock.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathmapper/InputXpathMapperTextBlock.java
index 002911e4909..84e26659a10 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathmapper/InputXpathMapperTextBlock.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathmapper/InputXpathMapperTextBlock.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.xpath.xpathmapper;
 
 public class InputXpathMapperTextBlock {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlock.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlock.java
index 5f47bed741e..ba6eb041ae2 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlock.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlock.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.xpath.xpathquerygenerator;
 
 public class InputXpathQueryGeneratorTextBlock {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockCrlf.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockCrlf.java
index d30c133d099..4e3cc286426 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockCrlf.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockCrlf.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.xpath.xpathquerygenerator;
 
 public class InputXpathQueryGeneratorTextBlockCrlf {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockNewLine.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockNewLine.java
index d4d61f5b669..f6ea15ff22d 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockNewLine.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/xpath/xpathquerygenerator/InputXpathQueryGeneratorTextBlockNewLine.java
@@ -1,4 +1,4 @@
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.xpath.xpathquerygenerator;
 
 public class InputXpathQueryGeneratorTextBlockNewLine {
diff --git a/src/test/resources/archunit.properties b/src/test/resources/archunit.properties
deleted file mode 100644
index e0a39de08a3..00000000000
--- a/src/test/resources/archunit.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This will limit the maximum number of dependencies to report per cycle edge.
-# Note that ArchUnit will regardless always analyze all dependencies to detect cycles,
-# so this purely affects how many dependencies will be printed in the report.
-# Also note that this number will quickly affect the required heap since it scales with number.
-# of edges and number of cycles
-# default is 20
-cycles.maxNumberOfDependenciesPerEdge=550
-
-# This will limit the maximum number of cycles to detect and thus required CPU and heap.
-# default is 100
-cycles.maxNumberToDetect=200
-
-# The store will be updated with the current state, and the reported result will be success.
-# Just like freezing violation for the first time while creating the store.
-freeze.refreeze=true
-
-freeze.store.default.path=config/archunit-store
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractcheck/InputAbstractCheckTestFileContents.java b/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractcheck/InputAbstractCheckTestFileContents.java
index e860a02e0de..683c07a1299 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractcheck/InputAbstractCheckTestFileContents.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractcheck/InputAbstractCheckTestFileContents.java
@@ -1,4 +1,10 @@
+/*
+com.puppycrawl.tools.checkstyle.api.AbstractCheckTest$ViolationAstCheck
+
+*/
+
 package com.puppycrawl.tools.checkstyle.api.abstractcheck;
+// violation above
 
 /**
  * I'm a javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractfileset/InputAbstractFileSetLineColumn.java b/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractfileset/InputAbstractFileSetLineColumn.java
new file mode 100644
index 00000000000..70f55c5485c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractfileset/InputAbstractFileSetLineColumn.java
@@ -0,0 +1,18 @@
+/*
+com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheckTest$ViolationFileSetCheck
+
+*/
+// violation 4 lines above 'Violation.'
+package com.puppycrawl.tools.checkstyle.api.abstractfileset;
+
+public class InputAbstractFileSetLineColumn {
+    private int a = 123456;
+
+    public int getA() {
+        return a;
+    }
+
+    public void setA(int a) {
+        this.a = a;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractfileset/InputAbstractFileSetLineColumn.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractfileset/InputAbstractFileSetLineColumn.txt
deleted file mode 100644
index 9f358a4adde..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/api/abstractfileset/InputAbstractFileSetLineColumn.txt
+++ /dev/null
@@ -1 +0,0 @@
-123456
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/api/fileset/InputFileSetIllegalTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/api/fileset/InputFileSetIllegalTokens.java
index 55cc1bcd17c..0d1e8275a2c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/api/fileset/InputFileSetIllegalTokens.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/api/fileset/InputFileSetIllegalTokens.java
@@ -1,3 +1,8 @@
+/*
+com.puppycrawl.tools.checkstyle.api.FileSetCheckTest$TestFileSetCheck
+
+*/
+
 package com.puppycrawl.tools.checkstyle.api.fileset;
 
 public class InputFileSetIllegalTokens
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerClearDetailAstLazyLoadCache.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerClearDetailAstLazyLoadCache.java
index 2bd506ac06b..b9a043219fc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerClearDetailAstLazyLoadCache.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerClearDetailAstLazyLoadCache.java
@@ -1,3 +1,11 @@
+/*
+com.puppycrawl.tools.checkstyle.CheckerTest$CheckWhichDoesNotRequireCommentNodes
+
+com.puppycrawl.tools.checkstyle.CheckerTest$CheckWhichRequiresCommentNodes
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checker;
 
 public class InputCheckerClearDetailAstLazyLoadCache {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTabCharacter.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTabCharacter.txt
index d82aa3d256a..302885f0738 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTabCharacter.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTabCharacter.txt
@@ -1,3 +1,13 @@
-//has no tabs
-	//has tab
-		//has 2 tabs
+/*
+com.puppycrawl.tools.checkstyle.CheckerTest$VerifyPositionAfterTabFileSet
+
+*/
+
+// has no tabs
+line1
+
+// has a tab
+    line4	// violation
+
+// has 2 tabs
+        line5	// violation	// violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTestCharset.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTestCharset.java
new file mode 100644
index 00000000000..acbae4392f5
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTestCharset.java
@@ -0,0 +1,5 @@
+package com.puppycrawl.tools.checkstyle.checker;
+
+public class InputCheckerTestCharset {
+    String a = "ᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀ"; // violation
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTestSeverity.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTestSeverity.java
new file mode 100644
index 00000000000..632c6cd4b66
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checker/InputCheckerTestSeverity.java
@@ -0,0 +1,14 @@
+/*xml
+<module name="Checker">
+  <property name="severity" value="ignore"/>
+  <module name="LineLength">
+    <property name="max" value="50"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checker;
+
+public class InputCheckerTestSeverity {
+  String a = "a really long messageeee blahh blahh blahhhhhhhhhhh and I'm hungry now ;(";
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCorrect.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCorrect.java
index 4060d5b1573..bb92015c78f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCorrect.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCorrect.java
@@ -14,78 +14,78 @@
 /* Config: default */
 
 
-@MyAnnotation6 // ok
-@MyAnnotation5 // ok
+@MyAnnotation6
+@MyAnnotation5
 class InputAnnotationLocationCorrect
 {
 
-    @MyAnnotation6 // ok
-    @MyAnnotation5 // ok
+    @MyAnnotation6
+    @MyAnnotation5
     public int a;
 
-    @MyAnnotation5 // ok
+    @MyAnnotation5
     public int b;
 
-    @MyAnnotation6 // ok
-    @MyAnnotation5 // ok
+    @MyAnnotation6
+    @MyAnnotation5
     public int c;
 
-    @MyAnnotation5 // ok
+    @MyAnnotation5
     public int d;
 
-    @MyAnnotation6 // ok
-    @MyAnnotation5 // ok
+    @MyAnnotation6
+    @MyAnnotation5
     public InputAnnotationLocationCorrect()
     {
         //comment
     }
-    @MyAnnotation5 // ok
-    @MyAnnotation6 // ok
+    @MyAnnotation5
+    @MyAnnotation6
     void foo1() {}
 
-    @MyAnnotation5 // ok
-    @MyAnnotation6 // ok
+    @MyAnnotation5
+    @MyAnnotation6
     void foo2() {}
 
-    @MyAnnotation5 // ok
-    @MyAnnotation6 // ok
-    @MyAnnotation3 // ok
-    @MyAnnotation4 // ok
+    @MyAnnotation5
+    @MyAnnotation6
+    @MyAnnotation3
+    @MyAnnotation4
     class InnerClass
     {
-        @MyAnnotation6 // ok
-        @MyAnnotation5 // ok
+        @MyAnnotation6
+        @MyAnnotation5
         public int a;
 
-        @MyAnnotation5 // ok
+        @MyAnnotation5
         public int b;
 
-        @MyAnnotation6 // ok
-        @MyAnnotation5 // ok
+        @MyAnnotation6
+        @MyAnnotation5
         public int c;
 
-        @MyAnnotation5 // ok
+        @MyAnnotation5
         public int d;
 
-        @MyAnnotation6 // ok
+        @MyAnnotation6
         public InnerClass()
         {
             // comment
         }
-        @MyAnnotation5 // ok
-        @MyAnnotation6 void foo1(int a) {} // ok
+        @MyAnnotation5
+        @MyAnnotation6 void foo1(int a) {}
 
-        @MyAnnotation5 // ok
-        @MyAnnotation6 // ok
+        @MyAnnotation5
+        @MyAnnotation6
         void foo2() {}
     }
 
-    @MyAnnotation5 // ok
-    @MyAnnotation6 // ok
+    @MyAnnotation5
+    @MyAnnotation6
     InnerClass anon = new InnerClass()
     {
-        @MyAnnotation6 // ok
-        @MyAnnotation5 // ok
+        @MyAnnotation6
+        @MyAnnotation5
         public int a;
 
         @MyAnnotation5 public int b;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCustomAnnotationsDeclared.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCustomAnnotationsDeclared.java
index 8e60d73bcc6..ab9b8043fa3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCustomAnnotationsDeclared.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCustomAnnotationsDeclared.java
@@ -14,13 +14,13 @@
 @MyAnnotation11 @MyAnnotation12 @MyAnnotation13 // 3 violations
 public class InputAnnotationLocationCustomAnnotationsDeclared {
 
-    @MyAnnotation13 // ok
+    @MyAnnotation13
     void method() {
 
     }
 
-    @MyAnnotation13 // ok
-    @MyAnnotation12 // ok
+    @MyAnnotation13
+    @MyAnnotation12
     void method2() {
 
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationDeprecatedAndCustom.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationDeprecatedAndCustom.java
index 75712fb0139..5d29cbddd6b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationDeprecatedAndCustom.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationDeprecatedAndCustom.java
@@ -15,14 +15,14 @@
 import java.lang.annotation.Target;
 
 public class InputAnnotationLocationDeprecatedAndCustom {
-    @Deprecated // ok
+    @Deprecated
     public class Annotation
     {
         @Deprecated // <--method, separate line
-        public void test(@MyAnnotation String s) { // ok
+        public void test(@MyAnnotation String s) {
             @MyAnnotation // <--variable, separate line
             Integer i;
-            for (@MyAnnotation char c : s.toCharArray()) { // ok
+            for (@MyAnnotation char c : s.toCharArray()) {
             }
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEmpty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEmpty.java
index 220035002b5..b4d451c7022 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEmpty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEmpty.java
@@ -11,6 +11,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
-public class InputAnnotationLocationEmpty { // ok
+public class InputAnnotationLocationEmpty {
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java
deleted file mode 100644
index ab43a5a12b6..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-AnnotationLocation
-allowSamelineMultipleAnnotations = (default)false
-allowSamelineSingleParameterlessAnnotation = (default)true
-allowSamelineParameterizedAnnotation = (default)false
-tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
-         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
-
-// violation below 'Annotation 'MyAnn' should be alone on line.'
-@MyAnn_21 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn
-(value = "")
-class InputAnnotationLocationIncorrect
-{
-
-    @MyAnn_21 @MyAnnotation1(value = "") // violation '.* should be alone on line.'
-    public int a;
-
-    @MyAnnotation1(value = "") public int b; // violation '.* should be alone on line.'
-
-    @MyAnn_21 // ok
-        @MyAnnotation1 // violation '.* incorrect .* level 8, .* should be 4.'
-(value = "")
-    public int c;
-
-    @MyAnnotation1(value = "") // ok
-    public int d;
-
-    @MyAnn_21 // ok
-        @MyAnnotation1 // violation '.* incorrect .* level 8, .* should be 4.'
-(value = "")
-    public InputAnnotationLocationIncorrect() {}
-
-    @MyAnnotation1("foo") @MyAnn_21 void foo1() {} // 2 violations
-
-    @MyAnnotation1(value = "") // ok
-       @MyAnn_21 // violation '.* incorrect .* level 7, .* should be 4.'
-    void foo2() {}
-
-    @MyAnnotation1(value = "") // ok
-        @MyAnn_21 // violation '.* incorrect .* level 8, .* should be 4.'
-      @MyAnnotation3 // violation '.* incorrect .* level 6, .* should be 4.'
-          @MyAnnotation4 // violation '.* incorrect .* level 10, .* should be 4.'
-    class InnerClass
-    {
-        @MyAnn_21 @MyAnnotation1 // violation 'Annotation 'MyAnnotation1' should be alone on line.'
-(value = "")
-        public int a;
-
-        @MyAnnotation1(value = "") public int b; // violation '.* should be alone on line.'
-
-        @MyAnn_21 // ok
-            @MyAnnotation1 // violation '.* incorrect .* level 12, .* should be 8.'
-(value = "")
-        public int c;
-
-        @MyAnnotation1(value = "") // ok
-        public int d;
-
-        @MyAnn_21 // ok
-        @MyAnnotation1(value = "") public InnerClass() // violation '.* should be alone on line.'
-        {
-            // comment
-        }
-        @MyAnnotation1(value = "")
-            @MyAnn_21 // violation '.* incorrect .* level 12, .* should be 8.'
-        void foo1() {}
-
-        @MyAnnotation1(value = "")
-            @MyAnn_21 // violation '.* incorrect .* level 12, .* should be 8.'
-        void foo2() {}
-    }
-
-    @MyAnnotation1(value = "")
-       @MyAnn_21 // violation '.* incorrect .* level 7, .* should be 4.'
-    InnerClass anon = new InnerClass()
-    {
-        @MyAnn_21 @MyAnnotation1(value = "") public int a; // violation '.*should be alone on line.'
-
-        @MyAnnotation1(value = "") public int b; // violation '.* should be alone on line.'
-
-        @MyAnn_21 // ok
-        @MyAnnotation1(value = "") // ok
-        public int c;
-
-        @MyAnnotation1(value = "") // ok
-        public int d;
-
-        @MyAnnotation1(value = "") // ok
-           @MyAnn_21 void foo1() {} // violation '.* incorrect .* level 11, .* should be 8.'
-
-        @MyAnnotation1(value = "") // ok
-          @MyAnn_21 // violation '.* incorrect .* level 10, .* should be 8.'
-        void foo2() {}
-        @MyAnnotation1(value = "") void foo42() {} // violation '.* should be alone on line.'
-    };
-
-}
-
-   @MyAnnotation1 // ok
-(value = "")
-@MyAnn_21 // violation '.* incorrect .* level 0, .* should be 3.'
-class Foo {
-    public void method1(@MyAnnotation3 @MyAnn_21 Object param1) {
-        try {
-        }
-        catch (@MyAnnotation3 @MyAnn_21 Exception e) {
-        }
-        return;
-    }
-}
-
-@interface MyAnnotation1 {
-
-        String value();}
-
-@interface MyAnn_21 {}
-
-@interface MyAnnotation3 {}
-
-@interface MyAnnotation4 {}
-
-@interface MyAnn {
-
-    String value();}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java
deleted file mode 100644
index 180060d77cd..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-AnnotationLocation
-allowSamelineMultipleAnnotations = true
-allowSamelineSingleParameterlessAnnotation = (default)true
-allowSamelineParameterizedAnnotation = true
-tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
-         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
-
-@MyAnn_22 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn_2 // ok
-(value = "")
-class InputAnnotationLocationIncorrect2
-{
-
-    @MyAnn_22 @MyAnnotation_12(value = "") // ok
-    public int a;
-
-    @MyAnnotation_12(value = "") public int b; // ok
-
-    @MyAnn_22 // ok
-        @MyAnnotation_12 // violation '.* incorrect .* level 8, .* should be 4.'
-(value = "")
-    public int c;
-
-    @MyAnnotation_12(value = "") // ok
-    public int d;
-
-    @MyAnn_22 // ok
-        @MyAnnotation_12 // violation '.* incorrect .* level 8, .* should be 4.'
-(value = "")
-    public InputAnnotationLocationIncorrect2() {}
-
-    @MyAnnotation_12("foo") @MyAnn_22 void foo1() {} // ok
-
-    @MyAnnotation_12(value = "") // ok
-       @MyAnn_22 // violation '.*'MyAnn_22' have incorrect indentation level 7, .* should be 4.'
-    void foo2() {}
-
-    @MyAnnotation_12(value = "") // ok
-        @MyAnn_22 // violation '.* incorrect .* level 8, .* should be 4.'
-      @MyAnnotation_32 // violation '.* incorrect .* level 6, .* should be 4.'
-          @MyAnnotation_42 // violation '.* incorrect .* level 10, .* should be 4.'
-    class InnerClass
-    {
-        @MyAnn_22 @MyAnnotation_12 // ok
-(value = "")
-        public int a;
-
-        @MyAnnotation_12(value = "") public int b; // ok
-
-        @MyAnn_22 // ok
-            @MyAnnotation_12 // violation '.* incorrect .* level 12, .* should be 8.'
-(value = "")
-        public int c;
-
-        @MyAnnotation_12(value = "") // ok
-        public int d;
-
-        @MyAnn_22 // ok
-        @MyAnnotation_12(value = "") public InnerClass() // ok
-        {
-            // comment
-        }
-        @MyAnnotation_12(value = "") // ok
-            @MyAnn_22 // violation '.* incorrect .* level 12, .* should be 8.'
-        void foo1() {}
-
-        @MyAnnotation_12(value = "") // ok
-            @MyAnn_22 // violation '.* incorrect .* level 12, .* should be 8.'
-        void foo2() {}
-    }
-
-    @MyAnnotation_12(value = "") // ok
-       @MyAnn_22 // violation '.* incorrect .* level 7, .* should be 4.'
-    InnerClass anon = new InnerClass()
-    {
-        @MyAnn_22 @MyAnnotation_12(value = "") public int a; // ok
-
-        @MyAnnotation_12(value = "") public int b; // ok
-
-        @MyAnn_22 // ok
-        @MyAnnotation_12(value = "") // ok
-        public int c;
-
-        @MyAnnotation_12(value = "") // ok
-        public int d;
-
-        @MyAnnotation_12(value = "") // ok
-           @MyAnn_22 void foo1() {} // violation '.* incorrect .* level 11, .* should be 8.'
-
-        @MyAnnotation_12(value = "") // ok
-          @MyAnn_22 // violation '.* incorrect .* level 10, .* should be 8.'
-        void foo2() {}
-
-        @MyAnnotation_12(value = "") void foo42() {} // ok
-    };
-
-}
-
-   @MyAnnotation_12 // ok
-(value = "")
-@MyAnn_22 // violation '.*'MyAnn_22' have incorrect indentation level 0, .* should be 3.'
-class Foo2 {
-    public void method1(@MyAnnotation_32 @MyAnn_22 Object param1) { // ok
-        try {
-        }
-        catch (@MyAnnotation_32 @MyAnn_22 Exception e) { // ok
-        }
-        return;
-    }
-}
-
-@interface MyAnnotation_12 {
-
-        String value();}
-
-@interface MyAnn_22 {}
-
-@interface MyAnnotation_32 {}
-
-@interface MyAnnotation_42 {}
-
-@interface MyAnn_2 {
-
-    String value();}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2One.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2One.java
new file mode 100644
index 00000000000..3eb8af6567d
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2One.java
@@ -0,0 +1,117 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = true
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+@MyAnn_22 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn_2
+(value = "")
+class InputAnnotationLocationIncorrect2One
+{
+
+    @MyAnn_22 @MyAnnotation_12(value = "")
+    public int a;
+
+    @MyAnnotation_12(value = "") public int b;
+
+    @MyAnn_22
+        @MyAnnotation_12 // violation '.* incorrect .* level 8, .* should be 4.'
+(value = "")
+    public int c;
+
+    @MyAnnotation_12(value = "")
+    public int d;
+
+    @MyAnn_22
+        @MyAnnotation_12 // violation '.* incorrect .* level 8, .* should be 4.'
+(value = "")
+    public InputAnnotationLocationIncorrect2One() {}
+
+    @MyAnnotation_12("foo") @MyAnn_22 void foo1() {}
+
+    @MyAnnotation_12(value = "")
+       @MyAnn_22 // violation '.*'MyAnn_22' have incorrect indentation level 7, .* should be 4.'
+    void foo2() {}
+
+    @MyAnnotation_12(value = "")
+        @MyAnn_22 // violation '.* incorrect .* level 8, .* should be 4.'
+      @MyAnnotation_32 // violation '.* incorrect .* level 6, .* should be 4.'
+          @MyAnnotation_42 // violation '.* incorrect .* level 10, .* should be 4.'
+    class InnerClass
+    {
+        @MyAnn_22 @MyAnnotation_12
+(value = "")
+        public int a;
+
+        @MyAnnotation_12(value = "") public int b;
+
+        @MyAnn_22
+            @MyAnnotation_12 // violation '.* incorrect .* level 12, .* should be 8.'
+(value = "")
+        public int c;
+
+        @MyAnnotation_12(value = "")
+        public int d;
+
+        @MyAnn_22
+        @MyAnnotation_12(value = "") public InnerClass()
+        {
+            // comment
+        }
+        @MyAnnotation_12(value = "")
+            @MyAnn_22 // violation '.* incorrect .* level 12, .* should be 8.'
+        void foo1() {}
+
+        @MyAnnotation_12(value = "")
+            @MyAnn_22 // violation '.* incorrect .* level 12, .* should be 8.'
+        void foo2() {}
+    }
+
+    @MyAnnotation_12(value = "")
+       @MyAnn_22 // violation '.* incorrect .* level 7, .* should be 4.'
+    InnerClass anon = new InnerClass()
+    {
+        @MyAnn_22 @MyAnnotation_12(value = "") public int a;
+
+        @MyAnnotation_12(value = "") public int b;
+
+        @MyAnn_22
+        @MyAnnotation_12(value = "")
+        public int c;
+
+        @MyAnnotation_12(value = "")
+        public int d;
+
+        @MyAnnotation_12(value = "")
+           @MyAnn_22 void foo1() {} // violation '.* incorrect .* level 11, .* should be 8.'
+
+        @MyAnnotation_12(value = "")
+          @MyAnn_22 // violation '.* incorrect .* level 10, .* should be 8.'
+        void foo2() {}
+
+        @MyAnnotation_12(value = "") void foo42() {}
+    };
+
+}
+
+
+@interface MyAnnotation_12 {
+
+        String value();}
+
+@interface MyAnn_22 {}
+
+@interface MyAnnotation_32 {}
+
+@interface MyAnnotation_42 {}
+
+@interface MyAnn_2 {
+
+    String value();}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2Two.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2Two.java
new file mode 100644
index 00000000000..338000966a3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2Two.java
@@ -0,0 +1,26 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = true
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+public class InputAnnotationLocationIncorrect2Two {
+
+   @MyAnnotation_12
+            (value = "")
+@MyAnn_22 // violation '.*'MyAnn_22' have incorrect indentation level 0, .* should be 3.'
+   class Foo2 {
+        public void method1(@MyAnnotation_32 @MyAnn_22 Object param1) {
+            try {
+            }
+            catch (@MyAnnotation_32 @MyAnn_22 Exception e) {
+            }
+        }
+   }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java
deleted file mode 100644
index 04fa2e1b18f..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-AnnotationLocation
-allowSamelineMultipleAnnotations = (default)false
-allowSamelineSingleParameterlessAnnotation = (default)true
-allowSamelineParameterizedAnnotation = (default)false
-tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, \
-         ANNOTATION_DEF, ANNOTATION_FIELD_DEF, ENUM_CONSTANT_DEF, PACKAGE_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
-
-// violation below 'Annotation 'MyAnn3' should be alone on line.'
-@MyAnn_23 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn3
-(value = "")
-class InputAnnotationLocationIncorrect3
-{
-
-    @MyAnn_23 @MyAnnotation_13(value = "") // violation '.* should be alone on line.'
-    public int a;
-
-    @MyAnnotation_13(value = "") public int b; // violation '.* should be alone on line.'
-
-    @MyAnn_23 // ok
-        @MyAnnotation_13 // violation '.* incorrect .* level 8, .* should be 4.'
-(value = "")
-    public int c;
-
-    @MyAnnotation_13(value = "") // ok
-    public int d;
-
-    @MyAnn_23
-        @MyAnnotation_13 // violation '.* incorrect .* level 8, .* should be 4.'
-(value = "")
-    public InputAnnotationLocationIncorrect3() {}
-
-    @MyAnnotation_13("foo") @MyAnn_23 void foo1() {} // 2 violations
-
-    @MyAnnotation_13(value = "") // ok
-       @MyAnn_23 // violation '.* incorrect .* level 7, .* should be 4.'
-    void foo2() {}
-
-    @MyAnnotation_13(value = "") // ok
-        @MyAnn_23 // violation '.* incorrect .* level 8, .* should be 4.'
-      @MyAnnotation_33 // violation '.* incorrect .* level 6, .* should be 4.'
-          @MyAnnotation_43 // violation '.* incorrect .* level 10, .* should be 4.'
-    class InnerClass3
-    {
-        @MyAnn_23 @MyAnnotation_13 // violation '.*'MyAnnotation_13' should be alone on line.'
-(value = "")
-        public int a;
-
-        @MyAnnotation_13(value = "") public int b; // violation '.* should be alone on line.'
-
-        @MyAnn_23 // ok
-            @MyAnnotation_13 // violation '.* incorrect .* level 12, .* should be 8.'
-(value = "")
-        public int c;
-
-        @MyAnnotation_13(value = "") // ok
-        public int d;
-
-        @MyAnn_23 // ok
-        @MyAnnotation_13(value = "") public InnerClass3() // violation '.* should be alone on line.'
-        {
-            // comment
-        }
-        @MyAnnotation_13(value = "") // ok
-            @MyAnn_23 // violation '.* incorrect .* level 12, .* should be 8.'
-        void foo1() {}
-
-        @MyAnnotation_13(value = "") // ok
-            @MyAnn_23 // violation '.*'MyAnn_23' have incorrect indentation level 12,.*should be 8.'
-        void foo2() {}
-    }
-
-    @MyAnnotation_13(value = "") // ok
-       @MyAnn_23 // violation '.*'MyAnn_23' have incorrect indentation level 7,.*should be 4.'
-    InnerClass3 anon = new InnerClass3()
-    {
-        // violation below 'Annotation 'MyAnnotation_13' should be alone on line.'
-        @MyAnn_23 @MyAnnotation_13(value = "") public int a;
-
-        @MyAnnotation_13(value = "") public int b; // violation '.* should be alone on line.'
-
-        @MyAnn_23 // ok
-        @MyAnnotation_13(value = "") // ok
-        public int c;
-
-        @MyAnnotation_13(value = "") // ok
-        public int d;
-
-        @MyAnnotation_13(value = "") // ok
-           @MyAnn_23 void foo1() {} // violation '.* incorrect .* level 11, .* should be 8.'
-
-        @MyAnnotation_13(value = "") // ok
-          @MyAnn_23 // violation '.* incorrect .* level 10, .* should be 8.'
-        void foo2() {}
-
-        @MyAnnotation_13(value = "") void foo42() {} // violation '.* should be alone on line.'
-    };
-
-}
-
-   @MyAnnotation_13 // ok
-(value = "")
-@MyAnn_23 // violation 'Annotation 'MyAnn_23' have incorrect indentation level 0, .* should be 3.'
-class Foo3 {
-    public void method1(@MyAnnotation_33 @MyAnn_23 Object param1) {
-        try {
-        }
-        catch (@MyAnnotation_33 @MyAnn_23 Exception e) {
-        }
-        return;
-    }
-}
-
-@interface MyAnnotation_13 {
-
-        String value();}
-
-@interface MyAnn_23 {}
-
-@interface MyAnnotation_33 {}
-
-@interface MyAnnotation_43 {}
-
-@interface MyAnn3 {
-
-    String value();}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3One.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3One.java
new file mode 100644
index 00000000000..63693956f70
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3One.java
@@ -0,0 +1,118 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, \
+         ANNOTATION_DEF, ANNOTATION_FIELD_DEF, ENUM_CONSTANT_DEF, PACKAGE_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+// violation below 'Annotation 'MyAnn3' should be alone on line.'
+@MyAnn_23 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn3
+(value = "")
+class InputAnnotationLocationIncorrect3One
+{
+
+    @MyAnn_23 @MyAnnotation_13(value = "") // violation '.* should be alone on line.'
+    public int a;
+
+    @MyAnnotation_13(value = "") public int b; // violation '.* should be alone on line.'
+
+    @MyAnn_23
+        @MyAnnotation_13 // violation '.* incorrect .* level 8, .* should be 4.'
+(value = "")
+    public int c;
+
+    @MyAnnotation_13(value = "")
+    public int d;
+
+    @MyAnn_23
+        @MyAnnotation_13 // violation '.* incorrect .* level 8, .* should be 4.'
+(value = "")
+    public InputAnnotationLocationIncorrect3One() {}
+
+    @MyAnnotation_13("foo") @MyAnn_23 void foo1() {} // 2 violations
+
+    @MyAnnotation_13(value = "")
+       @MyAnn_23 // violation '.* incorrect .* level 7, .* should be 4.'
+    void foo2() {}
+
+    @MyAnnotation_13(value = "")
+        @MyAnn_23 // violation '.* incorrect .* level 8, .* should be 4.'
+      @MyAnnotation_33 // violation '.* incorrect .* level 6, .* should be 4.'
+          @MyAnnotation_43 // violation '.* incorrect .* level 10, .* should be 4.'
+    class InnerClass3
+    {
+        @MyAnn_23 @MyAnnotation_13 // violation '.*'MyAnnotation_13' should be alone on line.'
+(value = "")
+        public int a;
+
+        @MyAnnotation_13(value = "") public int b; // violation '.* should be alone on line.'
+
+        @MyAnn_23
+            @MyAnnotation_13 // violation '.* incorrect .* level 12, .* should be 8.'
+(value = "")
+        public int c;
+
+        @MyAnnotation_13(value = "")
+        public int d;
+
+        @MyAnn_23
+        @MyAnnotation_13(value = "") public InnerClass3() // violation '.* should be alone on line.'
+        {
+            // comment
+        }
+        @MyAnnotation_13(value = "")
+            @MyAnn_23 // violation '.* incorrect .* level 12, .* should be 8.'
+        void foo1() {}
+
+        @MyAnnotation_13(value = "")
+            @MyAnn_23 // violation '.*'MyAnn_23' have incorrect indentation level 12,.*should be 8.'
+        void foo2() {}
+    }
+
+    @MyAnnotation_13(value = "")
+       @MyAnn_23 // violation '.*'MyAnn_23' have incorrect indentation level 7,.*should be 4.'
+    InnerClass3 anon = new InnerClass3()
+    {
+        // violation below 'Annotation 'MyAnnotation_13' should be alone on line.'
+        @MyAnn_23 @MyAnnotation_13(value = "") public int a;
+
+        @MyAnnotation_13(value = "") public int b; // violation '.* should be alone on line.'
+
+        @MyAnn_23
+        @MyAnnotation_13(value = "")
+        public int c;
+
+        @MyAnnotation_13(value = "")
+        public int d;
+
+        @MyAnnotation_13(value = "")
+           @MyAnn_23 void foo1() {} // violation '.* incorrect .* level 11, .* should be 8.'
+
+        @MyAnnotation_13(value = "")
+          @MyAnn_23 // violation '.* incorrect .* level 10, .* should be 8.'
+        void foo2() {}
+
+        @MyAnnotation_13(value = "") void foo42() {} // violation '.* should be alone on line.'
+    };
+
+}
+
+@interface MyAnnotation_13 {
+
+        String value();}
+
+@interface MyAnn_23 {}
+
+@interface MyAnnotation_33 {}
+
+@interface MyAnnotation_43 {}
+
+@interface MyAnn3 {
+
+    String value();}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3Two.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3Two.java
new file mode 100644
index 00000000000..39836bac5b5
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3Two.java
@@ -0,0 +1,27 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, \
+         ANNOTATION_DEF, ANNOTATION_FIELD_DEF, ENUM_CONSTANT_DEF, PACKAGE_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+public class InputAnnotationLocationIncorrect3Two {
+   @MyAnnotation_13
+            (value = "")
+@MyAnn_23 // violation 'Annotation 'MyAnn_23' have incorrect indentation level 0, .* should be 3.'
+   class Foo3 {
+        public void method1(@MyAnnotation_33 @MyAnn_23 Object param1) {
+            try {
+            }
+            catch (@MyAnnotation_33 @MyAnn_23 Exception e) {
+            }
+            return;
+        }
+   }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrectOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrectOne.java
new file mode 100644
index 00000000000..978cf0fcc8c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrectOne.java
@@ -0,0 +1,117 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+// violation below 'Annotation 'MyAnn' should be alone on line.'
+@MyAnn_21 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn
+(value = "")
+class InputAnnotationLocationIncorrectOne
+{
+
+    @MyAnn_21 @MyAnnotation1(value = "") // violation '.* should be alone on line.'
+    public int a;
+
+    @MyAnnotation1(value = "") public int b; // violation '.* should be alone on line.'
+
+    @MyAnn_21
+        @MyAnnotation1 // violation '.* incorrect .* level 8, .* should be 4.'
+(value = "")
+    public int c;
+
+    @MyAnnotation1(value = "")
+    public int d;
+
+    @MyAnn_21
+        @MyAnnotation1 // violation '.* incorrect .* level 8, .* should be 4.'
+(value = "")
+    public InputAnnotationLocationIncorrectOne() {}
+
+    @MyAnnotation1("foo") @MyAnn_21 void foo1() {} // 2 violations
+
+    @MyAnnotation1(value = "")
+       @MyAnn_21 // violation '.* incorrect .* level 7, .* should be 4.'
+    void foo2() {}
+
+    @MyAnnotation1(value = "")
+        @MyAnn_21 // violation '.* incorrect .* level 8, .* should be 4.'
+      @MyAnnotation3 // violation '.* incorrect .* level 6, .* should be 4.'
+          @MyAnnotation4 // violation '.* incorrect .* level 10, .* should be 4.'
+    class InnerClass
+    {
+        @MyAnn_21 @MyAnnotation1 // violation 'Annotation 'MyAnnotation1' should be alone on line.'
+(value = "")
+        public int a;
+
+        @MyAnnotation1(value = "") public int b; // violation '.* should be alone on line.'
+
+        @MyAnn_21
+            @MyAnnotation1 // violation '.* incorrect .* level 12, .* should be 8.'
+(value = "")
+        public int c;
+
+        @MyAnnotation1(value = "")
+        public int d;
+
+        @MyAnn_21
+        @MyAnnotation1(value = "") public InnerClass() // violation '.* should be alone on line.'
+        {
+            // comment
+        }
+        @MyAnnotation1(value = "")
+            @MyAnn_21 // violation '.* incorrect .* level 12, .* should be 8.'
+        void foo1() {}
+
+        @MyAnnotation1(value = "")
+            @MyAnn_21 // violation '.* incorrect .* level 12, .* should be 8.'
+        void foo2() {}
+    }
+
+    @MyAnnotation1(value = "")
+       @MyAnn_21 // violation '.* incorrect .* level 7, .* should be 4.'
+    InnerClass anon = new InnerClass()
+    {
+        @MyAnn_21 @MyAnnotation1(value = "") public int a; // violation '.*should be alone on line.'
+
+        @MyAnnotation1(value = "") public int b; // violation '.* should be alone on line.'
+
+        @MyAnn_21
+        @MyAnnotation1(value = "")
+        public int c;
+
+        @MyAnnotation1(value = "")
+        public int d;
+
+        @MyAnnotation1(value = "")
+           @MyAnn_21 void foo1() {} // violation '.* incorrect .* level 11, .* should be 8.'
+
+        @MyAnnotation1(value = "")
+          @MyAnn_21 // violation '.* incorrect .* level 10, .* should be 8.'
+        void foo2() {}
+        @MyAnnotation1(value = "") void foo42() {} // violation '.* should be alone on line.'
+    };
+
+}
+
+
+@interface MyAnnotation1 {
+
+        String value();}
+
+@interface MyAnn_21 {}
+
+@interface MyAnnotation3 {}
+
+@interface MyAnnotation4 {}
+
+@interface MyAnn {
+
+    String value();}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrectTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrectTwo.java
new file mode 100644
index 00000000000..278bec1d6d1
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrectTwo.java
@@ -0,0 +1,27 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+public class InputAnnotationLocationIncorrectTwo {
+   @MyAnnotation1
+            (value = "")
+@MyAnn_21 // violation '.* incorrect .* level 0, .* should be 3.'
+   class Foo {
+        public void method1(@MyAnnotation3 @MyAnn_21 Object param1) {
+            try {
+            }
+            catch (@MyAnnotation3 @MyAnn_21 Exception e) {
+            }
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationMultiple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationMultiple.java
index 24821265467..3c85ad4f7db 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationMultiple.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationMultiple.java
@@ -15,7 +15,7 @@
 
 class InputAnnotationLocationMultiple {
 
-    @Annotation void singleParameterless() {} // ok
+    @Annotation void singleParameterless() {}
 
     @Annotation @Annotation void multipleParameterless() {}
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationSingleParameterless.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationSingleParameterless.java
index 6495b5a2fd4..03a84ccbcdf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationSingleParameterless.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationSingleParameterless.java
@@ -31,10 +31,10 @@ class InputAnnotationLocationSingleParameterless {
     @Annotation("") @Annotation(value = "") void multipleParametrized() {} // 2 violations
 
     void parameterlessSamelineInForEach() {
-        for (@Annotation Object o : new Object[0]) break; //ok
-        for (@Annotation @Annotation Object o : new Object[0]) break; //ok
-        for (@Annotation Object o;;) break; // ok
-        for (@Annotation @Annotation Object o;;) break; //ok
+        for (@Annotation Object o : new Object[0]) break;
+        for (@Annotation @Annotation Object o : new Object[0]) break;
+        for (@Annotation Object o;;) break;
+        for (@Annotation @Annotation Object o;;) break;
     }
 
     @Repeatable(Annotations.class)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationWithoutAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationWithoutAnnotations.java
index 64f0af64693..fceb92d4c88 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationWithoutAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationWithoutAnnotations.java
@@ -12,7 +12,7 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 public class InputAnnotationLocationWithoutAnnotations {
-    public static void main(String[] args) { // ok
+    public static void main(String[] args) {
         final Foo foo = new Foo();
         foo.bar(new Bar<Foo>() {
             public void foo() {
@@ -25,7 +25,7 @@ void bar(Bar<Foo> bar) {
         }
     }
 
-    static abstract class Bar<T> { // ok
+    static abstract class Bar<T> {
         abstract void foo();
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/inputs/PackageAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/inputs/PackageAnnotations.java
index b7d54330e91..a97eeea9159 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/inputs/PackageAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/inputs/PackageAnnotations.java
@@ -15,7 +15,7 @@
  */
 
 @Target(ElementType.PACKAGE)
-@interface PackageAnnotations { // ok
+@interface PackageAnnotations {
 
     PackageAnnotation[] value();
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck.java
deleted file mode 100644
index d6b53958cf8..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-AnnotationOnSameLine
-tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
-         VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
-
-public class InputAnnotationOnSameLineCheck {
-
-    @Annotation int x;      // ok
-
-    int y;
-
-    @Annotation             // violation
-    @SomeClass.Annotation   // violation
-    @java.lang.Deprecated   // violation
-    public int getX() {
-        return (int) x;
-    }
-
-    @Annotation2 @Annotation    // violation
-    public int field;
-
-    public
-    @Annotation int field2; // ok
-}
-
-class SomeClass {
-
-    @interface Annotation {}
-}
-
-@interface Annotation {}
-@interface Annotation2 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck2.java
deleted file mode 100644
index 8450da09847..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck2.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-AnnotationOnSameLine
-tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
-         VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
-
-import static java.lang.annotation.ElementType.*;
-
-import java.lang.annotation.Target;
-import java.util.List;
-import java.util.ArrayList;
-
-public class InputAnnotationOnSameLineCheck2 {
-
-    @Ann        // violation
-    private List<String> names = new ArrayList<>();
-
-    @Ann private List<String> names2 = new ArrayList<>();       // ok
-
-    @SuppressWarnings("deprecation")        // violation
-    @Ann Integer x;
-
-    @SuppressWarnings("deprecation")        // violation
-    @Ann                                    // violation
-    Integer x2;
-
-    @SuppressWarnings("deprecation") @Ann @Ann2 @Ann3 @Ann4 Integer x3;     // ok
-
-}
-
-@Target({CONSTRUCTOR, FIELD, METHOD, PARAMETER, TYPE, TYPE_PARAMETER, TYPE_USE}) @interface Ann {}
-
-@Target({CONSTRUCTOR, FIELD, METHOD, PARAMETER, TYPE, TYPE_PARAMETER, TYPE_USE}) @interface Ann2 {}
-
-@interface Ann3 {}
-
-@interface Ann4 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck3.java
deleted file mode 100644
index 671792d1317..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheck3.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-AnnotationOnSameLine
-tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
-         VARIABLE_DEF, PARAMETER_DEF, ANNOTATION_DEF, TYPECAST, LITERAL_THROWS, \
-         IMPLEMENTS_CLAUSE, TYPE_ARGUMENT, LITERAL_NEW, DOT, ANNOTATION_FIELD_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
-
-public class InputAnnotationOnSameLineCheck3 {
-
-    @Annotation3 int x;     // ok
-
-    int y;
-
-    @Annotation3            // violation
-    @SomeClass2.Annotation  // violation
-    @java.lang.Deprecated   // violation
-    public int getX() {
-        return (int) x;
-    }
-
-    @Annotation4 @Annotation3  // violation
-    public int field;
-
-    public
-    @Annotation3 int field2; // ok
-}
-
-class SomeClass2 {
-
-    @interface Annotation {}
-}
-
-@interface Annotation3 {}
-@interface Annotation4 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckInterfaceAndEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckInterfaceAndEnum.java
new file mode 100644
index 00000000000..16a9a76af55
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckInterfaceAndEnum.java
@@ -0,0 +1,64 @@
+/*
+AnnotationOnSameLine
+tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
+         VARIABLE_DEF, PARAMETER_DEF, ANNOTATION_DEF, TYPECAST, LITERAL_THROWS, \
+         IMPLEMENTS_CLAUSE, TYPE_ARGUMENT, LITERAL_NEW, DOT, ANNOTATION_FIELD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
+
+import java.util.List;
+
+@Ann        // violation
+@Ann2 interface TestInterface {
+
+    @Ann    // violation
+    @Ann2 Integer getX();
+}
+
+public @Ann     // violation
+@Ann2 class InputAnnotationOnSameLineCheckInterfaceAndEnum implements @Ann     // violation
+        @Ann2 TestInterface {
+
+    @Ann        // violation
+    @Ann2 private Integer x = new @Ann      // violation
+            @Ann2 Integer(0);
+
+    private List<@Ann       // violation
+            @Ann2 Integer> integerList;
+
+    @Ann        // violation
+    @Ann2 enum TestEnum {
+        A1, A2
+    }
+
+    @Ann        // violation
+    @Ann2 public InputAnnotationOnSameLineCheckInterfaceAndEnum() {}
+
+    @Ann        // violation
+    @Ann2 public void setX(@Ann             // violation
+            @Ann2 int x) throws @Ann        // violation
+                    @Ann2 Exception {
+        this.<@Ann                          // violation
+                @Ann2 Integer> getXAs();
+        this.x = x;
+    }
+
+    @Override public Integer getX() {
+        return (@Ann                        // violation
+                @Ann2 Integer) x;
+    }
+
+    public <T> T getXAs() {
+        return (T) x;
+    }
+}
+
+@Ann        // violation
+@Ann2 @interface TestAnnotation {
+
+    @Ann    // violation
+    @Ann2 int x();
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckOnDifferentTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckOnDifferentTokens.java
deleted file mode 100644
index 881d8e291bb..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckOnDifferentTokens.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-AnnotationOnSameLine
-tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
-         VARIABLE_DEF, PARAMETER_DEF, ANNOTATION_DEF, TYPECAST, LITERAL_THROWS, \
-         IMPLEMENTS_CLAUSE, TYPE_ARGUMENT, LITERAL_NEW, DOT, ANNOTATION_FIELD_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
-
-import java.util.List;
-
-@Ann        // violation
-@Ann2 interface TestInterface {
-
-    @Ann    // violation
-    @Ann2 Integer getX();
-}
-
-public @Ann     // violation
-@Ann2 class InputAnnotationOnSameLineCheckOnDifferentTokens implements @Ann     // violation
-        @Ann2 TestInterface {
-
-    @Ann        // violation
-    @Ann2 private Integer x = new @Ann      // violation
-            @Ann2 Integer(0);
-
-    private List<@Ann       // violation
-            @Ann2 Integer> integerList;
-
-    @Ann        // violation
-    @Ann2 enum TestEnum {
-        A1, A2
-    }
-
-    @Ann        // violation
-    @Ann2 public InputAnnotationOnSameLineCheckOnDifferentTokens() {}
-
-    @Ann        // violation
-    @Ann2 public void setX(@Ann             // violation
-            @Ann2 int x) throws @Ann        // violation
-                    @Ann2 Exception {
-        this.<@Ann                          // violation
-                @Ann2 Integer> getXAs();
-        this.x = x;
-    }
-
-    @Override public Integer getX() {
-        return (@Ann                        // violation
-                @Ann2 Integer) x;
-    }
-
-    public <T> T getXAs() {
-        return (T) x;
-    }
-}
-
-@Ann        // violation
-@Ann2 @interface TestAnnotation {
-
-    @Ann    // violation
-    @Ann2 int x();
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckPrivateAndDeprecatedVar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckPrivateAndDeprecatedVar.java
new file mode 100644
index 00000000000..850b3645680
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckPrivateAndDeprecatedVar.java
@@ -0,0 +1,41 @@
+/*
+AnnotationOnSameLine
+tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
+         VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
+
+import static java.lang.annotation.ElementType.*;
+
+import java.lang.annotation.Target;
+import java.util.List;
+import java.util.ArrayList;
+
+public class InputAnnotationOnSameLineCheckPrivateAndDeprecatedVar {
+
+    @Ann        // violation
+    private List<String> names = new ArrayList<>();
+
+    @Ann private List<String> names2 = new ArrayList<>();
+
+    @SuppressWarnings("deprecation")        // violation
+    @Ann Integer x;
+
+    @SuppressWarnings("deprecation")        // violation
+    @Ann                                    // violation
+    Integer x2;
+
+    @SuppressWarnings("deprecation") @Ann @Ann2 @Ann3 @Ann4 Integer x3;
+
+}
+
+@Target({CONSTRUCTOR, FIELD, METHOD, PARAMETER, TYPE, TYPE_PARAMETER, TYPE_USE}) @interface Ann {}
+
+@Target({CONSTRUCTOR, FIELD, METHOD, PARAMETER, TYPE, TYPE_PARAMETER, TYPE_USE}) @interface Ann2 {}
+
+@interface Ann3 {}
+
+@interface Ann4 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckPublicMethodAndVariable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckPublicMethodAndVariable.java
new file mode 100644
index 00000000000..ec3580b1874
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckPublicMethodAndVariable.java
@@ -0,0 +1,37 @@
+/*
+AnnotationOnSameLine
+tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
+         VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
+
+public class InputAnnotationOnSameLineCheckPublicMethodAndVariable {
+
+    @Annotation int x;
+
+    int y;
+
+    @Annotation             // violation
+    @SomeClass.Annotation   // violation
+    @java.lang.Deprecated   // violation
+    public int getX() {
+        return (int) x;
+    }
+
+    @Annotation2 @Annotation    // violation
+    public int field;
+
+    public
+    @Annotation int field2;
+}
+
+class SomeClass {
+
+    @interface Annotation {}
+}
+
+@interface Annotation {}
+@interface Annotation2 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckTokensOnMethodAndVar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckTokensOnMethodAndVar.java
new file mode 100644
index 00000000000..5061bb1e615
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/InputAnnotationOnSameLineCheckTokensOnMethodAndVar.java
@@ -0,0 +1,38 @@
+/*
+AnnotationOnSameLine
+tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
+         VARIABLE_DEF, PARAMETER_DEF, ANNOTATION_DEF, TYPECAST, LITERAL_THROWS, \
+         IMPLEMENTS_CLAUSE, TYPE_ARGUMENT, LITERAL_NEW, DOT, ANNOTATION_FIELD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
+
+public class InputAnnotationOnSameLineCheckTokensOnMethodAndVar {
+
+    @Annotation3 int x;
+
+    int y;
+
+    @Annotation3            // violation
+    @SomeClass2.Annotation  // violation
+    @java.lang.Deprecated   // violation
+    public int getX() {
+        return (int) x;
+    }
+
+    @Annotation4 @Annotation3  // violation
+    public int field;
+
+    public
+    @Annotation3 int field2;
+}
+
+class SomeClass2 {
+
+    @interface Annotation {}
+}
+
+@interface Annotation3 {}
+@interface Annotation4 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyle.java
index 086fc35f55f..d778ad1883c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyle.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyle.java
@@ -10,7 +10,7 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @interface InputAnnotationUseStyle {
-    @Another32(value={"foo", "bar"}) //expanded // ok
+    @Another32(value={"foo", "bar"}) //expanded
     DOGS[] pooches();
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompact.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompact.java
index 19c9298d396..8b48bcd817d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompact.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompact.java
@@ -10,14 +10,14 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""})
 public class InputAnnotationUseStyleCompact
 {
 
 }
 
-@SomeArrays(pooches={DOGS.LEO}, um={}, duh={"bleh"})
+@SomeArraysDiffStyle(pooches={DOGS.LEO}, um={}, duh={"bleh"})
 @SuppressWarnings("") //compact_no_array
 @Deprecated()
 class Dep5 {
@@ -25,12 +25,12 @@ class Dep5 {
 }
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""})
 enum SON5 {
 
     @Deprecated
-    @SomeArrays(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
+    @SomeArraysDiffStyle(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
     @APooch(dog=DOGS.HERBIE)
     @Another("") //compact_no_array
     ETHAN
@@ -68,7 +68,7 @@ enum E5 {
     String value1() default "";
 }
 
-@SomeArrays(pooches = {})
+@SomeArraysDiffStyle(pooches = {})
 @Another({})
 class Closing5 {
     static final String UN_U = "UN_U";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompactNoArray.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompactNoArray.java
index 3125ce65ba9..5cdcf1c0a0b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompactNoArray.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCompactNoArray.java
@@ -10,7 +10,7 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
+@SomeArraysDiffStyle(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
 @SuppressWarnings({""}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
 public class InputAnnotationUseStyleCompactNoArray
 {
@@ -18,7 +18,7 @@ public class InputAnnotationUseStyleCompactNoArray
 }
 
 // violation below 'Annotation style must be 'COMPACT_NO_ARRAY''
-@SomeArrays(pooches={DOGS.LEO},um={}, duh={"bleh"})
+@SomeArraysDiffStyle(pooches={DOGS.LEO},um={}, duh={"bleh"})
 @SuppressWarnings("") //compact_no_array
 @Deprecated()
 class Dep6 {
@@ -26,13 +26,13 @@ class Dep6 {
 }
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
+@SomeArraysDiffStyle(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
 @SuppressWarnings({""}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
 enum SON6 {
 
     @Deprecated
     // violation below 'Annotation style must be 'COMPACT_NO_ARRAY''
-    @SomeArrays(pooches={DOGS.LEO},um={""}, duh={"bleh"})
+    @SomeArraysDiffStyle(pooches={DOGS.LEO},um={""}, duh={"bleh"})
     @APooch(dog=DOGS.HERBIE)
     @Another("") //compact_no_array
     ETHAN
@@ -70,7 +70,7 @@ enum E6 {
     String value1() default "";
 }
 
-@SomeArrays(pooches = {})
+@SomeArraysDiffStyle(pooches = {})
 @Another({})
 class Closing6 {
     static final String UN_U = "UN_U";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleDifferentStyles.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleDifferentStyles.java
index d073e8d81b5..8fb76d39edb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleDifferentStyles.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleDifferentStyles.java
@@ -10,7 +10,7 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
+@SomeArraysDiffStyle(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
 @SuppressWarnings({""}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
 public class InputAnnotationUseStyleDifferentStyles
 {
@@ -18,7 +18,7 @@ public class InputAnnotationUseStyleDifferentStyles
 }
 
 // violation below 'Annotation style must be 'COMPACT_NO_ARRAY''
-@SomeArrays(pooches={DOGS.LEO},um={}, duh={"bleh"})
+@SomeArraysDiffStyle(pooches={DOGS.LEO},um={}, duh={"bleh"})
 @SuppressWarnings("") //compact_no_array
 @Deprecated() // violation 'Annotation cannot have closing parenthesis'
 class Dep {
@@ -26,13 +26,13 @@ class Dep {
 }
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY'
+@SomeArraysDiffStyle(pooches={DOGS.LEO}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY'
 @SuppressWarnings({""}) // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
 enum SON {
 
     @Deprecated
     // violation below 'Annotation style must be 'COMPACT_NO_ARRAY''
-    @SomeArrays(pooches={DOGS.LEO},um={""}, duh={"bleh"})
+    @SomeArraysDiffStyle(pooches={DOGS.LEO},um={""}, duh={"bleh"})
     @APooch(dog=DOGS.HERBIE)
     @Another("") //compact_no_array
     ETHAN
@@ -47,7 +47,7 @@ enum DOGS {
     HERBIE
 }
 
-@interface SomeArrays {
+@interface SomeArraysDiffStyle {
     @Another("") //compact
     String[] um() default {};
     @Another({""}) //compact // violation 'Annotation style must be 'COMPACT_NO_ARRAY''
@@ -71,7 +71,7 @@ enum E {
     String value1() default "";
 }
 
-@SomeArrays(pooches = {})
+@SomeArraysDiffStyle(pooches = {})
 @Another({})
 class Closing {
     static final String UN_U = "UN_U";
@@ -81,15 +81,15 @@ class Closing {
 }
 
 @AnnotationWithAnnotationValue(@Another)
-class Example1 {}
+class ExampleA {}
 @AnnotationWithAnnotationValue(value = @Another)
-class Example2 {}
+class ExampleB {}
 // violation below 'Annotation cannot have closing parenthesis'
 @AnnotationWithAnnotationValue(@Another())
-class Example3 {}
+class ExampleC {}
 // violation below 'Annotation cannot have closing parenthesis'
 @AnnotationWithAnnotationValue(value = @Another())
-class Example4 {}
+class ExampleD {}
 
 class Foo {
    Foo(@Another String par1, @Another int par2) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleEverythingMixed.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleEverythingMixed.java
index 2f5e8eeac30..fb6d5cf6e69 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleEverythingMixed.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleEverythingMixed.java
@@ -9,51 +9,51 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
-@Deprecated // ok
-@SomeArrays(pooches={DOGS.LEO}) // ok
-@SuppressWarnings({""}) // ok
+@Deprecated
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
+@SuppressWarnings({""})
 public class InputAnnotationUseStyleEverythingMixed
 {
 
 }
 
-@SomeArrays(pooches={DOGS.LEO}, um={}, duh={"bleh"}) // ok
-@SuppressWarnings("") //compact_no_array // ok
-@Deprecated() // ok
+@SomeArraysDiffStyle(pooches={DOGS.LEO}, um={}, duh={"bleh"})
+@SuppressWarnings("") //compact_no_array
+@Deprecated()
 class Dep7 {
 
 }
 
-@Deprecated // ok
-@SomeArrays(pooches={DOGS.LEO}) // ok
-@SuppressWarnings({""}) // ok
+@Deprecated
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
+@SuppressWarnings({""})
 enum SON7 {
 
-    @Deprecated // ok
-    @SomeArrays(pooches={DOGS.LEO}, um={""}, duh={"bleh"}) // ok
-    @APooch(dog=DOGS.HERBIE) // ok
-    @Another("") //compact_no_array // ok
+    @Deprecated
+    @SomeArraysDiffStyle(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
+    @APooch(dog=DOGS.HERBIE)
+    @Another("") //compact_no_array
     ETHAN
 }
 
-@InputAnnotationUseStyleCustomAnnotation4() // ok
+@InputAnnotationUseStyleCustomAnnotation4()
 enum DOGS7 {
 
-    @Deprecated() // ok
+    @Deprecated()
     LEO,
     HERBIE
 }
 
 @interface SomeArrays7 {
-    @Another("") //compact // ok
+    @Another("") //compact
     String[] um() default {};
-    @Another({""}) //compact // ok
+    @Another({""}) //compact
     String[] duh() default {};
-    @Another(value={""}) //expanded // ok
+    @Another(value={""}) //expanded
     DOGS[] pooches();
 }
 
-@Another(value={""}) //expanded // ok
+@Another(value={""}) //expanded
 enum E7 {
 
 }
@@ -64,30 +64,30 @@ enum E7 {
 
 @interface Another7 {
     String[] value() default {};
-    @Another({"foo", "bar"}) //compact style // ok
+    @Another({"foo", "bar"}) //compact style
     String value1() default "";
 }
 
-@SomeArrays(pooches = {}) // ok
-@Another({}) // ok
+@SomeArraysDiffStyle(pooches = {})
+@Another({})
 class Closing7 {
     static final String UN_U = "UN_U";
 
-    @SuppressWarnings(value = UN_U) // ok
+    @SuppressWarnings(value = UN_U)
     int d;
 }
 
-@AnnotationWithAnnotationValue(@Another) // ok
+@AnnotationWithAnnotationValue(@Another)
 class Example25 {}
-@AnnotationWithAnnotationValue(value = @Another) // ok
+@AnnotationWithAnnotationValue(value = @Another)
 class Example26 {}
-@AnnotationWithAnnotationValue(@Another()) // ok
+@AnnotationWithAnnotationValue(@Another())
 class Example27 {}
-@AnnotationWithAnnotationValue(value = @Another()) // ok
+@AnnotationWithAnnotationValue(value = @Another())
 class Example28 {}
 
 class Foo7 {
-   Foo7(@Another String par1, @Another int par2) {} // ok
+   Foo7(@Another String par1, @Another int par2) {}
 }
 
 @interface AnnotationWithAnnotationValue7 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleExpanded.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleExpanded.java
index 9280505d4b1..a45d3c353ad 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleExpanded.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleExpanded.java
@@ -10,14 +10,14 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""}) // violation 'Annotation style must be 'EXPANDED''
 public class InputAnnotationUseStyleExpanded
 {
 
 }
 
-@SomeArrays(pooches={DOGS.LEO}, um={}, duh={"bleh"})
+@SomeArraysDiffStyle(pooches={DOGS.LEO}, um={}, duh={"bleh"})
 @SuppressWarnings("") //compact_no_array // violation 'Annotation style must be 'EXPANDED''
 @Deprecated()
 class Dep4 {
@@ -25,12 +25,12 @@ class Dep4 {
 }
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""}) // violation 'Annotation style must be 'EXPANDED''
 enum SON4 {
 
     @Deprecated
-    @SomeArrays(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
+    @SomeArraysDiffStyle(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
     @APooch(dog=DOGS.HERBIE)
     @Another("") //compact_no_array // violation 'Annotation style must be 'EXPANDED''
     ETHAN
@@ -68,7 +68,7 @@ enum E4 {
     String value1() default "";
 }
 
-@SomeArrays(pooches = {})
+@SomeArraysDiffStyle(pooches = {})
 @Another({}) // violation 'Annotation style must be 'EXPANDED''
 class Closing4 {
     static final String UN_U = "UN_U";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoParens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoParens.java
index 5cae7b2a518..cd1df981f1c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoParens.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoParens.java
@@ -10,14 +10,14 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""})
 public class InputAnnotationUseStyleNoParens
 {
 
 }
 
-@SomeArrays(pooches={DOGS.LEO}, um={}, duh={"bleh"})
+@SomeArraysDiffStyle(pooches={DOGS.LEO}, um={}, duh={"bleh"})
 @SuppressWarnings("") //compact_no_array
 @Deprecated() // violation 'Annotation cannot have closing parenthesis'
 class Dep3 {
@@ -25,12 +25,12 @@ class Dep3 {
 }
 
 @Deprecated
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""})
 enum SON3 {
 
     @Deprecated
-    @SomeArrays(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
+    @SomeArraysDiffStyle(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
     @APooch(dog=DOGS.HERBIE)
     @Another("") //compact_no_array
     ETHAN
@@ -69,7 +69,7 @@ enum E3 {
     String value1() default "";
 }
 
-@SomeArrays(pooches = {})
+@SomeArraysDiffStyle(pooches = {})
 @Another({})
 class Closing3 {
     static final String UN_U = "UN_U";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoTrailingCommaNever.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoTrailingCommaNever.java
index cf42c89912a..f1e9bd7a4e5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoTrailingCommaNever.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleNoTrailingCommaNever.java
@@ -9,20 +9,20 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
-@SuppressWarnings({}) // ok
+@SuppressWarnings({})
 public class InputAnnotationUseStyleNoTrailingCommaNever
 {
-  @SuppressWarnings({"common"}) // ok
+  @SuppressWarnings({"common"})
   public void foo() {
 
       /** Suppress warnings */
-      @SuppressWarnings({"common","foo"}) // ok
+      @SuppressWarnings({"common","foo"})
       Object o = new Object() {
 
-          @SuppressWarnings(value={"common"}) // ok
+          @SuppressWarnings(value={"common"})
           public String toString() {
 
-              @SuppressWarnings(value={"leo","herbie"}) // ok
+              @SuppressWarnings(value={"leo","herbie"})
               final String pooches = "leo.herbie";
 
               return pooches;
@@ -30,15 +30,15 @@ public String toString() {
       };
   }
 
-  @Test5(value={"foo"}, more={"bar"}) // ok
+  @Test5(value={"foo"}, more={"bar"})
 
-  @Pooches5(tokens={},other={}) // ok
+  @Pooches5(tokens={},other={})
   enum P {
 
-      @Pooches5(tokens={Pooches5.class},other={1}) // ok
+      @Pooches5(tokens={Pooches5.class},other={1})
       L, // annotation in enum
 
-      @Test5(value={}, more={"unchecked"}) // ok
+      @Test5(value={}, more={"unchecked"})
       Y;
   }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleParams.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleParams.java
index 5e26150e92c..403f217c176 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleParams.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleParams.java
@@ -14,7 +14,7 @@
 
 public class InputAnnotationUseStyleParams
 {
-    @Target({}) // ok
+    @Target({})
     public @interface myAnn {
 
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithParens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithParens.java
index a58f408de18..c4134b7e05c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithParens.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithParens.java
@@ -10,14 +10,14 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @Deprecated // violation 'Annotation must have closing parenthesis'
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""})
 public class InputAnnotationUseStyleWithParens
 {
 
 }
 
-@SomeArrays(pooches={DOGS.LEO}, um={}, duh={"bleh"})
+@SomeArraysDiffStyle(pooches={DOGS.LEO}, um={}, duh={"bleh"})
 @SuppressWarnings("") //compact_no_array
 @Deprecated()
 class Dep2 {
@@ -25,12 +25,12 @@ class Dep2 {
 }
 
 @Deprecated // violation 'Annotation must have closing parenthesis'
-@SomeArrays(pooches={DOGS.LEO})
+@SomeArraysDiffStyle(pooches={DOGS.LEO})
 @SuppressWarnings({""})
 enum SON2 {
 
     @Deprecated // violation 'Annotation must have closing parenthesis'
-    @SomeArrays(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
+    @SomeArraysDiffStyle(pooches={DOGS.LEO}, um={""}, duh={"bleh"})
     @APooch(dog=DOGS.HERBIE)
     @Another("") //compact_no_array
     ETHAN
@@ -68,7 +68,7 @@ enum E2 {
     String value1() default "";
 }
 
-@SomeArrays(pooches = {})
+@SomeArraysDiffStyle(pooches = {})
 @Another({})
 class Closing2 {
     static final String UN_U = "UN_U";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java
index 9c6eeafef12..ae80c14cbac 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleWithTrailingComma.java
@@ -8,43 +8,28 @@
 */
 
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
-//this file compiles in eclipse 3.4 but not with Sun's JDK 1.6.0.11
 
-public class InputAnnotationUseStyleWithTrailingComma
-{
-    @SuppressWarnings({"common",}) // ok
+public class InputAnnotationUseStyleWithTrailingComma {
+    @SuppressWarnings({"common",})
     public void foo() {
-
-
-        @SuppressWarnings({"common","foo",}) // ok
+        @SuppressWarnings({"common","foo",})
         Object o = new Object() {
-
-            @SuppressWarnings(value={"common",}) // ok
+            @SuppressWarnings(value={"common",})
             public String toString() {
-
-                @SuppressWarnings(value={"leo","herbie",}) // ok
+                @SuppressWarnings(value={"leo","herbie",})
                 final String pooches = "leo.herbie";
-
                 return pooches;
             }
         };
     }
 
-    @Test(value={"foo",}, more={"bar",}) // ok
-    /**
-
-    */
+    @Test(value={"foo",}, more={"bar",})
     enum P {
-
-        @Pooches(tokens={Pooches.class,},other={1,}) // ok
+        @Pooches(tokens={Pooches.class,},other={1,})
         L,
 
-        /**
-
-        */
         Y;
     }
-
 }
 
 @interface Test {
@@ -53,7 +38,6 @@ enum P {
 }
 
 @interface Pooches {
-
     Class<?>[] tokens();
     int[] other();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedGood.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedGood.java
index 001dc80b3bc..1c099f87e28 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedGood.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedGood.java
@@ -12,7 +12,7 @@
  * bleh
  */
 @Deprecated
-public class InputMissingDeprecatedGood // ok
+public class InputMissingDeprecatedGood
 {
     /**
      * @deprecated           bleh
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedSingleComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedSingleComment.java
index 5b6c6f5b585..e602fd62824 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedSingleComment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedSingleComment.java
@@ -16,5 +16,5 @@
  * @deprecated do not use
  */
 @Deprecated
-class InputMissingDeprecatedSingleComment { // ok
+class InputMissingDeprecatedSingleComment {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadAnnotationJava5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadAnnotationJava5.java
index 9dac18b4f5c..149a2fab33b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadAnnotationJava5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadAnnotationJava5.java
@@ -14,13 +14,13 @@ public class InputMissingOverrideBadAnnotationJava5
         /**
          * {@inheritDoc}
          */
-        public void run() {     // ok
+        public void run() {
             Throwable t = new Throwable() {
 
                 /**
                  * {@inheritDoc}
                  */
-                public String toString() {      // ok
+                public String toString() {
                     return "junk";
                 }
             };
@@ -33,13 +33,13 @@ void doFoo(Runnable r) {
             /**
              * {@inheritDoc}
              */
-            public void run() {     // ok
+            public void run() {
                 Throwable t = new Throwable() {
 
                     /**
                      * {@inheritDoc}
                      */
-                    public String toString() {      // ok
+                    public String toString() {
                         return "junk";
                     }
                 };
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadOverrideFromOtherJava5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadOverrideFromOtherJava5.java
index 4898778a3c0..51ff0413d5b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadOverrideFromOtherJava5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideBadOverrideFromOtherJava5.java
@@ -14,7 +14,7 @@ public class InputMissingOverrideBadOverrideFromOtherJava5 implements IFoo2Java5
     /**
      * {@inheritDoc}
      */
-    public void doFoo() {} // ok
+    public void doFoo() {}
 
     public void doFoo2() {}
 
@@ -30,7 +30,7 @@ interface IBar2Java5 extends IFoo2Java5 {
     /**
      * {@inheritDoc}
      */
-    public void doFoo(); // ok
+    public void doFoo();
 }
 
 class MoreJunk2Java5 extends InputMissingOverrideBadOverrideFromOtherJava5 {
@@ -38,24 +38,24 @@ class MoreJunk2Java5 extends InputMissingOverrideBadOverrideFromOtherJava5 {
     /**
      * {@inheritDoc}
      */
-    public void doFoo() {} // ok
+    public void doFoo() {}
 
     /**
      * {@inheritDoc}
      */
-    public void doFoo2() {} // ok
+    public void doFoo2() {}
 
     class EvenMoreJunk2 extends MoreJunk2Java5 implements Serializable {
 
         /**
          * {@inheritDoc}
          */
-        public void doFoo() {} // ok
+        public void doFoo() {}
 
         /**
          * {@inheritDoc}
          */
-        public void doFoo2() {} // ok
+        public void doFoo2() {}
     }
 }
 
@@ -65,5 +65,5 @@ enum Football2Java5 implements IFoo2Java5, IBar2Java5 {
     /**
      * {@inheritDoc}
      */
-    public void doFoo() {} // ok
+    public void doFoo() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverride.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverride.java
index 15a794dae1b..7d05a315f44 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverride.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverride.java
@@ -17,7 +17,7 @@ public void run() {
                 /**
                  * {@inheritDoc}
                  */
-                @Override       // ok
+                @Override
                 public String toString() {
                     return "junk";
                 }
@@ -34,7 +34,7 @@ public void run() {
                     /**
                      * {@inheritDoc}
                      */
-                    @Override       // ok
+                    @Override
                     public String toString() {
                         return "junk";
                     }
@@ -52,7 +52,7 @@ public void run() {
                     /**
                      * {@inheritDoc}
                      */
-                    @java.lang.Override     // ok
+                    @java.lang.Override
                     public String toString() {
                         return "junk";
                     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObject.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObject.java
index eabb5b59f2c..7c081333714 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObject.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObject.java
@@ -12,7 +12,7 @@ public class InputMissingOverrideGoodOverrideFromObject
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public boolean equals(Object obj) {
         return false;
     }
@@ -24,7 +24,7 @@ public boolean equals(Object obj) {
      *
      * {@inheritDoc
      */
-    @Override       // ok
+    @Override
     public int hashCode() {
         return 1;
     }
@@ -34,7 +34,7 @@ class Junk {
         /**
          * {@inheritDoc}
          */
-        @Override       // ok
+        @Override
         protected void finalize() throws Throwable {}
     }
 }
@@ -44,7 +44,7 @@ interface HashEq {
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public int hashCode();
 }
 
@@ -54,7 +54,7 @@ enum enum1 {
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public String toString() {
         return "B";
     }
@@ -66,7 +66,7 @@ enum enum2 {
     /**
      * {@inheritDoc}
      */
-    @java.lang.Override     // ok
+    @java.lang.Override
     public String toString() {
         return "B";
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObjectJava5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObjectJava5.java
index be3be654f4f..7802e792a43 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObjectJava5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromObjectJava5.java
@@ -12,7 +12,7 @@ public class InputMissingOverrideGoodOverrideFromObjectJava5
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public boolean equals(Object obj) {
         return false;
     }
@@ -24,7 +24,7 @@ public boolean equals(Object obj) {
      *
      * {@inheritDoc
      */
-    @Override       // ok
+    @Override
     public int hashCode() {
         return 1;
     }
@@ -34,7 +34,7 @@ class Junk {
         /**
          * {@inheritDoc}
          */
-        @Override       // ok
+        @Override
         protected void finalize() throws Throwable {}
     }
 }
@@ -44,7 +44,7 @@ interface HashEqJava5 {
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public int hashCode();
 }
 
@@ -54,7 +54,7 @@ enum enum1Java5 {
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public String toString() {
         return "B";
     }
@@ -66,7 +66,7 @@ enum enum2Java5 {
     /**
      * {@inheritDoc}
      */
-    @java.lang.Override     // ok
+    @java.lang.Override
     public String toString() {
         return "B";
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOther.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOther.java
index 54094d04124..0b462aee23d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOther.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOther.java
@@ -32,13 +32,13 @@ class MoreJunk1 extends InputMissingOverrideGoodOverrideFromOther {
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public void doFoo() {}
 
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public void doFoo2() {}
 
     class EvenMoreJunk extends MoreJunk1 implements Serializable {
@@ -46,13 +46,13 @@ class EvenMoreJunk extends MoreJunk1 implements Serializable {
         /**
          * {@inheritDoc}
          */
-        @Override       // ok
+        @Override
         public void doFoo() {}
 
         /**
          * {@inheritDoc}
          */
-        @Override       // ok
+        @Override
         public void doFoo2() {}
     }
 
@@ -61,13 +61,13 @@ class EvenMoreMoreJunk extends MoreJunk1 implements Serializable {
         /**
          * {@inheritDoc}
          */
-        @java.lang.Override     // ok
+        @java.lang.Override
         public void doFoo() {}
 
         /**
          * {@inheritDoc}
          */
-        @java.lang.Override     // ok
+        @java.lang.Override
         public void doFoo2() {}
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOtherJava5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOtherJava5.java
index 4e8b822c3bf..677ba49cf4a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOtherJava5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideFromOtherJava5.java
@@ -32,13 +32,13 @@ class MoreJunk1Java5 extends InputMissingOverrideGoodOverrideFromOtherJava5 {
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public void doFoo() {}
 
     /**
      * {@inheritDoc}
      */
-    @Override       // ok
+    @Override
     public void doFoo2() {}
 
     class EvenMoreJunk extends MoreJunk1Java5 implements Serializable {
@@ -46,13 +46,13 @@ class EvenMoreJunk extends MoreJunk1Java5 implements Serializable {
         /**
          * {@inheritDoc}
          */
-        @Override       // ok
+        @Override
         public void doFoo() {}
 
         /**
          * {@inheritDoc}
          */
-        @Override       // ok
+        @Override
         public void doFoo2() {}
     }
 
@@ -61,13 +61,13 @@ class EvenMoreMoreJunk extends MoreJunk1Java5 implements Serializable {
         /**
          * {@inheritDoc}
          */
-        @java.lang.Override     // ok
+        @java.lang.Override
         public void doFoo() {}
 
         /**
          * {@inheritDoc}
          */
-        @java.lang.Override     // ok
+        @java.lang.Override
         public void doFoo2() {}
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideJava5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideJava5.java
index 3293b4f2933..90e906b1f35 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideJava5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideGoodOverrideJava5.java
@@ -17,7 +17,7 @@ public void run() {
                 /**
                  * {@inheritDoc}
                  */
-                @Override       // ok
+                @Override
                 public String toString() {
                     return "junk";
                 }
@@ -34,7 +34,7 @@ public void run() {
                     /**
                      * {@inheritDoc}
                      */
-                    @Override       // ok
+                    @Override
                     public String toString() {
                         return "junk";
                     }
@@ -52,7 +52,7 @@ public void run() {
                     /**
                      * {@inheritDoc}
                      */
-                    @java.lang.Override     // ok
+                    @java.lang.Override
                     public String toString() {
                         return "junk";
                     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideNotOverride.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideNotOverride.java
index 1e93039db30..b9f65250cec 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideNotOverride.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/InputMissingOverrideNotOverride.java
@@ -22,7 +22,7 @@ public static void eh() {} // violation 'Javadoc {@inheritDoc} tag is not valid
   /**
    * {@inheritDoc}
    */
-  public String junk = "";        // ok
+  public String junk = "";
 
   void dodoo() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/InputPackageAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/InputPackageAnnotation.java
index b594797ca0f..6518c5fde24 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/InputPackageAnnotation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/InputPackageAnnotation.java
@@ -7,6 +7,6 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation;
 
 @Deprecated
-public class InputPackageAnnotation { // ok
+public class InputPackageAnnotation {
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsConstants.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsConstants.java
index f351199ccf2..edef9ee5b45 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsConstants.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsConstants.java
@@ -18,9 +18,9 @@ public class InputSuppressWarningsConstants
     public static final String UNCHECKED = "unchecked";
 
     public static void test() {
-        @SuppressWarnings(UNCHECKED) // ok
+        @SuppressWarnings(UNCHECKED)
         final List<String> dummyOne = (List<String>) new ArrayList();
-        @SuppressWarnings(InputSuppressWarningsConstants.UNCHECKED) // ok
+        @SuppressWarnings(InputSuppressWarningsConstants.UNCHECKED)
         final List<String> dummyTwo = (List<String>) new ArrayList();
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsValuePair.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsValuePair.java
index b27cd2959e1..67f7498fef6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsValuePair.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/InputSuppressWarningsValuePair.java
@@ -18,7 +18,7 @@ public class InputSuppressWarningsValuePair
     public static final String UNCHECKED = "unchecked";
 
     public static void test() {
-        @SuppressWarnings(value = UNCHECKED) // ok
+        @SuppressWarnings(value = UNCHECKED)
         final List<String> dummyOne = (List<String>) new ArrayList();
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/InputArrayTypeStyleNestedGenerics.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/InputArrayTypeStyleNestedGenerics.java
index 5b30ba377f8..f8072f5185f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/InputArrayTypeStyleNestedGenerics.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/InputArrayTypeStyleNestedGenerics.java
@@ -8,9 +8,9 @@
 package com.puppycrawl.tools.checkstyle.checks.arraytypestyle;
 
 public class InputArrayTypeStyleNestedGenerics {
-    protected Pair<Integer, Object>[] values1; // ok
-    protected Pair<Integer, Pair<String, Object>[]>[] values2; // ok
-    protected Pair<Integer, Pair<String, Pair<String, Object>>[]>[] values3a; // ok
+    protected Pair<Integer, Object>[] values1;
+    protected Pair<Integer, Pair<String, Object>[]>[] values2;
+    protected Pair<Integer, Pair<String, Pair<String, Object>>[]>[] values3a;
     protected Pair<
         Integer,
         Pair<
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java
index 655336f5ca8..1ecd976444b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters.java
@@ -13,38 +13,38 @@
 public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
 
   private String[] allEscapedUnicodeCharacters = { ""
-                                                   + "\u0000" // ok
-                                                   + "\u0001" // ok
-                                                   + "\u0002" // ok
-                                                   + "\u0003" // ok
-                                                   + "\u0004" // ok
-                                                   + "\u0005" // ok
-                                                   + "\u0006" // ok
-                                                   + "\u0007" // ok
-                                                   + "\u0008" // ok
-                                                   + "\u0009" // ok
+                                                   + "\u0000"
+                                                   + "\u0001"
+                                                   + "\u0002"
+                                                   + "\u0003"
+                                                   + "\u0004"
+                                                   + "\u0005"
+                                                   + "\u0006"
+                                                   + "\u0007"
+                                                   + "\u0008"
+                                                   + "\u0009"
       /* impossible to use this unicode in Java */ + "\n"
-                                                   + "\u000b" // ok
-                                                   + "\u000c" // ok
+                                                   + "\u000b"
+                                                   + "\u000c"
       /* impossible to use this unicode in Java */ + "\r"
-                                                   + "\u000e" // ok
-                                                   + "\u000f" // ok
-                                                   + "\u0010" // ok
-                                                   + "\u0011" // ok
-                                                   + "\u0012" // ok
-                                                   + "\u0013" // ok
-                                                   + "\u0014" // ok
-                                                   + "\u0015" // ok
-                                                   + "\u0016" // ok
-                                                   + "\u0017" // ok
-                                                   + "\u0018" // ok
-                                                   + "\u0019" // ok
-                                                   + "\u001a" // ok
-                                                   + "\u001b" // ok
-                                                   + "\u001c" // ok
-                                                   + "\u001d" // ok
-                                                   + "\u001e" // ok
-                                                   + "\u001f" // ok
+                                                   + "\u000e"
+                                                   + "\u000f"
+                                                   + "\u0010"
+                                                   + "\u0011"
+                                                   + "\u0012"
+                                                   + "\u0013"
+                                                   + "\u0014"
+                                                   + "\u0015"
+                                                   + "\u0016"
+                                                   + "\u0017"
+                                                   + "\u0018"
+                                                   + "\u0019"
+                                                   + "\u001a"
+                                                   + "\u001b"
+                                                   + "\u001c"
+                                                   + "\u001d"
+                                                   + "\u001e"
+                                                   + "\u001f"
                                                    + "\u0020" // violation
                                                    + "\u0021" // violation
                                                    + "\u005c\u0022" // violation
@@ -141,38 +141,38 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u007d" // violation
                                                    + "\u007e" // violation
                                                    + "\u007f" // violation
-                                                   + "\u0080" // ok
-                                                   + "\u0081" // ok
-                                                   + "\u0082" // ok
-                                                   + "\u0083" // ok
-                                                   + "\u0084" // ok
-                                                   + "\u0085" // ok
-                                                   + "\u0086" // ok
-                                                   + "\u0087" // ok
-                                                   + "\u0088" // ok
-                                                   + "\u0089" // ok
-                                                   + "\u008a" // ok
-                                                   + "\u008b" // ok
-                                                   + "\u008c" // ok
-                                                   + "\u008d" // ok
-                                                   + "\u008e" // ok
-                                                   + "\u008f" // ok
-                                                   + "\u0090" // ok
-                                                   + "\u0091" // ok
-                                                   + "\u0092" // ok
-                                                   + "\u0093" // ok
-                                                   + "\u0094" // ok
-                                                   + "\u0095" // ok
-                                                   + "\u0096" // ok
-                                                   + "\u0097" // ok
-                                                   + "\u0098" // ok
-                                                   + "\u0099" // ok
-                                                   + "\u009a" // ok
-                                                   + "\u009b" // ok
-                                                   + "\u009c" // ok
-                                                   + "\u009d" // ok
-                                                   + "\u009e" // ok
-                                                   + "\u009f" // ok
+                                                   + "\u0080"
+                                                   + "\u0081"
+                                                   + "\u0082"
+                                                   + "\u0083"
+                                                   + "\u0084"
+                                                   + "\u0085"
+                                                   + "\u0086"
+                                                   + "\u0087"
+                                                   + "\u0088"
+                                                   + "\u0089"
+                                                   + "\u008a"
+                                                   + "\u008b"
+                                                   + "\u008c"
+                                                   + "\u008d"
+                                                   + "\u008e"
+                                                   + "\u008f"
+                                                   + "\u0090"
+                                                   + "\u0091"
+                                                   + "\u0092"
+                                                   + "\u0093"
+                                                   + "\u0094"
+                                                   + "\u0095"
+                                                   + "\u0096"
+                                                   + "\u0097"
+                                                   + "\u0098"
+                                                   + "\u0099"
+                                                   + "\u009a"
+                                                   + "\u009b"
+                                                   + "\u009c"
+                                                   + "\u009d"
+                                                   + "\u009e"
+                                                   + "\u009f"
                                                    + "\u00a0" // violation
                                                    + "\u00a1" // violation
                                                    + "\u00a2" // violation
@@ -186,7 +186,7 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u00aa" // violation
                                                    + "\u00ab" // violation
                                                    + "\u00ac" // violation
-                                                   + "\u00ad" // ok
+                                                   + "\u00ad"
                                                    + "\u00ae" // violation
                                                    + "\u00af" // violation
                                                    + "\u00b0" // violation
@@ -860,7 +860,7 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u034c" // violation
                                                    + "\u034d" // violation
                                                    + "\u034e" // violation
-                                                   + "\u034f" // ok
+                                                   + "\u034f"
                                                    + "\u0350" // violation
                                                    + "\u0351" // violation
                                                    + "\u0352" // violation
@@ -1820,7 +1820,7 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u070c" // violation
                                                    + "\u070d" // violation
                                                    + "\u070e" // violation
-                                                   + "\u070f" // ok
+                                                   + "\u070f"
                                                    + "\u0710" // violation
                                                    + "\u0711" // violation
                                                    + "\u0712" // violation
@@ -6171,7 +6171,7 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u180b" // violation
                                                    + "\u180c" // violation
                                                    + "\u180d" // violation
-                                                   + "\u180e" // ok
+                                                   + "\u180e"
                                                    + "\u180f" // violation
                                                    + "\u1810" // violation
                                                    + "\u1811" // violation
@@ -8216,11 +8216,11 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u2008" // violation
                                                    + "\u2009" // violation
                                                    + "\u200a" // violation
-                                                   + "\u200b" // ok
-                                                   + "\u200c" // ok
-                                                   + "\u200d" // ok
-                                                   + "\u200e" // ok
-                                                   + "\u200f" // ok
+                                                   + "\u200b"
+                                                   + "\u200c"
+                                                   + "\u200d"
+                                                   + "\u200e"
+                                                   + "\u200f"
                                                    + "\u2010" // violation
                                                    + "\u2011" // violation
                                                    + "\u2012" // violation
@@ -8247,11 +8247,11 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u2027" // violation
                                                    + "\u2028" // violation
                                                    + "\u2029" // violation
-                                                   + "\u202a" // ok
-                                                   + "\u202b" // ok
-                                                   + "\u202c" // ok
-                                                   + "\u202d" // ok
-                                                   + "\u202e" // ok
+                                                   + "\u202a"
+                                                   + "\u202b"
+                                                   + "\u202c"
+                                                   + "\u202d"
+                                                   + "\u202e"
                                                    + "\u202f" // violation
                                                    + "\u2030" // violation
                                                    + "\u2031" // violation
@@ -8301,22 +8301,22 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\u205d" // violation
                                                    + "\u205e" // violation
                                                    + "\u205f" // violation
-                                                   + "\u2060" // ok
-                                                   + "\u2061" // ok
-                                                   + "\u2062" // ok
-                                                   + "\u2063" // ok
-                                                   + "\u2064" // ok
+                                                   + "\u2060"
+                                                   + "\u2061"
+                                                   + "\u2062"
+                                                   + "\u2063"
+                                                   + "\u2064"
                                                    + "\u2065" // violation
                                                    + "\u2066" // violation
                                                    + "\u2067" // violation
                                                    + "\u2068" // violation
                                                    + "\u2069" // violation
-                                                   + "\u206a" // ok
-                                                   + "\u206b" // ok
-                                                   + "\u206c" // ok
-                                                   + "\u206d" // ok
-                                                   + "\u206e" // ok
-                                                   + "\u206f" // ok
+                                                   + "\u206a"
+                                                   + "\u206b"
+                                                   + "\u206c"
+                                                   + "\u206d"
+                                                   + "\u206e"
+                                                   + "\u206f"
                                                    + "\u2070" // violation
                                                    + "\u2071" // violation
                                                    + "\u2072" // violation
@@ -65292,7 +65292,7 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\ufefc" // violation
                                                    + "\ufefd" // violation
                                                    + "\ufefe" // violation
-                                                   + "\ufeff" // ok
+                                                   + "\ufeff"
                                                    + "\uff00" // violation
                                                    + "\uff01" // violation
                                                    + "\uff02" // violation
@@ -65542,9 +65542,9 @@ public class InputAvoidEscapedUnicodeCharactersAllEscapedUnicodeCharacters {
                                                    + "\ufff6" // violation
                                                    + "\ufff7" // violation
                                                    + "\ufff8" // violation
-                                                   + "\ufff9" // ok
-                                                   + "\ufffa" // ok
-                                                   + "\ufffb" // ok
+                                                   + "\ufff9"
+                                                   + "\ufffa"
+                                                   + "\ufffb"
                                                    + "\ufffc" // violation
                                                    + "\ufffd" // violation
                                                    + "\ufffe" // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksAllowInSwitchCase.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksAllowInSwitchCase.java
index ac6303af791..e1380c7dda2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksAllowInSwitchCase.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksAllowInSwitchCase.java
@@ -10,7 +10,7 @@
 class InputAvoidNestedBlocksAllowInSwitchCase
 {
     static
-    { // ok
+    {
     }
 
     public void method()
@@ -24,7 +24,7 @@ public void method()
         }
 
         if (x == 1)
-        { // ok
+        {
             x = 2;
         }
 
@@ -35,7 +35,7 @@ public void method()
         switch (x)
         {
             case 0:
-                // ok
+
                 x = 3;
                 break;
             case 1:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksDefault.java
index f087c49b21b..52475dad009 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/InputAvoidNestedBlocksDefault.java
@@ -14,7 +14,7 @@
 class InputAvoidNestedBlocksDefault
 {
     static
-    { // ok
+    {
     }
 
     public void method()
@@ -28,7 +28,7 @@ public void method()
         }
 
         if (x == 1)
-        { // ok
+        {
             x = 2;
         }
 
@@ -39,7 +39,7 @@ public void method()
         switch (x)
         {
             case 0:
-                // ok
+
                 x = 3;
                 break;
             case 1:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAnnotationDefaultKeyword.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAnnotationDefaultKeyword.java
index f1bcc0a15b4..75568f35272 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAnnotationDefaultKeyword.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAnnotationDefaultKeyword.java
@@ -9,5 +9,5 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock;
 
 public @interface InputEmptyBlockAnnotationDefaultKeyword {
-    String name() default "";   // ok
+    String name() default "";
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java
index 68c68432ab3..22f6663bdc5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java
@@ -12,7 +12,7 @@ class InputEmptyBlockCase
 {
     void method1(int a) {
         switch (a) {}
-        switch (a) {case 1: ; } // ok
+        switch (a) {case 1: ; }
         switch (a) {case 1:{}}  // violation 'Empty case block'
         switch (a) {
             case 1:
@@ -23,15 +23,15 @@ void method1(int a) {
         }
         switch (a) {
             case 1:
-            {   // ok
+            {  // ok as the block contains a comment
             }
         }
     }
 
     public void method2(char c) {
-        switch(c) { case 0: }   // ok
+        switch(c) { case 0: }
         switch(c) { case 0: {} method1(1); }    // violation 'Empty case block'
-        switch(c) { case 0: method1(0); {} }    // ok
+        switch(c) { case 0: method1(0); {} }
         switch(c) { case 0: case 1: {} }    // violation 'Empty case block'
         switch(c) { case 0: {} case 1: {    // violation 'Empty case block'
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase2.java
index 48cbaa29156..a34c07b9339 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase2.java
@@ -12,7 +12,7 @@ class InputEmptyBlockCase2
 {
     void method1(int a) {
         switch (a) {}
-        switch (a) {case 1: ; } // ok
+        switch (a) {case 1: ; }
         switch (a) {case 1:{}}  // violation 'Must have at least one statement'
         switch (a) {
             case 1:
@@ -29,9 +29,9 @@ void method1(int a) {
     }
 
     public void method2(char c) {
-        switch(c) { case 0: }   // ok
+        switch(c) { case 0: }
         switch(c) { case 0: {} method1(1); }    // violation 'Must have at least one statement'
-        switch(c) { case 0: method1(0); {} }    // ok
+        switch(c) { case 0: method1(0); {} }
         switch(c) { case 0: case 1: {} }    // violation 'Must have at least one statement'
         switch(c) { case 0: {} case 1: {    // 2 violations
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java
index 4ccf5d6b8bd..25933fc76bd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java
@@ -11,7 +11,7 @@
 public class InputEmptyBlockDefault {
     void method1(int a) {
         switch (a) {}
-        switch (a) {default: ; }    // ok
+        switch (a) {default: ; }
         switch (a) {default: {}}    // violation 'Empty default block'
         switch (a) {
             default:
@@ -22,7 +22,7 @@ void method1(int a) {
         }
         switch (a) {
             default:
-            {   // ok
+            {   // ok as the block contains a comment
             }
         }
     }
@@ -31,9 +31,9 @@ void method2(int a) {
         switch (a) {
             case 1:a++;
             case 2:a++;
-            default:    // ok
+            default:
                 switch (a) {
-                    default: {  // ok
+                    default: {  // ok as the block contains a comment
 
                     }
                 }
@@ -48,7 +48,7 @@ void method3(int a, int b) {
 
         switch (b) {
             case 2: break;
-            default: method2(b); {}     // ok
+            default: method2(b); {}
         }
 
         switch (a+b) {case 1: break; default: {} ; }    // violation 'Empty default block'
@@ -62,17 +62,17 @@ void method4(int a, int b) {
 
         switch (b) {
             case 1:
-            default:        // ok
+            default:
         }
 
         switch (a+b) {
-            default:        // ok
+            default:
             case 1: { }
         }
 
         switch (a-b) {
             case 1:
-            default: {      // ok
+            default: {      // ok as the block contains a comment
 
             } ;
             case 2: { }
@@ -90,7 +90,7 @@ void method5(int a, int b) {
         }
 
         switch (b) {
-            default:       // ok
+            default:
             case 1:
             case 2: { } method2(b);
             case 3:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault2.java
index 606ffb0783d..0f36f47f31f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault2.java
@@ -11,7 +11,7 @@
 public class InputEmptyBlockDefault2 {
     void method1(int a) {
         switch (a) {}
-        switch (a) {default: ; }    // ok
+        switch (a) {default: ; }
         switch (a) {default: {}}    // violation 'Must have at least one statement'
         switch (a) {
             default:
@@ -31,7 +31,7 @@ void method2(int a) {
         switch (a) {
             case 1:a++;
             case 2:a++;
-            default:    // ok
+            default:
                 switch (a) {
                     default: {  // violation 'Must have at least one statement'
 
@@ -48,7 +48,7 @@ void method3(int a, int b) {
 
         switch (b) {
             case 2: break;
-            default: method2(b); {}     // ok
+            default: method2(b); {}
         }
 
         switch (a+b) {case 1: break; default: {} ; }// violation 'Must have at least one statement'
@@ -62,11 +62,11 @@ void method4(int a, int b) {
 
         switch (b) {
             case 1:
-            default:        // ok
+            default:
         }
 
         switch (a+b) {
-            default:        // ok
+            default:
             case 1: { }
         }
 
@@ -90,7 +90,7 @@ void method5(int a, int b) {
         }
 
         switch (b) {
-            default:       // ok
+            default:
             case 1:
             case 2: { } method2(b);
             case 3:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic.java
index 0fae0ee7ce2..721f2b9e200 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic.java
@@ -45,10 +45,10 @@ void exHandlerTest()
         finally {   // violation 'Must have at least one statement'
             // something
         }
-        try {   // ok
+        try {
             ; // something
         }
-        finally {   // ok
+        finally {
             ; // statement
         }
     }
@@ -74,7 +74,7 @@ private class InputBraces {
 
     synchronized void foo() {
         synchronized (this) {}  // violation 'Must have at least one statement'
-        synchronized (Class.class) { // ok
+        synchronized (Class.class) {
             synchronized (new Object()) {   // violation 'Must have at least one statement'
                 // text
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Statement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Statement.java
index 26e7359482a..46fefe25432 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Statement.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Statement.java
@@ -22,11 +22,11 @@ public void fooMethod()
         char[] s = {'1', '2'};
         int index = 2;
         if (doSideEffect() == 1) {} // violation 'Must have at least one statement'
-        while ((a = index - 1) != 0) {} // ok
-        for (; index < s.length && s[index] != 'x'; index++) {} // ok
+        while ((a = index - 1) != 0) {}
+        for (; index < s.length && s[index] != 'x'; index++) {}
         if (a == 1) {} else {a++;}// violation 'Must have at least one statement'
         switch (a) {}   // violation 'Must have at least one statement'
-        switch (a) {    // ok
+        switch (a) {
             case 1:
                 a = 2;
             case 2:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Text.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Text.java
index d176e8b6ab8..49d8ea3a463 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Text.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemantic2Text.java
@@ -27,11 +27,11 @@ public void fooMethod()
         char[] s = {'1', '2'};
         int index = 2;
         if (doSideEffect() == 1) {} // violation 'Empty if block'
-        while ((a = index - 1) != 0) {} // ok
-        for (; index < s.length && s[index] != 'x'; index++) {} // ok
+        while ((a = index - 1) != 0) {}
+        for (; index < s.length && s[index] != 'x'; index++) {}
         if (a == 1) {} else {System.identityHashCode("a");} // violation 'Empty if block'
         switch (a) {}   // violation 'Empty switch block'
-        switch (a) {    // ok
+        switch (a) {
             case 1:
                 a = 2;
             case 2:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticInvalid.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticInvalid.java
index e44f330ec89..0034ed314c2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticInvalid.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticInvalid.java
@@ -45,10 +45,10 @@ void exHandlerTest()
         finally {
             // something
         }
-        try {   // ok
+        try {
             ; // something
         }
-        finally {   // ok
+        finally {
             ; // statement
         }
     }
@@ -74,7 +74,7 @@ private class InputBraces {
 
     synchronized void foo() {
         synchronized (this) {}
-        synchronized (Class.class) { // ok
+        synchronized (Class.class) {
             synchronized (new Object()) {
                 // text
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticStatement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticStatement.java
index aa3892630c7..7fdeb2ef060 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticStatement.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticStatement.java
@@ -45,10 +45,10 @@ void exHandlerTest()
         finally {   // violation 'Must have at least one statement'
             // something
         }
-        try {   // ok
+        try {
             ; // something
         }
-        finally {   // ok
+        finally {
             ; // statement
         }
     }
@@ -74,7 +74,7 @@ private class InputBraces {
 
     synchronized void foo() {
         synchronized (this) {}  // violation 'Must have at least one statement'
-        synchronized (Class.class) { // ok
+        synchronized (Class.class) {
             synchronized (new Object()) {   // violation 'Must have at least one statement'
                 // text
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticText.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticText.java
index 91eb313372a..9884a7cf3b7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticText.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockSemanticText.java
@@ -39,16 +39,16 @@ void exHandlerTest()
         }   // violation above 'Empty try block'
         finally {
         }   // violation above 'Empty finally block'
-        try {   // ok
+        try {
             // something
         }
-        finally {   // ok
+        finally {
             // something
         }
-        try {   // ok
+        try {
             ; // something
         }
-        finally {   // ok
+        finally {
             ; // statement
         }
     }
@@ -74,8 +74,8 @@ private class InputBraces {
 
     synchronized void foo() {
         synchronized (this) {}  // violation 'Empty synchronized block'
-        synchronized (Class.class) { // ok
-            synchronized (new Object()) {   // ok
+        synchronized (Class.class) {
+            synchronized (new Object()) {
                 // text
             }
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockTestUppercaseOptionProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockTestUppercaseOptionProperty.java
index 1250b9733f3..446a0c72122 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockTestUppercaseOptionProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockTestUppercaseOptionProperty.java
@@ -12,7 +12,7 @@ public class InputEmptyBlockTestUppercaseOptionProperty {
 
     void method1(int a) {
         switch (a) {}
-        switch (a) {default: ; }    // ok
+        switch (a) {default: ; }
         switch (a) {default: {}}    // violation 'Empty default block'
         switch (a) {
             default:
@@ -23,7 +23,7 @@ void method1(int a) {
         }
         switch (a) {
             default:
-            {   // ok
+            {   // ok as the block contains a comment
             }
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockWithEmoji.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockWithEmoji.java
index d91da15d9bb..adcc2952b30 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockWithEmoji.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockWithEmoji.java
@@ -26,14 +26,14 @@ public void fooMethod()
         char[] s = {'1', '2'};
         int index = 2;
         if (doSideEffect() == 1) { } // violation 'Empty if block'
-        while ((a = "12") != "🧐") {return;} // ok
+        while ((a = "12") != "🧐") {return;}
         for (; index < s.length && s[index] != 'x'; index++) {} // violation 'Empty for block'
         if (a == "12🤣") {} else {System.identityHashCode("a");} // violation 'Empty if block'
         // violation below 'Empty switch block'
         switch("😆😆😆😆😆") {
 
         }
-        switch (a) {    // ok
+        switch (a) {
             case "🎄": {
                 a = "🤣🤣";
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/InputEmptyCatchBlockDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/InputEmptyCatchBlockDefault.java
index dcce00874fc..bb6e12e2c2e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/InputEmptyCatchBlockDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/InputEmptyCatchBlockDefault.java
@@ -84,7 +84,7 @@ public void testTryCatch2()
     {
         try {
         }
-        catch (Exception e) { //OK
+        catch (Exception e) {
             //This is expected
             /* This is expected */
             /**This is expected */
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly.java
index 7862fc8f8f4..67bf88bbc9a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly.java
@@ -36,7 +36,7 @@ void method1 ()
     private void some() throws Exception {
         try {
             throw new IOException();
-        } catch (IOException | NullPointerException | ArithmeticException ex) //ok
+        } catch (IOException | NullPointerException | ArithmeticException ex)
          /* warn */ { // ok until #11410
         }
     }
@@ -50,7 +50,7 @@ private class Node {
         Node next;
 
         public
-            /**** comment **********/ Node(int value) /*comment*/ { // ok
+            /**** comment **********/ Node(int value) /*comment*/ {
             this.value=value;
         }
 
@@ -63,7 +63,7 @@ public Node(int value, Node next)
 
     public void array() {
         Integer[] array = null;
-        /*50*/ for/*51*/ (/*52*/Integer/*53*/ i/*54*/:/*55*/ array/*56*/)/*57*/ {/*58*/ // ok
+        /*50*/ for/*51*/ (/*52*/Integer/*53*/ i/*54*/:/*55*/ array/*56*/)/*57*/ {/*58*/
             /*59*/
         }/*60*/
     }
@@ -90,12 +90,12 @@ void method2 ()
         /* 🥳🥳🥳🥳 */ /* 🥳🥳🥳🥳🥳 */ { } // ok until #11410
         }
 
-    private void method() { // ok
+    private void method() {
         String b = "🧐🧐🧐ccvb";
-        if (b.equals("🧐🧐")) { // ok
+        if (b.equals("🧐🧐")) {
 
         }
-        if (b.equals("s🧐d🧐a")) { // ok
+        if (b.equals("s🧐d🧐a")) {
         }
 
         while (b == "😂🥳") { /* ok */ }
@@ -105,7 +105,7 @@ private void method() { // ok
 interface check {
 }
 
-/*15*/ class /*16*/InputAstTreeStringPrinterFullOfBlockComments /*49*/{/*17*/ // ok
+/*15*/ class /*16*/InputAstTreeStringPrinterFullOfBlockComments /*49*/{/*17*/
     /*1*/public/*2*/ static/**/ String/*2*/ main/*2*/(/*4*/String/*2*/[/*2*/]/*2*/ args/*2*/)/**/ {
         /*31*/String /*32*/line /*33*/= /*34*/"/*I'm NOT comment*/blabla"/*35*/;/*36*/
         /*3*/String/*8*/.CASE_INSENSITIVE_ORDER/*0*/./*1*/equals/*2*/(/*3*/line/*4*/)/*4*/;/*6*/
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly2.java
index f202b68f64a..34732c86454 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyCommentBeforeLeftCurly2.java
@@ -29,9 +29,9 @@ void method1() /* comment
     }
 
     void method2() /********
-    comment */ {  // ok
+    comment */ {
         if (!Arrays.equals(this.countList, countList)
-            /* || !Arrays.equals(this.whereCreated, other.whereCreated) */ ) { // ok
+            /* || !Arrays.equals(this.whereCreated, other.whereCreated) */ ) {
         }
     }
 
@@ -39,7 +39,7 @@ void method3() /*****
     ********/ { } // ok until #11410
 
 
-    InputLeftCurlyCommentBeforeLeftCurly2() /**************/ { } // ok
+    InputLeftCurlyCommentBeforeLeftCurly2() /**************/ { }
 
     InputLeftCurlyCommentBeforeLeftCurly2(int data) /*
      ****** comment *********/ { } // ok until #11410
@@ -58,14 +58,14 @@ class Node /************/{
 
     String s = "🧐  🧐";
     private void foo3(String s) {
-        /*🧐 🧐 🧐*/  /* comment */ if ("🧐".isEmpty()) { // ok
+        /*🧐 🧐 🧐*/  /* comment */ if ("🧐".isEmpty()) {
         }
     }
 
     List<ThrowingConsumer<InetSocketAddress>> targets = List.of(
             /* 0 */  (a) -> {Socket s = new Socket();},
             // violation above ''{' at column 29 should have line break after'
-            /* 0 */  (b) -> { // ok
+            /* 0 */  (b) -> {
                 Socket s = new Socket();
             }
     );
@@ -75,11 +75,11 @@ class Nothing {
     void method() {
         int a = 9;int b = 9;
         if(a == 0 && b == 0
-         /* || a==3 */) {} //ok
+         /* || a==3 */) {}
     }
 
     public void test2(String
-                      /* CHECKSTYLE */ ...para) { // ok
+                      /* CHECKSTYLE */ ...para) {
     }
 
     public void test3(String line) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNl.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNl.java
index 5ee31848794..8b0ac9842cc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNl.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNl.java
@@ -14,21 +14,21 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 public class InputLeftCurlyDefaultTestNl
-{ // ok
+{
     private interface PrivateInterface
-    { // ok
+    {
     }
 
     interface PackageInnerInterface
-    { // ok
+    {
     }
 
     protected interface ProtectedInnerInterface
-    { // ok
+    {
     }
 
     public interface PublicInnerInterface
-    { // ok
+    {
     }
 
     private
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNlow.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNlow.java
index e94b087ea40..60315a9675e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNlow.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyDefaultTestNlow.java
@@ -64,9 +64,9 @@ public interface PublicInnerInterface
     class MyClass3 { // violation ''{' at column 20 should be on a new line'
     }
 
-    public class MyClass4 { // ok
-        void method() { // ok
-            while(true) {/*foo*/} // ok
+    public class MyClass4 {
+        void method() {
+            while(true) {/*foo*/}
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyIgnoreEnumsOptTrue.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyIgnoreEnumsOptTrue.java
index 54387a97900..3a06667ff39 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyIgnoreEnumsOptTrue.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyIgnoreEnumsOptTrue.java
@@ -14,7 +14,7 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 public class InputLeftCurlyIgnoreEnumsOptTrue {
-    enum Colors {RED, // ok
+    enum Colors {RED,
         BLUE,
         GREEN;
         // violation below ''{' at column 44 should have line break after'
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethod.java
index 889bf0e7358..efdc1ae29a3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethod.java
@@ -16,14 +16,14 @@
 class InputLeftCurlyMethod
 { // violation ''{' at column 1 should be on the previous line'
     InputLeftCurlyMethod() {}
-    InputLeftCurlyMethod(String aOne) { // ok
+    InputLeftCurlyMethod(String aOne) {
     }
     InputLeftCurlyMethod(int aOne)
     { // violation ''{' at column 5 should be on the previous line'
     }
 
     void method1() {}
-    void method2() { // ok
+    void method2() {
     }
     void method3()
     { // violation ''{' at column 5 should be on the previous line'
@@ -36,7 +36,7 @@ void method5(String aOne,
     { // violation ''{' at column 5 should be on the previous line'
     }
     void method6(String aOne,
-                 String aTwo) { // ok
+                 String aTwo) {
     }
 }
 
@@ -45,7 +45,7 @@ enum InputLeftCurlyMethodEnum
     CONSTANT1("hello")
     { // violation ''{' at column 5 should be on the previous line'
         void method1() {}
-        void method2() { // ok
+        void method2() {
         }
         void method3()
         { // violation ''{' at column 9 should be on the previous line'
@@ -58,11 +58,11 @@ void method5(String aOne,
         { // violation ''{' at column 9 should be on the previous line'
         }
         void method6(String aOne,
-                     String aTwo) { // ok
+                     String aTwo) {
         }
     },
 
-    CONSTANT2("hello") { // ok
+    CONSTANT2("hello") {
 
     },
 
@@ -76,7 +76,7 @@ private InputLeftCurlyMethodEnum(String value)
     }
 
     void method1() {}
-    void method2() { // ok
+    void method2() {
     }
     void method3()
     { // violation ''{' at column 5 should be on the previous line'
@@ -89,7 +89,7 @@ void method5(String aOne,
     { // violation ''{' at column 5 should be on the previous line'
     }
     void method6(String aOne,
-                 String aTwo) { // ok
+                 String aTwo) {
     }
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethodTestNewLine2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethodTestNewLine2.java
index 0d8142e8ac0..7e26fc323b1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethodTestNewLine2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyMethodTestNewLine2.java
@@ -14,26 +14,26 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 class InputLeftCurlyMethodTestNewLine2
-{ // ok
+{
     void InputLeftCurlyMethod() {}
     void InputLeftCurlyMethod(String aOne) { // violation ''{' at column 44 should be on a new line'
     }
     void InputLeftCurlyMethod(int aOne)
-    { // ok
+    {
     }
 
     void method1() {}
     void method2() { // violation ''{' at column 20 should be on a new line'
     }
     void method3()
-    { // ok
+    {
     }
     void                                                               method4()
-    { // ok
+    {
     }
     void method5(String aOne,
                  String aTwo)
-    { // ok
+    {
     }
     void method6(String aOne,
                  String aTwo) { // violation ''{' at column 31 should be on a new line'
@@ -41,21 +41,21 @@ void method6(String aOne,
 }
 
 enum InputLeftCurlyMethodEnumTestNewLine2
-{ // ok
+{
     CONSTANT1()
-    { // ok
+    {
         void method1() {}
         void method2() { // violation ''{' at column 24 should be on a new line'
         }
         void method3()
-        { // ok
+        {
         }
         void                                                               method4()
-        { // ok
+        {
         }
         void method5(String aOne,
                      String aTwo)
-        { // ok
+        {
         }
         void method6(String aOne,
                      String aTwo) { // violation ''{' at column 35 should be on a new line'
@@ -67,11 +67,11 @@ void method6(String aOne,
     },
 
     CONSTANT3()
-    { // ok
+    {
     };
 
     private void InputLeftCurlyMethodEnum(String value)
-    { // ok
+    {
 
     }
 
@@ -79,14 +79,14 @@ void method1() {}
     void method2() { // violation ''{' at column 20 should be on a new line'
     }
     void method3()
-    { // ok
+    {
     }
     void                                                               method4()
-    { // ok
+    {
     }
     void method5(String aOne,
                  String aTwo)
-    { // ok
+    {
     }
     void method6(String aOne,
                  String aTwo) { // violation ''{' at column 31 should be on a new line'
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault.java
index 76ae4136b2b..75485381e3e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault.java
@@ -33,40 +33,40 @@ public interface PublicInnerInterface
 
     private
     class
-    MyClass1 { // ok
+    MyClass1 {
     }
 
     class
-    MyClass2 { // ok
+    MyClass2 {
     }
 
     private
     interface
-    MyInterface1 { // ok
+    MyInterface1 {
     }
 
     interface
-    MyInterface2 { // ok
+    MyInterface2 {
     }
 
     protected
     enum
-    MyEnum { // ok
+    MyEnum {
     }
 
     private
     @interface
-    MyAnnotation { // ok
+    MyAnnotation {
     }
 
     @Deprecated
     public
-    class MyClass3 { // ok
+    class MyClass3 {
     }
 
-    public class MyClass4 { // ok
-        void method() { // ok
-            while(true) {/*foo*/} // ok
+    public class MyClass4 {
+        void method() {
+            while(true) {/*foo*/}
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault3.java
index df4ab6c6c7e..d59c1d6fa9a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefault3.java
@@ -28,7 +28,7 @@ int foo() throws InterruptedException
                 { // violation ''{' at column 17 should be on the previous line'
                     break;
                 }
-                else if (x < 0) { // ok
+                else if (x < 0) {
                     ;
                 }
                 else
@@ -93,7 +93,7 @@ public enum GreetingsEnum
     void method2()
     { // violation ''{' at column 5 should be on the previous line'
         boolean flag = true;
-        if (flag) { // ok
+        if (flag) {
             System.identityHashCode("heh");
             flag = !flag; } String.CASE_INSENSITIVE_ORDER.
               equals("Xe-xe");
@@ -144,7 +144,7 @@ public void fooInnerMethod ()
  * False positive
  *
  */
-class Absent_CustomFieldSerializer3 { // ok
+class Absent_CustomFieldSerializer3 {
 
     public static void serialize() {} // Expected nothing but was "'}' should be alone on a line."
 }
@@ -160,14 +160,14 @@ interface EmptyInterface3 {}
 
 class ClassWithStaticInitializers
 { // violation ''{' at column 1 should be on the previous line'
-    static { // ok
+    static {
     }
     static
     {}
 
     static class Inner
     { // violation ''{' at column 5 should be on the previous line'
-        static { // ok
+        static {
             int i = 1;
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultLambda.java
index 822ae535611..f8da92ccccd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultLambda.java
@@ -15,7 +15,7 @@
 
 public class InputLeftCurlyTestDefaultLambda
 { // violation ''{' at column 1 should be on the previous line'
-    static Runnable r1 = () -> { // ok
+    static Runnable r1 = () -> {
         String.valueOf("Hello world one!");
     };
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultWithAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultWithAnnotations.java
index 8378cf7ec6d..1eede4ea3c6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultWithAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestDefaultWithAnnotations.java
@@ -45,16 +45,16 @@ public int hashCode()
 }
 
 @TestClassAnnotation
-class InputLeftCurlyAnnotations2 { // ok
+ class InputLeftCurlyAnnotations2 {
     private static final int X = 10;
     @Override
-    public boolean equals(Object other) { // ok
+    public boolean equals(Object other) {
         return false;
     }
 
     @Override
     @SuppressWarnings("unused")
-    public int hashCode() { // ok
+    public int hashCode() {
         int a = 10;
         return 1;
     }
@@ -76,5 +76,5 @@ public int hashCode() { // ok
 }
 
 @Target(ElementType.TYPE)
-@interface TestClassAnnotation { // ok
+@interface TestClassAnnotation {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestFirstLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestFirstLine.java
index 4e665a90964..eb220b4f566 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestFirstLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestFirstLine.java
@@ -18,6 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-class InputLeftCurlyTestFirstLine { // ok
+class InputLeftCurlyTestFirstLine {
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestInvalidOption.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestInvalidOption.java
index c1e72c4cc8e..a60c8ecf1d5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestInvalidOption.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestInvalidOption.java
@@ -14,59 +14,59 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 public class InputLeftCurlyTestInvalidOption
-{ // ok
+{
     private interface PrivateInterface
-    { // ok
+    {
     }
 
     interface PackageInnerInterface
-    { // ok
+    {
     }
 
     protected interface ProtectedInnerInterface
-    { // ok
+    {
     }
 
     public interface PublicInnerInterface
-    { // ok
+    {
     }
 
     private
     class
-    MyClass1 { // ok
+    MyClass1 {
     }
 
     class
-    MyClass2 { // ok
+    MyClass2 {
     }
 
     private
     interface
-    MyInterface1 { // ok
+    MyInterface1 {
     }
 
     interface
-    MyInterface2 { // ok
+    MyInterface2 {
     }
 
     protected
     enum
-    MyEnum { // ok
+    MyEnum {
     }
 
     private
     @interface
-    MyAnnotation { // ok
+    MyAnnotation {
     }
 
     @Deprecated
     public
-    class MyClass3 { // ok
+    class MyClass3 {
     }
 
-    public class MyClass4 { // ok
-        void method() { // ok
-            while(true) {/*foo*/} // ok
+    public class MyClass4 {
+        void method() {
+            while(true) {/*foo*/}
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLine3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLine3.java
index 1f4c75fa66d..0dc32bafc98 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLine3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLine3.java
@@ -14,29 +14,29 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 class InputLeftCurlyTestNewLine3
-{ // ok
+{
     /** @see test method **/
     int foo() throws InterruptedException
-    { // ok
+    {
         int x = 1;
         int a = 2;
         while (true)
-        { // ok
+        {
             try
-            { // ok
+            {
                 if (x > 0)
-                { // ok
+                {
                     break;
                 }
                 else if (x < 0) { // violation ''{' at column 33 should be on a new line'
                     ;
                 }
                 else
-                { // ok
+                {
                     break;
                 }
                 switch (a)
-                { // ok
+                {
                 case 0:
                     break;
                 default:
@@ -44,19 +44,19 @@ else if (x < 0) { // violation ''{' at column 33 should be on a new line'
                 }
             }
             catch (Exception e)
-            { // ok
+            {
                 break;
             }
             finally
-            { // ok
+            {
                 break;
             }
         }
 
         synchronized (this)
-        { // ok
+        {
             do
-            { // ok
+            {
                 x = 2;
             } while (x == 2);
         }
@@ -65,7 +65,7 @@ else if (x < 0) { // violation ''{' at column 33 should be on a new line'
                  ); // Bizarre, but legal
 
         for (int k = 0; k < 1; k++)
-        { // ok
+        {
             String innerBlockVariable = "";
         }
 
@@ -78,20 +78,20 @@ else if (x < 0) { // violation ''{' at column 33 should be on a new line'
 
     // Test static initialiser
     static
-    { // ok
+    {
         int x = 1; // should not require any javadoc
     }
 
 
 
     public enum GreetingsEnum
-    { // ok
+    {
         HELLO,
         GOODBYE
     };
 
     void method2()
-    { // ok
+    {
         boolean flag = true;
         if (flag) { // violation ''{' at column 19 should be on a new line'
             System.identityHashCode("heh");
@@ -108,10 +108,10 @@ void method2()
  * a statement or the body of a constructor.
  */
 class FooCtorTestNewLine3
-{ // ok
+{
         int i;
         public void FooCtor()
-    { // ok
+    {
                 i = 1;
     }}
 
@@ -120,9 +120,9 @@ public void FooCtor()
 * a statement or the body of a method.
 */
 class FooMethodTestNewLine3
-{ // ok
+{
         public void fooMethod()
-    { // ok
+    {
                 int i = 1;
     }}
 
@@ -131,11 +131,11 @@ public void fooMethod()
 * a statement or the body of a named class.
 */
 class FooInnerTestNewLine3
-{ // ok
+{
         class InnerFoo
-    { // ok
+    {
                 public void fooInnerMethod ()
-        { // ok
+        {
 
                 }
     }}
@@ -150,7 +150,7 @@ public static void serialize() {} // Expected nothing but was "'}' should be alo
 }
 
 class Absent_CustomFieldSerializer4TestNewLine3
-{ // ok
+{
     public void Absent_CustomFieldSerializer4() {}
 }
 
@@ -159,14 +159,14 @@ class EmptyClass2TestNewLine3 {}
 interface EmptyInterface3TestNewLine3 {}
 
 class ClassWithStaticInitializersTestNewLine3
-{ // ok
+{
     static { // violation ''{' at column 12 should be on a new line'
     }
     static
     {}
 
     static class Inner
-    { // ok
+    {
         static { // violation ''{' at column 16 should be on a new line'
             int i = 1;
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLineOptionWithLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLineOptionWithLambda.java
index b51ffe8b0ac..d06c0aa5f89 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLineOptionWithLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNewLineOptionWithLambda.java
@@ -14,7 +14,7 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 public class InputLeftCurlyTestNewLineOptionWithLambda
-{ // ok
+{
     static Runnable r1 = () -> { // violation ''{' at column 32 should be on a new line'
         String.valueOf("Hello world one!");
     };
@@ -24,7 +24,7 @@ public class InputLeftCurlyTestNewLineOptionWithLambda
     static Runnable r3 = () -> {String.valueOf("ok");};
 
     static Runnable r4 = () ->
-    { // ok
+    {
         String.valueOf("Hello world one!");
     };
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlWithAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlWithAnnotations.java
index 54ea01908fd..0b27808cd6a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlWithAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlWithAnnotations.java
@@ -20,24 +20,24 @@
 
 @TestClassAnnotation
 class InputLeftCurlyTestNlWithAnnotations
-{ // ok
+{
     private static final int X = 10;
     @Override
     public boolean equals(Object other)
-    { // ok
+    {
         return false;
     }
 
     @Override
     @SuppressWarnings("unused")
     public int hashCode()
-    { // ok
+    {
         int a = 10;
         return 1;
     }
 
     @Override @SuppressWarnings({"unused", "unchecked", "static-access"}) public String toString()
-    { // ok
+    {
         Integer i = this.X;
         List<String> l = new ArrayList();
         return "SomeString";
@@ -60,7 +60,7 @@ public int hashCode() { // violation ''{' at column 27 should be on a new line'
     }
 
     @Override @SuppressWarnings({"unused", "unchecked", "static-access"}) public String toString()
-    { // ok
+    {
         Integer i = this.X;
         List<String> l = new ArrayList();
         return "SomeString";
@@ -68,7 +68,7 @@ public int hashCode() { // violation ''{' at column 27 should be on a new line'
 
     @Deprecated
     @SuppressWarnings({"unused", "unchecked", "static-access"}) public String toString2()
-    { // ok
+    {
         Integer i = this.X;
         List<String> l = new ArrayList();
         return "SomeString";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlowWithAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlowWithAnnotations.java
index 504f2d1db46..47dc9bca771 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlowWithAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyTestNlowWithAnnotations.java
@@ -45,16 +45,16 @@ public int hashCode()
 }
 
 @TestClassAnnotation
-class InputLeftCurlyAnnotations2TestNlowWithAnnotations { // ok
+class InputLeftCurlyAnnotations2TestNlowWithAnnotations {
     private static final int X = 10;
     @Override
-    public boolean equals(Object other) { // ok
+    public boolean equals(Object other) {
         return false;
     }
 
     @Override
     @SuppressWarnings("unused")
-    public int hashCode() { // ok
+    public int hashCode() {
         int a = 10;
         return 1;
     }
@@ -76,5 +76,5 @@ public int hashCode() { // ok
 }
 
 @Target(ElementType.TYPE)
-@interface TestClassTestNlowWithAnnotation { // ok
+@interface TestClassTestNlowWithAnnotation {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmoji.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmoji.java
index 6090fac20a3..9d59ab23e35 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmoji.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmoji.java
@@ -16,21 +16,21 @@
 public class InputLeftCurlyWithEmoji {
     static Runnable r1 = () -> {String.valueOf("🥳 🎄!");};
     // violation above ''{' at column 32 should have line break after.'
-    private void method() { // ok
+    private void method() {
 
         String a = "🧐🧐🧐";
 
         String b = "🧐🧐🧐ccvb";
-        if (b.equals("🧐🧐")) { // ok
+        if (b.equals("🧐🧐")) {
 
         }
-        if (b.equals("s🧐d🧐a")) { // ok
+        if (b.equals("s🧐d🧐a")) {
         }
 
         while (b == "😂🥳") { /* ok */ }
     }
 
-    private void method2() { // ok
+    private void method2() {
         String x = "🎄🤣";
 
         try
@@ -39,7 +39,7 @@ private void method2() { // ok
             { // violation ''{' at column 13 should be on the previous line'
 
             }
-            else if (!x.equals("🎄🤣")) { // ok
+            else if (!x.equals("🎄🤣")) {
                 ;
             }
             else
@@ -71,8 +71,8 @@ else if (!x.equals("🎄🤣")) { // ok
     enum InputLeftCurlyMethodEnumWithEmoji
     { // violation ''{' at column 5 should be on the previous line'
         CONSTANT1("🧐🧐dsds🧐") {
-            void method1() {}//ok
-            void method2() { //ok
+            void method1() {}
+            void method2() {
             }
             void method3()
             { // violation ''{' at column 13 should be on the previous line'
@@ -82,6 +82,6 @@ void method3()
             }
         };
 
-        private InputLeftCurlyMethodEnumWithEmoji (String s) { // ok
+        private InputLeftCurlyMethodEnumWithEmoji (String s) {
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmojiNl.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmojiNl.java
index e66b8f677f3..05b585449e4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmojiNl.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithEmojiNl.java
@@ -14,7 +14,7 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
 
 public class InputLeftCurlyWithEmojiNl
-{ // OK
+{
     static Runnable r1 = () -> {String.valueOf("🥳🎄!");};
     // violation above ''{' at column 32 should be on a new line.'
     private void method() { // violation ''{' at column 27 should be on a new line.'
@@ -35,24 +35,24 @@ private void method2() { // violation ''{' at column 28 should be on a new line.
         String x = "🎄🤣";
 
         try
-        { // OK
+        {
             if (x.equals("🎄🤣"))
-            { // OK
+            {
 
             }
             else if (!x.equals("🎄🤣")) { // violation ''{' at column 39 should be on a new line.'
                 ;
             }
             else
-            { // OK
+            {
 
             }
             switch (x)
-            { // OK
+            {
                 case "🤣🤣🤣":
                     break;
                 default:
-                { // OK
+                {
                     break;
                 }
             }
@@ -66,22 +66,22 @@ else if (!x.equals("🎄🤣")) { // violation ''{' at column 39 should be on a
             }
         }
         catch (Exception e)
-        { // OK
+        {
         }
     }
 }
 enum InputLeftCurlyMethodEnumWithEmojiNl
-{ // OK
+{
     CONSTANT1("🧐🧐dsds🧐") { // violation ''{' at column 26 should be on a new line.'
         String method1() { return "sds🧐"; } // violation ''{' at column 26 should be on a new line.'
         void method2() { // violation ''{' at column 24 should be on a new line.'
         }
         String method3()
-        { // OK
+        {
             return "sds🧐";
         }
         boolean                                                              method4()
-        { // OK
+        {
             return "sds🧐".equals("🧐🧐dsds🧐");
         }
     };
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithTrimOptionProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithTrimOptionProperty.java
index 883215d321b..c60a5752408 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithTrimOptionProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/InputLeftCurlyWithTrimOptionProperty.java
@@ -16,7 +16,7 @@ public class InputLeftCurlyWithTrimOptionProperty {
     {}
 
     static class Inner
-    { // ok
+    {
         static { // violation ''{' at column 16 should be on a new line'
             int i = 1;
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesEmptySingleLineDefaultStmt.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesEmptySingleLineDefaultStmt.java
index dc311173628..5f4ff2be38d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesEmptySingleLineDefaultStmt.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesEmptySingleLineDefaultStmt.java
@@ -24,7 +24,7 @@ private void main1() {
 }
 
 @interface ExampleEmptySingleLineDefaultStmt {
-    String priority() default "value"; // ok
+    String priority() default "value";
 }
 
 interface IntefaceWithDefaultMethodEmptySingleLineDefaultStmt {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesLoopBodyTrue.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesLoopBodyTrue.java
index e81dbecdb36..43cf98d10b4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesLoopBodyTrue.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesLoopBodyTrue.java
@@ -16,64 +16,64 @@ public class InputNeedBracesLoopBodyTrue {
 
     {
         value = 0;
-        while(incrementValue() < 5);; // ok
+        while(incrementValue() < 5);;
     }
 
     public void foo() {
-        while(incrementValue() < 5); // ok
+        while(incrementValue() < 5);
     }
 
     public void foo2() {
-        for(int i = 0; i < 10; incrementValue()); // ok
-        for(int i = 0; incrementValue() < 8; i++); // ok
+        for(int i = 0; i < 10; incrementValue());
+        for(int i = 0; incrementValue() < 8; i++);
     }
 
     public void foo3() {
-        while(incrementValue() // ok
+        while(incrementValue()
             < 5);
     }
 
     public void foo4() {
-        while(incrementValue() < 5) // ok
+        while(incrementValue() < 5)
             ;
     }
 
     public void foo5() {
-        while(incrementValue() // ok
+        while(incrementValue()
             < 5)
             ;
     }
 
     public void foo6() {
-        while( // ok
+        while(
             incrementValue() < 5
             );
     }
 
     public void foo7() {
-        while( // ok
+        while(
             incrementValue() < 5);
     }
 
     public void foo8() {
-        for(int i = 0; incrementValue() < 8; i++); // ok
+        for(int i = 0; incrementValue() < 8; i++);
     }
 
     public void foo9() {
-        for(int i = 0; // ok
+        for(int i = 0;
             incrementValue() < 8;
             i++);
     }
 
     public void foo10() {
-        for( // ok
+        for(
             int i = 0;
             incrementValue() < 8;
             i++);
     }
 
     public void foo11() {
-        for // ok
+        for
             (
             int i = 0;
             incrementValue() < 8;
@@ -95,11 +95,11 @@ public void foo14() {
     }
 
     public void foo15() {
-        while (true); // ok
+        while (true);
     }
 
     public void foo16() {
-        for (;;); // ok
+        for (;;);
     }
 
     public void foo17() {
@@ -114,7 +114,7 @@ public void foo18() {
 
     @Override
     public String toString(){
-        while(fco.removeAssignedRole(this)); // ok
+        while(fco.removeAssignedRole(this));
         return "";
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineStatements.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineStatements.java
index b95ba4c6a19..4dedccd5ef9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineStatements.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineStatements.java
@@ -78,10 +78,10 @@ private int getSmth(int num)
         int counter = 0;
         switch (num) {
             case 1: counter++; break;
-            case 2: // ok
+            case 2:
                 counter += 2;
                 break;
-            case 3: // ok
+            case 3:
                 counter += 3;
                 break;
             case 6: counter += 10; break;
@@ -128,9 +128,9 @@ private void forEachLoop() {
     private void method(){
         if(false) {
             switch (0) {
-                case -1: // ok
+                case -1:
                     return;
-                default: // ok
+                default:
                     return;
             }
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestCycles.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestCycles.java
index 75b9cf8ef95..1f8cc9775c7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestCycles.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestCycles.java
@@ -47,10 +47,10 @@ public void method() {
         case 3: {
             break;}
 
-        case 4: // ok
+        case 4:
             break;
 
-        case 5:  System.lineSeparator(); // ok
+        case 5:  System.lineSeparator();
             break;
         }
 
@@ -62,7 +62,7 @@ public void method() {
         }
 
         switch(1) {
-        default: // ok
+        default:
          break;
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestItWithAllowsOn.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestItWithAllowsOn.java
index 41d26b95f2c..0661fd7eb62 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestItWithAllowsOn.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestItWithAllowsOn.java
@@ -28,7 +28,7 @@ void testDoWhile()
         while (condition());
 
         // Invalid
-        do testDoWhile(); while (condition()); // ok
+        do testDoWhile(); while (condition());
     }
 
     /** Test while loops **/
@@ -40,10 +40,10 @@ void testWhile()
         }
 
         // Invalid
-        while(condition()); // ok
+        while(condition());
         while (condition()) // violation
             testWhile();
-        while (condition()) // ok
+        while (condition())
             if (condition()) // violation
                 testWhile();
     }
@@ -57,7 +57,7 @@ void testFor()
         }
 
         // Invalid
-        for(int i = 1;i < 5;i++); // ok
+        for(int i = 1;i < 5;i++);
         for (int i = 1; i < 5; i++) // violation
             testFor();
         for (int i = 1; i < 5; // violation
@@ -81,7 +81,7 @@ else if (condition()) {
         }
 
         // Invalid
-        if (condition()); // ok
+        if (condition());
         if (condition()) // violation
             testIf();
         if (condition()) // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault.java
index 6a64b36e73e..f554c6a54cf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault.java
@@ -29,13 +29,13 @@ private int foo1() {
     }
 
     private int foo2() {
-        if (SomeClass.test(true) == true) // ok
+        if (SomeClass.test(true) == true)
             return 4;
         return 0;
     }
 
     private int foo3() {
-        if (SomeClass.test(true) == true) if (true) return 4; // ok
+        if (SomeClass.test(true) == true) if (true) return 4;
         return 0;
     }
 
@@ -44,7 +44,7 @@ private void foo(Object o) {
     }
 
     private void foo2(Object o) {
-        if (o != null) // ok
+        if (o != null)
             this.notify();
     }
 
@@ -52,23 +52,23 @@ private void loopTest(Object o) {
         while (o != null) {
             this.notify();
         }
-        while (o != null) // ok
+        while (o != null)
             this.notify();
         while (o != null) this.notify();
         do {
             this.notify();
         } while (o != null);
         do this.notify(); while (o != null);
-        do // ok
+        do
             this.notify();
         while (o != null);
-        for (;;) // ok
+        for (;;)
             break;
         for (;;) break;
         for (int i = 0; i < 10; i++) {
              this.notify();
         }
-        for (int i = 0; i < 10; i++) // ok
+        for (int i = 0; i < 10; i++)
              this.notify();
         for (int i = 0; ; ) this.notify();
     }
@@ -97,11 +97,11 @@ private void testElse(int k) {
     }
 
     private int testMissingWarnings() {
-        if (true) // ok
+        if (true)
             throw new RuntimeException();
         if (true) {
             return 1;
-        } else // ok
+        } else
             return 2;
     }
 
@@ -113,14 +113,14 @@ void enhancedForLoop(int[] array) {
 
     private class StateInfo {
         public boolean isInitial() {
-            for (int locator: sourceLocators) if (locator != 0) return false; // ok
+            for (int locator: sourceLocators) if (locator != 0) return false;
             return true;
         }
     }
 
     private void forEachLoop() {
         for (String s: new String[]{""}) break;
-        for (String s: new String[]{""}) // ok
+        for (String s: new String[]{""})
             break;
         for (;;)
         ;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault2.java
index 046be46b4f9..84b0849270e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineCaseDefault2.java
@@ -24,7 +24,7 @@ private void main1() {
 }
 
 @interface Example {
-    String priority() default "value"; // ok
+    String priority() default "value";
 }
 
 interface IntefaceWithDefaultMethod {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineLambda.java
index ac979b20dfa..d812b67eb30 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesTestSingleLineLambda.java
@@ -11,8 +11,8 @@
 
 public class InputNeedBracesTestSingleLineLambda {
 
-    static Runnable r1 = ()->String.CASE_INSENSITIVE_ORDER.equals("Hello world one!"); // ok
-    static Runnable r2 = () -> String.CASE_INSENSITIVE_ORDER.equals("Hello world two!"); // ok
+    static Runnable r1 = ()->String.CASE_INSENSITIVE_ORDER.equals("Hello world one!");
+    static Runnable r2 = () -> String.CASE_INSENSITIVE_ORDER.equals("Hello world two!");
     static Runnable r3 = () -> // violation
         String.CASE_INSENSITIVE_ORDER.equals("Hello world two!");
     static Runnable r4 = () -> {String.CASE_INSENSITIVE_ORDER.equals("Hello world two!");};
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAlone.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAlone.java
new file mode 100644
index 00000000000..a5bd34f8a7d
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAlone.java
@@ -0,0 +1,111 @@
+/*
+RightCurly
+option = ALONE
+tokens = LITERAL_CASE
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksInSwitchStatementAlone {
+    public static void test0() {
+        int mode = 0;
+        switch (mode) {
+            case 1: {
+                int x = 1;
+                break;
+            }
+            case 2:
+            default:  {
+                int x = 0;
+            }break;
+            case 3: {
+                int x = 3;
+            }
+        }
+    }
+
+    public static void test() {
+        int mode = 0;
+        switch (mode) {
+            case 1:{
+                int x = 1;
+                break;
+            } default :          // violation '}' at column 13 should be alone on a line'
+                int x = 0;
+        }
+    }
+
+    public static void test1() {
+        int k = 0;
+        switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            } case 2:        // violation '}' at column 13 should be alone on a line'
+                 int x = 2;
+                 break;
+        }
+    }
+
+    public static void test2() {
+         int k = 0;
+         switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            }
+            case 2:
+                 int x = 2;
+                 break;
+         }
+    }
+
+    public static void test3() {
+         int k = 0;
+         switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            }
+            case 2:{
+                    int x = 2;
+                    break;
+            } }      // violation '}' at column 13 should be alone on a line'
+    }
+
+    public static void test4() {
+        int mode = 0;
+        switch (mode) { case 0: {int x = 1;} break; default : int x = 5; }
+        // violation above '}' at column 44 should be alone on a line'
+    }
+
+    public static void test5() {
+        int mode = 0;
+        switch (mode) { case 0: }
+    }
+
+    public static void test6() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {int x = 1; break;}  // violation '}' at column 39 should be alone on a line'
+            default : break;
+        }
+    }
+
+    public static void test7() {
+        int mode = 0;
+        switch (mode) {case 0:{int x = 1;} // violation '}' at column 42 should be alone on a line'
+            break; default : break; }
+    }
+
+    public static void test8() {
+        int mode = 0;
+        int x = 0;
+        switch (mode) {
+            case 0:
+            case 1: x = 1; break;
+            case 2: {x = 1; break;} // violation '}' at column 35 should be alone on a line'
+            default : x = 5;
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAlone2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAlone2.java
new file mode 100644
index 00000000000..05ec722e517
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAlone2.java
@@ -0,0 +1,120 @@
+/*
+RightCurly
+option = ALONE
+tokens = LITERAL_CASE
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksInSwitchStatementAlone2 {
+     public static void test9() {
+        int mode = 0;
+        switch (mode) {
+            case 0: int x = 1;
+            case 1: x = 1; break;
+            case 2: {
+                x =
+            1;} default : x = 5;         // violation '}' at column 15 should be alone on a line'
+        }
+    }
+
+    public static void test10() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: int x = 1; break;    // violation '}' at column 13 should be alone on a line'
+            case 2: {
+
+            }
+            default : x = 5;
+        }
+    }
+     public static void test11() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: int x = 1; break;   // violation '}' at column 13 should be alone on a line'
+            case 2: {
+
+            } default : x = 5;            // violation '}' at column 13 should be alone on a line'
+        }
+    }
+    public static void test12() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            int x = 1; } case 1: {int x = 1;} break;  // 2 violations
+        }
+    }
+    public static void test13() {
+        int mode = 0;
+        switch (mode) {
+            case 0: { int x = 1;
+
+            } case 1: { // violation '}' at column 13 should be alone on a line'
+
+            }
+            default : break;
+        }
+    }
+    public static void test14() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: {  }         // 2 violations
+            default : {break;}
+        }
+    }
+
+    public static void test15() {
+        int mode = 0;
+        switch (mode) {case 0: { } case 1: {  } } // 2 violations
+    }
+
+    public static void test16() {
+        int mode = 0;
+        switch (mode) {
+            case 0: int x = 1; { } break;  // ok, the braces is not a first child of case
+            case 1: { } int y = 1; break;
+            // violation above '}' at column 23 should be alone on a line'
+            case 2: int t = 1; { };
+        }
+    }
+
+    public static void test17() {
+        int mode = 0;
+        switch (mode) {
+            case 0:
+            int x = 1;
+            {  }  // ok, the braces is not a first child of case
+            case 1:
+            mode++;
+            {
+
+            } int y; // ok, the braces is not a first child of case
+            case 3:
+            {
+
+            } int z = 1;  // violation '}' at column 13 should be alone on a line'
+        }
+    }
+
+    public static void test18() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+            }
+            int x;
+            case 1:
+            int z;
+            {
+
+            }break; default: break; // ok, the braces is not a first child of case
+        }
+    }
+}
+
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline.java
new file mode 100644
index 00000000000..95e6d796413
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline.java
@@ -0,0 +1,111 @@
+/*
+RightCurly
+option = ALONE_OR_SINGLELINE
+tokens = LITERAL_CASE
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline {
+    public static void test0() {
+        int mode = 0;
+        switch (mode) {
+            case 1: {
+                int x = 1;
+                break;
+            }
+            case 2: {
+                int x = 0;
+                break;
+            }
+            case 3: {
+                break;
+            }
+        }
+    }
+
+    public static void test() {
+        int mode = 0;
+        switch (mode) {
+            case 1:{
+                int x = 1;
+                break;
+            } default :          // violation '}' at column 13 should be alone on a line'
+                int x = 0;
+        }
+    }
+
+    public static void test1() {
+        int k = 0;
+        switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            } case 2:        // violation '}' at column 13 should be alone on a line'
+                 int x = 2;
+                 break;
+        }
+    }
+
+    public static void test2() {
+         int k = 0;
+         switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            }
+            case 2:
+                 int x = 2;
+                 break;
+         }
+    }
+
+    public static void test3() {
+         int k = 0;
+         switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            }
+            case 2:{
+                    int x = 2;
+                    break;
+            } }      // violation '}' at column 13 should be alone on a line'
+    }
+
+    public static void test4() {
+        int mode = 0;
+        switch (mode) { case 0: {int x = 1; break;} default : int x = 5; }
+        // violation above '}' at column 51 should be alone on a line'
+    }
+
+    public static void test5() {
+        int mode = 0;
+        switch (mode) { case 0: int x = 1; }
+    }
+
+    public static void test6() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {int x = 1; break;}  // ok , single line
+            default : break;
+        }
+    }
+
+    public static void test7() {
+        int mode = 0;
+        switch (mode) { case 0: {int x = 1;}     // ok, single line
+            break; default : break; }
+    }
+
+    public static void test8() {
+        int mode = 0;
+        switch (mode) {
+            case 0: int x = 1;
+            case 1: x = 1; break;
+            case 2: {x = 1; break;} // ok, single line
+            default : x = 5;
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline2.java
new file mode 100644
index 00000000000..806650c4e11
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline2.java
@@ -0,0 +1,117 @@
+/*
+RightCurly
+option = ALONE_OR_SINGLELINE
+tokens = LITERAL_CASE
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksInSwitchStatementAloneOrSingleline2 {
+
+    public static void test9() {
+        int mode = 0;
+        switch (mode) {
+            case 0: int x = 1;
+            case 1: x = 1; break;
+            case 2: {
+                x =
+            1;} default : x = 5;         // violation '}' at column 15 should be alone on a line'
+        }
+    }
+
+    public static void test10() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: int x = 1; break;    // violation '}' at column 13 should be alone on a line'
+            case 2: {
+
+            }
+            default : x = 5;
+        }
+    }
+     public static void test11() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: int x = 1; break;   // violation '}' at column 13 should be alone on a line'
+            case 2: {
+                int
+            y;} default : x = 5;         // violation '}' at column 15 should be alone on a line'
+        }
+    }
+    public static void test12() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            int x = 1;} case 1: {int x = 1; break;}
+            // violation above '}' at column 23 should be alone on a line'
+        }
+    }
+    public static void test13() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            }
+            case 1: {
+
+            }
+            default : break;
+        }
+    }
+     public static void test14() {
+        int mode = 0;
+        switch (mode) {
+            case 0: { int x = 1;
+
+            } case 1: {  }         // violation '}' at column 13 should be alone on a line'
+            default : {break;}
+        }
+    }
+
+     public static void test15() {
+        int mode = 0;
+        switch (mode) {
+            case 0: int x = 1; { } break;
+            case 1: { } int y = 1; break; // violation '}' at column 23 should be alone on a line'
+
+            case 2: int t = 1; { };
+        }
+    }
+
+    public static void test17() {
+        int mode = 0;
+        switch (mode) {
+            case 0:
+            int x = 1;
+            {  }
+            case 1:
+            mode++;
+            {
+
+            } int y; // ok, the braces is not a first child of case
+            case 3:
+            {
+
+            } int z = 1;  // violation '}' at column 13 should be alone on a line'
+        }
+    }
+
+    public static void test18() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            }
+            case 1:
+            int z;
+            {
+
+            } break; default: break; // ok, the braces is not a first child of case
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementSame.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementSame.java
new file mode 100644
index 00000000000..7007d9954b2
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementSame.java
@@ -0,0 +1,114 @@
+/*
+RightCurly
+option = SAME
+tokens = LITERAL_CASE
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksInSwitchStatementSame {
+    public static void test0() {
+        int mode = 0;
+        switch (mode) {
+            case 1: {
+                int x = 1;
+                break;
+            }
+            case 2: {
+                int x = 0;
+                break;
+            }
+            default: {
+                break;
+            }
+        }
+    }
+
+    public static void test() {
+        int mode = 0;
+        switch (mode) {
+            case 1:{
+                int x
+
+            =1;} default :          // violation '}' at column 16 should have line break before'
+                int x = 0;
+        }
+    }
+
+    public static void test1() {
+        int k = 0;
+        switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            } case 2:        // violation '}' at column 13 should be alone on a line'
+                 int x = 2;
+                 break;
+        }
+    }
+
+    public static void test2() {
+         int k = 0;
+         switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            }
+            case 2:
+                 int x = 2;
+                 break;
+         }
+    }
+
+    public static void test3() {
+         int k = 0;
+         switch (k) {
+            case 1:{
+                 int x = 1;
+                 break;
+            }
+            case 2:{
+                    int x = 2;
+                    break;
+            } }      // violation '}' at column 13 should be alone on a line'
+    }
+
+    public static void test4() {
+        int mode = 0;
+        switch (mode) { case 0: {int x = 1; break;} default : int x = 5; }
+        // violation above '}' at column 51 should be alone on a line'
+    }
+
+    public static void test5() {
+        int mode = 0;
+        switch (mode) { case 0: int x = 1;}
+    }
+
+    public static void test6() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {int x = 1; break;}  // ok , single line
+            default : break;
+        }
+    }
+
+    public static void test7() {
+        int mode = 0;
+        switch (mode) { case 0: {int x = 1;}     // ok, single line
+            break; default : break; }
+    }
+
+    public static void test8() {
+        int mode = 0;
+        int x = 0;
+        switch (mode) {
+            case 0:{
+            int y = 1;} // violation '}' at column 23 should have line break before'
+            case 1: {x = 1;
+            }
+            case 2: {x = 1; break;} // ok, single line
+            default : x = 5;
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementSame2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementSame2.java
new file mode 100644
index 00000000000..2f48cf130e3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyCaseBlocksInSwitchStatementSame2.java
@@ -0,0 +1,119 @@
+/*
+RightCurly
+option = SAME
+tokens = LITERAL_CASE
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+public class InputRightCurlyCaseBlocksInSwitchStatementSame2 {
+
+     public static void test9() {
+        int mode = 0;
+        switch (mode) {
+            case 0: int x = 1;
+            case 1: x = 1; break;
+            case 2: {
+                x = 1; break;
+            } default : x = 5;         // violation '}' at column 13 should be alone on a line'
+        }
+    }
+
+    public static void test10() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: int x = 1; break;    // violation '}' at column 13 should be alone on a line'
+            case 2: {
+
+            }
+            default : x = 5;
+        }
+    }
+     public static void test11() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: int x = 1; break;   // violation '}' at column 13 should be alone on a line'
+            case 2: {
+
+            } default : x = 5;            // violation '}' at column 13 should be alone on a line'
+        }
+    }
+    public static void test12() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: {int x = 1; break;} // violation '}' at column 13 should be alone on a line'
+        }
+    }
+    public static void test13() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            }
+            case 1: {
+
+            }
+            default : break;
+        }
+    }
+     public static void test14() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+
+            } case 1: {  }         // violation '}' at column 13 should be alone on a line'
+            default : {break;}
+        }
+    }
+
+    public static void test15() {
+        int mode = 0;
+        switch (mode) {case 0: { } case 1: {  } } // 2 violations
+
+    }
+
+    public static void test16() {
+        int mode = 0;
+        switch (mode) {
+            case 0: int x = 1; { } break;
+            case 1: { } int y = 1; break; // violation '}' at column 23 should be alone on a line'
+
+            case 2: int t = 1; { };
+        }
+    }
+    public static void test17() {
+        int mode = 0;
+        switch (mode) {
+            case 0:
+            int x = 1;
+            {  }
+            case 1:
+            mode++;
+            {
+            } int y; // ok, the braces is not a first child of case
+            case 3:
+            {
+
+            } int z = 1; // violation '}' at column 13 should be alone on a line'
+        }
+    }
+    public static void test18() {
+        int mode = 0;
+        switch (mode) {
+            case 0: {
+            }
+            int x;
+            case 1:
+            int z;
+            {
+
+            } break; default: break; // ok, the braces is not a first child of case
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestAlone.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestAlone.java
index 89393095fcf..7fc531e6b02 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestAlone.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestAlone.java
@@ -84,7 +84,7 @@ public enum GreetingsEnum
     {
         HELLO,
         GOODBYE
-    }; // ok
+    };
 
     void method2()
     {
@@ -109,7 +109,7 @@ class FooCtorTestAlone
         public void FooCtor()
     {
                 i = 1;
-    }} // ok
+    }}
 
 /**
 * Test input for closing brace if that brace terminates
@@ -120,7 +120,7 @@ class FooMethodTestAlone
         public void fooMethod()
     {
                 int i = 1;
-    }} // ok
+    }}
 
 /**
 * Test input for closing brace if that brace terminates
@@ -134,7 +134,7 @@ public void fooInnerMethod ()
         {
 
                 }
-    }} // ok
+    }}
 
 /**
  * False positive
@@ -142,17 +142,17 @@ public void fooInnerMethod ()
  */
 class Absent_CustomFieldSerializer3TestAlone {
 
-    public static void serialize() {} // ok
+    public static void serialize() {}
 }
 
 class Absent_CustomFieldSerializer4TestAlone
 {
-    public void Absent_CustomFieldSerializer4() {} // ok
+    public void Absent_CustomFieldSerializer4() {}
 }
 
-class EmptyClass2TestAlone {} // ok
+class EmptyClass2TestAlone {}
 
-interface EmptyInterface3TestAlone {} // ok
+interface EmptyInterface3TestAlone {}
 
 class ClassWithStaticInitializersTestAlone
 {
@@ -196,19 +196,19 @@ public void codeAfterLastRightCurly() {
         @Override
         public Thread newThread(final Runnable r) {
             return new Thread(r);
-        }}; // ok
+        }};
 
     interface Interface1
     {
         int i = 1;
-        public void meth1(); } // ok
+        public void meth1(); }
 
     interface Interface2
-    { int i = 1; public void meth1(); } // ok
+    { int i = 1; public void meth1(); }
 
     interface Interface3 {
         void display();
         interface Interface4 {
             void myMethod();
-        }} // ok
+        }}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestDefault.java
index ca8f2433fcd..6d1913e228e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestDefault.java
@@ -53,7 +53,7 @@ else if (x < 0) {
             do
             {
                 x = 2;
-            } while (x == 2); // ok
+            } while (x == 2);
         }
 
         this.wait(666
@@ -83,7 +83,7 @@ public enum GreetingsEnum
     {
         HELLO,
         GOODBYE
-    }; // ok
+    };
 
     void method2()
     {
@@ -94,7 +94,7 @@ void method2()
                 CASE_INSENSITIVE_ORDER.equals("Xe-xe");
         // it is ok to have rcurly on the same line as previous
         // statement if lcurly on the same line.
-        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } // ok
+        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); }
     }
 }
 
@@ -108,7 +108,7 @@ class FooCtor
         public FooCtor()
     {
                 i = 1;
-    }} // ok
+    }}
 
 /**
 * Test input for closing brace if that brace terminates
@@ -119,7 +119,7 @@ class FooMethod
         public void fooMethod()
     {
                 int i = 1;
-    }} // ok
+    }}
 
 /**
 * Test input for closing brace if that brace terminates
@@ -133,7 +133,7 @@ public void fooInnerMethod ()
         {
 
                 }
-    }} // ok
+    }}
 
 /**
  * False positive
@@ -141,17 +141,17 @@ public void fooInnerMethod ()
  */
 class Absent_CustomFieldSerializer3 {
 
-    public static void serialize() {} // ok
+    public static void serialize() {}
 }
 
 class Absent_CustomFieldSerializer4
 {
-    public Absent_CustomFieldSerializer4() {} // ok
+    public Absent_CustomFieldSerializer4() {}
 }
 
-class EmptyClass2 {} // ok
+class EmptyClass2 {}
 
-interface EmptyInterface3 {} // ok
+interface EmptyInterface3 {}
 
 class ClassWithStaticInitializers
 {
@@ -170,23 +170,23 @@ static class Inner
     public void emptyBlocks() {
         try {
             // comment
-        } catch (RuntimeException e) { // ok
+        } catch (RuntimeException e) {
             new Object();
-        } catch (Exception e) { // ok
+        } catch (Exception e) {
             // comment
-        } catch (Throwable e) { // ok
-        } finally { // ok
+        } catch (Throwable e) {
+        } finally {
             // comment
         }
 
         do {
-        } while (true); // ok
+        } while (true);
     }
 
     public void codeAfterLastRightCurly() {
         while (new Object().equals(new Object())) {
-        }; // ok
-        for (int i = 0; i < 1; i++) { new Object(); }; // ok
+        };
+        for (int i = 0; i < 1; i++) { new Object(); };
     }
 
     static final java.util.concurrent.ThreadFactory threadFactory
@@ -194,19 +194,19 @@ public void codeAfterLastRightCurly() {
         @Override
         public Thread newThread(final Runnable r) {
             return new Thread(r);
-        }}; // ok
+        }};
 
     interface Interface1
     {
         int i = 1;
-        public void meth1(); } // ok
+        public void meth1(); }
 
     interface Interface2
-    { int i = 1; public void meth1(); } // ok
+    { int i = 1; public void meth1(); }
 
     interface Interface3 {
         void display();
         interface Interface4 {
             void myMethod();
-        }} // ok
+        }}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestNewLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestNewLine.java
index b15e13a3174..d920fff2fac 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestNewLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestNewLine.java
@@ -22,10 +22,10 @@ int foo() throws InterruptedException
                 if (x > 0)
                 {
                     break;
-                } // ok
+                }
                 else if (x < 0) {
                     ;
-                } // ok
+                }
                 else
                 {
                     break;
@@ -37,11 +37,11 @@ else if (x < 0) {
                 default:
                     break;
                 }
-            } // ok
+            }
             catch (Exception e)
             {
                 break;
-            } // ok
+            }
             finally
             {
                 break;
@@ -53,7 +53,7 @@ else if (x < 0) {
             do
             {
                 x = 2;
-            } while (x == 2); // ok
+            } while (x == 2);
         }
 
         this.wait(666
@@ -90,11 +90,11 @@ void method2()
         boolean flag = true;
         if (flag) {
             System.identityHashCode("heh");
-            flag = !flag; } String.CASE_INSENSITIVE_ORDER. // ok
+            flag = !flag; } String.CASE_INSENSITIVE_ORDER.
               equals("Xe-xe");
         // it is ok to have rcurly on the same line as previous
         // statement if lcurly on the same line.
-        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } // ok
+        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); }
     }
 }
 
@@ -170,23 +170,23 @@ static class Inner
     public void emptyBlocks() {
         try {
             // comment
-        } catch (RuntimeException e) { // ok
+        } catch (RuntimeException e) {
             new Object();
-        } catch (Exception e) { // ok
+        } catch (Exception e) {
             // comment
-        } catch (Throwable e) { // ok
-        } finally { // ok
+        } catch (Throwable e) {
+        } finally {
             // comment
         }
 
         do {
-        } while (true); // ok
+        } while (true);
     }
 
     public void codeAfterLastRightCurly() {
         while (new Object().equals(new Object())) {
-        }; // ok
-        for (int i = 0; i < 1; i++) { new Object(); }; // ok
+        };
+        for (int i = 0; i < 1; i++) { new Object(); };
     }
 
     static final java.util.concurrent.ThreadFactory threadFactory
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestSame.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestSame.java
index 403715a75ed..1a07243b81f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestSame.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestSame.java
@@ -54,7 +54,7 @@ else if (x < 0) {
             do
             {
                 x = 2;
-            } while (x == 2); // ok
+            } while (x == 2);
         }
 
         this.wait(666
@@ -95,7 +95,7 @@ void method2()
                 CASE_INSENSITIVE_ORDER.equals("Xe-xe");
         // it is ok to have rcurly on the same line as previous
         // statement if lcurly on the same line.
-        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } // ok
+        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); }
     }
 }
 
@@ -109,7 +109,7 @@ class FooCtorTestSame
         public void FooCtor()
     {
                 i = 1;
-    }} // ok
+    }}
 
 /**
 * Test input for closing brace if that brace terminates
@@ -120,7 +120,7 @@ class FooMethodTestSame
         public void fooMethod()
     {
                 int i = 1;
-    }} // ok
+    }}
 
 /**
 * Test input for closing brace if that brace terminates
@@ -134,7 +134,7 @@ public void fooInnerMethod ()
         {
 
                 }
-    }} // ok
+    }}
 
 /**
  * False positive
@@ -142,17 +142,17 @@ public void fooInnerMethod ()
  */
 class Absent_CustomFieldSerializer3TestSame {
 
-    public static void serialize() {} // ok
+    public static void serialize() {}
 }
 
 class Absent_CustomFieldSerializer4TestSame
 {
-    public void Absent_CustomFieldSerializer4() {} // ok
+    public void Absent_CustomFieldSerializer4() {}
 }
 
-class EmptyClass2TestSame {} // ok
+class EmptyClass2TestSame {}
 
-interface EmptyInterface3TestSame {} // ok
+interface EmptyInterface3TestSame {}
 
 class ClassWithStaticInitializersTestSame
 {
@@ -171,17 +171,17 @@ static class Inner
     public void emptyBlocks() {
         try {
             // comment
-        } catch (RuntimeException e) { // ok
+        } catch (RuntimeException e) {
             new Object();
-        } catch (Exception e) { // ok
+        } catch (Exception e) {
             // comment
-        } catch (Throwable e) { // ok
-        } finally { // ok
+        } catch (Throwable e) {
+        } finally {
             // comment
         }
 
         do {
-        } while (true); // ok
+        } while (true);
     }
 
     public void codeAfterLastRightCurly() {
@@ -195,19 +195,19 @@ public void codeAfterLastRightCurly() {
         @Override
         public Thread newThread(final Runnable r) {
             return new Thread(r);
-        }}; // ok
+        }};
 
     interface Interface1
     {
         int i = 1;
-        public void meth1(); } // ok
+        public void meth1(); }
 
     interface Interface2
-    { int i = 1; public void meth1(); } // ok
+    { int i = 1; public void meth1(); }
 
     interface Interface3 {
         void display();
         interface Interface4 {
             void myMethod();
-        }} // ok
+        }}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestShouldStartLine2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestShouldStartLine2.java
index 0dd17538815..61cd340a9ab 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestShouldStartLine2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyLeftTestShouldStartLine2.java
@@ -22,10 +22,10 @@ int foo() throws InterruptedException
                 if (x > 0)
                 {
                     break;
-                } // ok
+                }
                 else if (x < 0) {
                     ;
-                } // ok
+                }
                 else
                 {
                     break;
@@ -37,11 +37,11 @@ else if (x < 0) {
                 default:
                     break;
                 }
-            } // ok
+            }
             catch (Exception e)
             {
                 break;
-            } // ok
+            }
             finally
             {
                 break;
@@ -53,7 +53,7 @@ else if (x < 0) {
             do
             {
                 x = 2;
-            } while (x == 2); // ok
+            } while (x == 2);
         }
 
         this.wait(666
@@ -90,11 +90,11 @@ void method2()
         boolean flag = true;
         if (flag) {
             System.identityHashCode("heh");
-            flag = !flag; } String.CASE_INSENSITIVE_ORDER. // ok
+            flag = !flag; } String.CASE_INSENSITIVE_ORDER.
               equals("Xe-xe");
         // it is ok to have rcurly on the same line as previous
         // statement if lcurly on the same line.
-        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); } // ok
+        if (flag) { String.CASE_INSENSITIVE_ORDER.equals("it is ok."); }
     }
 }
 
@@ -141,17 +141,17 @@ public void fooInnerMethod ()
  */
 class Absent_CustomFieldSerializer3TestShouldStartLine2 {
 
-    public static void serialize() {} // ok
+    public static void serialize() {}
 }
 
 class Absent_CustomFieldSerializer4TestShouldStartLine2
 {
-    public void Absent_CustomFieldSerializer4() {} // ok
+    public void Absent_CustomFieldSerializer4() {}
 }
 
-class EmptyClass2TestShouldStartLine2 {} // ok
+class EmptyClass2TestShouldStartLine2 {}
 
-interface EmptyInterface3TestShouldStartLine2 {} // ok
+interface EmptyInterface3TestShouldStartLine2 {}
 
 class ClassWithStaticInitializersTestShouldStartLine2
 {
@@ -170,23 +170,23 @@ static class Inner
     public void emptyBlocks() {
         try {
             // comment
-        } catch (RuntimeException e) { // ok
+        } catch (RuntimeException e) {
             new Object();
-        } catch (Exception e) { // ok
+        } catch (Exception e) {
             // comment
-        } catch (Throwable e) { // ok
-        } finally { // ok
+        } catch (Throwable e) {
+        } finally {
             // comment
         }
 
         do {
-        } while (true); // ok
+        } while (true);
     }
 
     public void codeAfterLastRightCurly() {
         while (new Object().equals(new Object())) {
-        }; // ok
-        for (int i = 0; i < 1; i++) { new Object(); }; // ok
+        };
+        for (int i = 0; i < 1; i++) { new Object(); };
     }
 
     static final java.util.concurrent.ThreadFactory threadFactory
@@ -202,7 +202,7 @@ interface Interface1
         public void meth1(); } // violation ''}' at column 30 should be alone on a line'
 
     interface Interface2
-    { int i = 1; public void meth1(); } // ok
+    { int i = 1; public void meth1(); }
 
     interface Interface3 {
         void display();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyNewTokensAloneOrSingleLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyNewTokensAloneOrSingleLine.java
index e0cd9370a0c..2a3baa0ca07 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyNewTokensAloneOrSingleLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyNewTokensAloneOrSingleLine.java
@@ -10,12 +10,12 @@
 
 public class InputRightCurlyNewTokensAloneOrSingleLine {
 
-    enum TestEnum{} // ok
+    enum TestEnum{}
 
     enum TestEnum1{
         SOME_VALUE;} // violation ''}' at column 20 should be alone on a line'
 
-    enum TestEnum2 { SOME_VALUE; } // ok
+    enum TestEnum2 { SOME_VALUE; }
 
     enum TestEnum3{
         SOME_VALUE;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestAloneOrSinglelineTryCatchBlock.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestAloneOrSinglelineTryCatchBlock.java
new file mode 100644
index 00000000000..c84291afe7f
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestAloneOrSinglelineTryCatchBlock.java
@@ -0,0 +1,30 @@
+/*
+RightCurly
+option = ALONE_OR_SINGLELINE
+tokens = LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+
+public class InputRightCurlyTestAloneOrSinglelineTryCatchBlock {
+
+     private void foo() {
+
+            try {
+                int i = 5; int b = 10;
+            }
+            catch (Exception e) { }
+     }
+     private void testSingleLineTryBlock() {
+         try { } catch (Exception e) { }
+         try {int x = 5;} catch (RuntimeException e) { } catch (Exception e) { }
+         try { } catch (RuntimeException e) { } catch (Exception e) { } finally { foo();}
+         try (BufferedReader br1 = new BufferedReader(null)) {} catch (IOException e) { ; }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestEmptyOnSingleLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestEmptyOnSingleLine.java
index 4989b529f6d..78cf675815c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestEmptyOnSingleLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestEmptyOnSingleLine.java
@@ -9,4 +9,4 @@
 
 package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
 
-public class InputRightCurlyTestEmptyOnSingleLine {} // ok
+public class InputRightCurlyTestEmptyOnSingleLine {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestForceLineBreakBefore2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestForceLineBreakBefore2.java
index 8c423d7f12d..eaa204750ba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestForceLineBreakBefore2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestForceLineBreakBefore2.java
@@ -35,19 +35,19 @@ int foo() throws InterruptedException
             } catch (Exception e) { break; } finally { break; }
         }
 
-        synchronized (this) { do { x = 2; } while (x == 2); } // ok
+        synchronized (this) { do { x = 2; } while (x == 2); }
 
         synchronized (this) {
-            do {} while (x == 2); // ok
+            do {} while (x == 2);
         }
 
-        for (int k = 0; k < 1; k++) { String innerBlockVariable = ""; } // ok
+        for (int k = 0; k < 1; k++) { String innerBlockVariable = ""; }
 
-        for (int k = 0; k < 1; k++) {} // ok
+        for (int k = 0; k < 1; k++) {}
                 return a;
     }
 
-    static { int x = 1; } // ok
+    static { int x = 1; }
 
     void method2()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestInvalidOption.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestInvalidOption.java
index c2fce344378..f34edd56548 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestInvalidOption.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestInvalidOption.java
@@ -16,7 +16,7 @@ void foo() throws InterruptedException
             try
             {
 
-            } // ok
+            }
             catch (Exception e)
             {
                 return;
@@ -26,4 +26,4 @@ void foo() throws InterruptedException
 
     }
 
-class UniqEmptyClassTestInvalidOption {private int a;} // ok
+class UniqEmptyClassTestInvalidOption {private int a;}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneLambda.java
index 205c345001d..e16d82feae3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneLambda.java
@@ -19,10 +19,10 @@ public class InputRightCurlyTestIsAloneLambda {
 
     static Runnable r2 = () -> String.valueOf("Test rightCurly two!");
 
-    static Runnable r3 = () -> {String.valueOf("Test rightCurly three!");}; // ok
+    static Runnable r3 = () -> {String.valueOf("Test rightCurly three!");};
 
     static Runnable r4 = () -> {
-        String.valueOf("Test rightCurly four!");}; // ok
+        String.valueOf("Test rightCurly four!");};
 
     static Runnable r5 = () ->
     {
@@ -40,7 +40,7 @@ public class InputRightCurlyTestIsAloneLambda {
 
     static Runnable r9 = () -> {
         String.valueOf("Test rightCurly nine!");
-    }; int i; // ok
+    }; int i;
 
     void foo1() {
         Stream.of("Hello").filter(s -> {
@@ -50,6 +50,6 @@ void foo1() {
 
         Stream.of("Hello").filter(s -> {
                 return s != null;
-        }).collect(Collectors.toList()); // ok
+        }).collect(Collectors.toList());
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneOrSinglelineLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneOrSinglelineLambda.java
index d0007d24962..431838f844a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneOrSinglelineLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsAloneOrSinglelineLambda.java
@@ -22,7 +22,7 @@ public class InputRightCurlyTestIsAloneOrSinglelineLambda {
     static Runnable r3 = () -> {String.valueOf("Test rightCurly three!");};
 
     static Runnable r4 = () -> {
-        String.valueOf("Test rightCurly four!");}; // ok
+        String.valueOf("Test rightCurly four!");};
 
     static Runnable r5 = () ->
     {
@@ -40,7 +40,7 @@ public class InputRightCurlyTestIsAloneOrSinglelineLambda {
 
     static Runnable r9 = () -> {
         String.valueOf("Test rightCurly nine!");
-    }; int i; // ok
+    }; int i;
 
     void foo1() {
         Stream.of("Hello").filter(s -> {
@@ -50,8 +50,8 @@ void foo1() {
 
         Stream.of("Hello").filter(s -> {
                 return s != null;
-        }).collect(Collectors.toList()); // ok
+        }).collect(Collectors.toList());
 
-        Stream.of("H").filter(s -> {return s != null;}).collect(Collectors.toList()); // ok
+        Stream.of("H").filter(s -> {return s != null;}).collect(Collectors.toList());
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsSameLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsSameLambda.java
index 68c46c83bd5..f4e91ace0a2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsSameLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestIsSameLambda.java
@@ -22,7 +22,7 @@ public class InputRightCurlyTestIsSameLambda {
     static Runnable r3 = () -> {String.valueOf("Test rightCurly three!");};
 
     static Runnable r4 = () -> {
-        String.valueOf("Test rightCurly four!");}; // ok
+        String.valueOf("Test rightCurly four!");};
 
     static Runnable r5 = () ->
     {
@@ -40,12 +40,12 @@ public class InputRightCurlyTestIsSameLambda {
 
     static Runnable r9 = () -> {
         String.valueOf("Test rightCurly nine!");
-    }; int i; // ok
+    }; int i;
 
     void foo1() {
         Stream.of("Hello").filter(s -> {
                 return s != null;
-            } // ok
+            }
         ).collect(Collectors.toList());
 
         Stream.of("Hello").filter(s -> {
@@ -58,7 +58,7 @@ void foo1() {
         Stream.of("Hello").filter(s -> {return s != null;}).collect(Collectors.toList());
 
         Stream.of("Hello").filter(s -> {
-            return s != null;}).collect(Collectors.toList()); // ok
+            return s != null;}).collect(Collectors.toList());
 
         bar(() -> {return;}, () -> {return;});
 
@@ -73,12 +73,12 @@ void foo1() {
         });
 
         bar(() -> {
-            return;}, () -> {return;}); // ok
+            return;}, () -> {return;});
 
         bar(() -> {
             return;
         }, () -> {
-            return;}); // ok
+            return;});
 
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestNullPointerException.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestNullPointerException.java
index aa083b9941b..dcd82676f33 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestNullPointerException.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestNullPointerException.java
@@ -16,4 +16,4 @@ abstract class InputRightCurlyTestNullPointerException {
     void foo() {
         while (true);
     }
-} // ok
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java
index 8a2a3df155e..bdcea95c833 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi.java
@@ -10,18 +10,18 @@
 
 public class InputRightCurlyTestOptAloneOrSingleLineBlocksWithSemi {
 
-    public void testMethod() {}; // ok
+    public void testMethod() {};
 
     public void testMethod1() {
     }; // violation ''}' at column 5 should be alone on a line'
 
-    public class TestClass {}; // ok
+    public class TestClass {};
 
     public class TestClass1 {
     }; // violation ''}' at column 5 should be alone on a line'
 
     public class TestClass2 {
-        public TestClass2() {}; // ok
+        public TestClass2() {};
 
         public TestClass2(String someValue) {
         }; // violation ''}' at column 9 should be alone on a line'
@@ -34,7 +34,7 @@ public void testMethod11() {
     public @interface TestAnnnotation5 {
         String someValue(); }; // violation ''}' at column 29 should be alone on a line'
 
-    public @interface TestAnnotation6 {}; // ok
+    public @interface TestAnnotation6 {};
 
     public @interface TestAnnotation7 {
         String someValue();
@@ -43,14 +43,14 @@ public void testMethod11() {
     public @interface TestAnnotation8 { String someValue();
     }; // violation ''}' at column 5 should be alone on a line'
 
-    public @interface TestAnnotation9 { String someValue(); }; // ok
+    public @interface TestAnnotation9 { String someValue(); };
 
-    enum TestEnum{}; // ok
+    enum TestEnum{};
 
     enum TestEnum1{
         SOME_VALUE;}; // violation ''}' at column 20 should be alone on a line'
 
-    enum TestEnum2 { SOME_VALUE; }; // ok
+    enum TestEnum2 { SOME_VALUE; };
 
     enum TestEnum3{
         SOME_VALUE;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptSameBlocksWithSemi.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptSameBlocksWithSemi.java
index a129356a609..6f532cdfc1a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptSameBlocksWithSemi.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptSameBlocksWithSemi.java
@@ -10,18 +10,18 @@
 
 public class InputRightCurlyTestOptSameBlocksWithSemi {
 
-    public void testMethod() {}; // ok
+    public void testMethod() {};
 
     public void testMethod1() {
     }; // violation ''}' at column 5 should be alone on a line'
 
-    public class TestClass {}; // ok
+    public class TestClass {};
 
     public class TestClass1 {
     }; // violation ''}' at column 5 should be alone on a line'
 
     public class TestClass2 {
-        public TestClass2() {}; // ok
+        public TestClass2() {};
 
         public TestClass2(String someValue) {
         }; // violation ''}' at column 9 should be alone on a line'
@@ -34,7 +34,7 @@ public void testMethod11() {
     public @interface TestAnnnotation5 {
         String someValue(); }; // violation ''}' at column 29 should have line break before'
 
-    public @interface TestAnnotation6 {}; // ok
+    public @interface TestAnnotation6 {};
 
     public @interface TestAnnotation7 {
         String someValue();
@@ -43,14 +43,14 @@ public void testMethod11() {
     public @interface TestAnnotation8 { String someValue();
     }; // violation ''}' at column 5 should be alone on a line'
 
-    public @interface TestAnnotation9 { String someValue(); }; // ok
+    public @interface TestAnnotation9 { String someValue(); };
 
-    enum TestEnum{}; // ok
+    enum TestEnum{};
 
     enum TestEnum1{
         SOME_VALUE;}; // violation ''}' at column 20 should have line break before'
 
-    enum TestEnum2 { SOME_VALUE; }; // ok
+    enum TestEnum2 { SOME_VALUE; };
 
     enum TestEnum3{
         SOME_VALUE;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAlone.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAlone.java
index c3cba245a68..ff8774faf76 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAlone.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAlone.java
@@ -35,7 +35,7 @@ void method2(java.util.HashSet<String> set) {
             put("first", "second");
             put("polygene", "lubricants");
             put("alpha", "betical");
-        }}; // ok
+        }};
     }
 
     void method3() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAloneOrSingleLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAloneOrSingleLine.java
index 236e6fb045f..5ce8b941355 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAloneOrSingleLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestOptionAloneOrSingleLine.java
@@ -13,8 +13,8 @@ public class InputRightCurlyTestOptionAloneOrSingleLine {
 
     private int a;
     private static int b;
-    {  a = 2; } // ok
-    static { b = 3; } // ok
+    {  a = 2; }
+    static { b = 3; }
 
     void method1() {
         Thread t = new Thread() {@Override public void run() {
@@ -51,15 +51,15 @@ int method4(int a) {
         if (a>2) a*=10; return ++a; } // violation ''}' at column 37 should be alone on a line'
 
     void method5(int a) {
-        while (a > 5) { a--; } // ok
+        while (a > 5) { a--; }
 
-        if (a > 4) { a++; } // ok
+        if (a > 4) { a++; }
 
-        do {a--;} while (a > 3); // ok
+        do {a--;} while (a > 3);
 
-        for (int i = 1; i < 10; i++) { byte b = 10; } // ok
+        for (int i = 1; i < 10; i++) { byte b = 10; }
 
-        if (a < 2) { --a; } else if (a > 3) { a++; } // ok
+        if (a < 2) { --a; } else if (a > 3) { a++; }
 
         java.util.List<String> list = new java.util.ArrayList<>();
         list.stream()
@@ -77,7 +77,7 @@ interface Interface1
         public void meth1(); } // violation ''}' at column 30 should be alone on a line'
 
     interface Interface2
-    { int i = 1; public void meth1(); } // ok
+    { int i = 1; public void meth1(); }
 
     interface Interface3 {
         void display();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSame.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSame.java
index cab68438e44..1c6928a159b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSame.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSame.java
@@ -21,7 +21,7 @@ public InputRightCurlyTestSame() {
             @Override
             public void run() {
             }
-        }); // ok
+        });
     }
 
     public void doLoop() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameNewTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameNewTokens.java
index 6db8041619b..1691fc8bd3f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameNewTokens.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameNewTokens.java
@@ -10,12 +10,12 @@
 
 public class InputRightCurlyTestSameNewTokens {
 
-    enum TestEnum{} // ok
+    enum TestEnum{}
 
     enum TestEnum1{
         SOME_VALUE;} // violation ''}' at column 20 should have line break before'
 
-    enum TestEnum2 { SOME_VALUE; } // ok
+    enum TestEnum2 { SOME_VALUE; }
 
     enum TestEnum3{
         SOME_VALUE;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameOmitOneLiners.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameOmitOneLiners.java
index f6460e85a58..dae5bfce327 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameOmitOneLiners.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSameOmitOneLiners.java
@@ -16,6 +16,6 @@ public class InputRightCurlyTestSameOmitOneLiners {
     public static void main(String[] args) {
         boolean after = false;
         try {
-        } finally { after = true; } // ok
+        } finally { after = true; }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSingleLineClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSingleLineClass.java
index 7851c524649..158732a570e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSingleLineClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSingleLineClass.java
@@ -16,7 +16,7 @@ void foo() throws InterruptedException
             try
             {
 
-            } // ok
+            }
             catch (Exception e)
             {
                 return;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase.java
index 585f4f63a30..58c2430a421 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase.java
@@ -35,7 +35,7 @@ public static void method2() {
                 break;
             default:
                 x = 0;
-        } // ok
+        }
     }
 
     public static void method3() {
@@ -43,7 +43,7 @@ public static void method3() {
         switch (mode) {
         default :
                int x = 0;
-        } // ok
+        }
     }
 
     public static void method4() {
@@ -55,13 +55,13 @@ public static void method4() {
     public static void method5() {
         int mode = 0;
         switch (mode) { default : int x = 0;
-        } // ok
+        }
     }
 
     public static void method6() {
         int mode = 0;
         switch (mode) { case 0: int x = 1; break; default : x = 5;
-        } // ok
+        }
     }
 
     public static void method7() {
@@ -79,13 +79,13 @@ public static void method8() {
     public static void method9() {
         int mode = 0;
         switch (mode) { case 0: int x = 1; break; default : x = 5;
-        } // ok
+        }
     }
 
     public static void method10() {
         int mode = 0;
         switch (mode) { case 0: int x = 1; break; case 80: x = 1; break;
-        } // ok
+        }
     }
 
     public static void method11() {
@@ -115,6 +115,6 @@ public static void method12() {
         }
         switch (x) {}; // violation ''}' at column 21 should be alone on a line'
         switch (x) {
-        } // ok
+        }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase2.java
index 9d332138035..534497db1f9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase2.java
@@ -35,7 +35,7 @@ public static void method2() {
                 break;
             default:
                 x = 0;
-        } // ok
+        }
     }
 
     public static void method3() {
@@ -43,46 +43,46 @@ public static void method3() {
         switch (mode) {
         default :
                int x = 0;
-        } // ok
+        }
     }
 
     public static void method4() {
         int mode = 0;
-        switch (mode) { default : int x = 0; } // ok
+        switch (mode) { default : int x = 0; }
     }
 
     public static void method5() {
         int mode = 0;
         switch (mode) { default : int x = 0;
-        } // ok
+        }
     }
 
     public static void method6() {
         int mode = 0;
         switch (mode) { case 0: int x = 1; break; default : x = 5;
-        } // ok
+        }
     }
 
     public static void method7() {
         int mode = 0;
-        switch (mode) { case 0: int x = 1; break; default : x = 5; } // ok
+        switch (mode) { case 0: int x = 1; break; default : x = 5; }
     }
 
     public static void method8() {
         int mode = 0;
-        switch (mode) { case 0: int x = 1; break; case 80: x = 1; break; } // ok
+        switch (mode) { case 0: int x = 1; break; case 80: x = 1; break; }
     }
 
     public static void method9() {
         int mode = 0;
         switch (mode) { case 0: int x = 1; break; default : x = 5;
-        } // ok
+        }
     }
 
     public static void method10() {
         int mode = 0;
         switch (mode) { case 0: int x = 1; break; case 80: x = 1; break;
-        } // ok
+        }
     }
 
     public static void method11() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase3.java
index 0c056eec3b7..3e92bab391c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase3.java
@@ -19,7 +19,7 @@ public void method() {
             case(1): x = 0; break; } // violation ''}' at column 36 should be alone on a line'
         switch (x)
         {
-        } // ok
+        }
         switch (x)
         {case(1): x=1;break;
         } int b; // violation ''}' at column 9 should be alone on a line'
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase4.java
index b3ccf2f5932..fd22508a003 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase4.java
@@ -12,21 +12,21 @@ public class InputRightCurlyTestSwitchCase4 {
 
     public void method() {
         int x = 0;
-        switch (x) { } // ok
+        switch (x) { }
         switch (x) {
         } int a; // violation ''}' at column 9 should be alone on a line'
         switch (x) {
             case(1): x = 0; break; } // violation ''}' at column 36 should be alone on a line'
         switch (x)
         {
-        } // ok
+        }
         switch (x)
         {case(1): x=1;break;
         } int b; // violation ''}' at column 9 should be alone on a line'
         switch (x) {case(2): break; } int c;
         // violation above ''}' at column 37 should be alone on a line'
         switch (x) { } int d; // violation ''}' at column 22 should be alone on a line'
-        switch (x) { } // ok
+        switch (x) { }
     }
 
     public void someMethod2() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase5.java
index 945376d5c3e..b42bf65bd58 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestSwitchCase5.java
@@ -12,21 +12,21 @@ public class InputRightCurlyTestSwitchCase5 {
 
     public void method() {
         int x = 0;
-        switch (x) { } // ok
+        switch (x) { }
         switch (x) {
         } int a; // violation ''}' at column 9 should be alone on a line'
         switch (x) {
             case(1): x = 0; break; } // violation ''}' at column 36 should have line break before'
         switch (x)
         {
-        } // ok
+        }
         switch (x)
         {case(1): x=1;break;
         } int b; // violation ''}' at column 9 should be alone on a line'
         switch (x) {case(2): break; } int c;
         // violation above ''}' at column 37 should be alone on a line'
         switch (x) { } int d; // violation ''}' at column 22 should be alone on a line'
-        switch (x) { } // ok
+        switch (x) { }
     }
 
     public void someMethod2() {
@@ -46,18 +46,18 @@ public void someMethod3() {
 class NoViolationOnInputRightCurlyTestSwitchCase5 {
     public void method() {
         int x = 0;
-        switch (x) { } // ok
-        switch (x) { default: } // ok
-        switch (x) { case(1): x = 0; break; } // ok
+        switch (x) { }
+        switch (x) { default: }
+        switch (x) { case(1): x = 0; break; }
         switch (x)
         {
-        } // ok
+        }
         switch (x)
         {case(1): x=1;break;
         }
         int b;
         switch (x) {case(2): break; }
-        switch (x) { } // ok
+        switch (x) { }
     }
 
     public void someMethod2() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceAlone.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceAlone.java
index 5dee15cb524..aab7e3399bd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceAlone.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceAlone.java
@@ -16,7 +16,7 @@ void test() throws IOException {
         try (BufferedReader br1 = new BufferedReader(null);
                 BufferedReader br2 = new BufferedReader(br1)) {
             ;
-        } // ok
+        }
         catch (IOException e) {
             ;
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceSame.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceSame.java
index 56975fd501d..969bc0a4d0f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceSame.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestTryWithResourceSame.java
@@ -24,22 +24,22 @@ void test() throws IOException {
                 BufferedReader br2 = new BufferedReader(br1))
         {
             ;
-        } catch (IOException e) // ok
+        } catch (IOException e)
         {
             ;
         }
         try (BufferedReader br1 = new BufferedReader(null);
                 // violation below ''}' at column 67 should be on the same line as .*/catch'
                 BufferedReader br2 = new BufferedReader(br1)) { ; }
-        catch (IOException e) { ; } // ok
+        catch (IOException e) { ; }
         try (BufferedReader br1 = new BufferedReader(null);
-                BufferedReader br2 = new BufferedReader(br1)) {} catch (IOException e) { ; } // ok
+                BufferedReader br2 = new BufferedReader(br1)) {} catch (IOException e) { ; }
         try (BufferedReader br1 = new BufferedReader(null);
                 BufferedReader br2 = new BufferedReader(br1)) {
             ;
         }
         try (BufferedReader br1 = new BufferedReader(null);
-                BufferedReader br2 = new BufferedReader(br1)) { ; } // ok
+                BufferedReader br2 = new BufferedReader(br1)) { ; }
         try (BufferedReader br1 = new BufferedReader(null)) {
             ; } // violation ''}' at column 15 should have line break before'
         try (BufferedReader br1 = new BufferedReader(null)) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestWithoutFinally.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestWithoutFinally.java
index f4a2238e811..9699536fe4a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestWithoutFinally.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTestWithoutFinally.java
@@ -26,4 +26,4 @@ void foo() throws InterruptedException
 
     }
 
-class UniqEmptyClassTestWithoutFinally {private int a;} // ok
+class UniqEmptyClassTestWithoutFinally {private int a;}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTryWithResourceAloneSingle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTryWithResourceAloneSingle.java
index 2a08121851d..6b14d6854c7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTryWithResourceAloneSingle.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyTryWithResourceAloneSingle.java
@@ -16,7 +16,7 @@ void test() throws IOException {
         try (BufferedReader br1 = new BufferedReader(null);
                 BufferedReader br2 = new BufferedReader(br1)) {
             ;
-        } // ok
+        }
         catch (IOException e) {
             ;
         }
@@ -29,17 +29,16 @@ void test() throws IOException {
             ;
         }
         try (BufferedReader br1 = new BufferedReader(null);
-                BufferedReader br2 = new BufferedReader(br1)) { ; } // ok
-        catch (IOException e) { ; } // ok
+                BufferedReader br2 = new BufferedReader(br1)) { ; }
+        catch (IOException e) { ; }
         try (BufferedReader br1 = new BufferedReader(null);
-                // violation below ''}' at column 64 should be alone on a line'
                 BufferedReader br2 = new BufferedReader(br1)) {} catch (IOException e) { ; }
         try (BufferedReader br1 = new BufferedReader(null);
                 BufferedReader br2 = new BufferedReader(br1)) {
             ;
         }
         try (BufferedReader br1 = new BufferedReader(null);
-                BufferedReader br2 = new BufferedReader(br1)) { ; } // ok
+                BufferedReader br2 = new BufferedReader(br1)) { ; }
         try (BufferedReader br1 = new BufferedReader(null)) {
             ; } // violation ''}' at column 15 should be alone on a line'
         try (BufferedReader br1 = new BufferedReader(null)) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmoji.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmoji.java
index 951c628275f..330662e5232 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmoji.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmoji.java
@@ -13,11 +13,11 @@ public class InputRightCurlyWithEmoji {
 
     static Runnable r = () -> {
         String.valueOf("Hello world 🥳 🎄 !!");
-    }; // ok
+    };
 
     private void method2() {
         String x = "🎄🤣";
-        { String y = "🎄🤣🎄🤣";} // ok
+        { String y = "🎄🤣🎄🤣";}
         try {
             if (x.equals("🎄🤣")) {
 
@@ -29,7 +29,7 @@ else if (!x.equals("🎄🤣")) {
 
             else {
                 x = "🎄🤣";
-            } // ok
+            }
             switch (x) {
                 case "\uD83C\uDF84\uD83E\uDD23":
                     break;
@@ -41,7 +41,7 @@ else if (!x.equals("🎄🤣")) {
             switch ("🤣") {
                 case "qw": {
                     return;
-                } // ok
+                }
                 default: {
                     return;
                 }
@@ -62,14 +62,14 @@ public void foo3() {
         do {
             i++;
             String.CASE_INSENSITIVE_ORDER.equals(i + " ");
-        } while (a.equals("🧐")); // ok
+        } while (a.equals("🧐"));
     }
 
     String method4(String a) {
         if (a.equals("🎄")) a = "😆"; return "😆🤩"; }
     // violation above ''}' at column 50 should have line break before.'
 
-    public void foo4() {String a = "😆🤩";} // ok
+    public void foo4() {String a = "😆🤩";}
     interface Interface3 {
         void display();
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmojiAloneOrSingleLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmojiAloneOrSingleLine.java
index 27dedde584d..5efec54bf33 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmojiAloneOrSingleLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/InputRightCurlyWithEmojiAloneOrSingleLine.java
@@ -12,8 +12,8 @@
 public class InputRightCurlyWithEmojiAloneOrSingleLine {
     private String a;
     private static String b;
-    {  a = "🧐😏"; } // ok
-    static { b = "😧🤩"; } // ok
+    {  a = "🧐😏"; }
+    static { b = "😧🤩"; }
 
 
     void method2(java.util.HashSet<String> set) {
@@ -30,11 +30,11 @@ String method4(String a) {
         if (a.equals("🎄")) ; return "😆🤩"; }
     // violation above ''}' at column 43 should be alone on a line.'
     void method5(String a, int b) {
-        while ("👈🏻🧐".length() > 5) { ; } // ok
+        while ("👈🏻🧐".length() > 5) { ; }
 
-        if ("👉🏻👉🏼".isEmpty()) { ; } // ok
+        if ("👉🏻👉🏼".isEmpty()) { ; }
 
-        do {b--;} while (a.equals("🤩")); // ok
+        do {b--;} while (a.equals("🤩"));
 
         for (int i = 1; i < 10; i++) {
             if("🎄🎄🎄".charAt(i) == 's') i++; }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidinlineconditionals/InputAvoidInlineConditionals.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidinlineconditionals/InputAvoidInlineConditionals.java
index c13fd8e1c7b..2067057a395 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidinlineconditionals/InputAvoidInlineConditionals.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidinlineconditionals/InputAvoidInlineConditionals.java
@@ -38,10 +38,10 @@ private void testQuestions()
     /** assert statement test */
     public void assertTest()
     {
-        // OK
+
         assert true;
 
-        // OK
+
         assert true : "Whups";
 
         // evil colons, should be OK
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/InputConstructorsDeclarationGrouping.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/InputConstructorsDeclarationGrouping.java
new file mode 100644
index 00000000000..20035f01712
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/InputConstructorsDeclarationGrouping.java
@@ -0,0 +1,130 @@
+/*
+ConstructorsDeclarationGrouping
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.constructorsdeclarationgrouping;
+
+public class InputConstructorsDeclarationGrouping {
+
+    int a;
+
+    int b;
+
+    void foo() {}
+
+    InputConstructorsDeclarationGrouping() {}
+
+    InputConstructorsDeclarationGrouping(String a) {}
+
+    void foo2() {}
+
+    InputConstructorsDeclarationGrouping(int a) {}
+    // violation above 'Constructors should be grouped together.*'
+
+    int abc;
+
+    InputConstructorsDeclarationGrouping(double x) {}
+    // violation above 'Constructors should be grouped together.*'
+
+    private enum InnerEnum1 {
+
+        one;
+
+        int x;
+
+        InnerEnum1() {}
+
+        InnerEnum1(String f) {}
+
+        String str;
+
+        String str2;
+
+        InnerEnum1(int x) {}
+        // violation above 'Constructors should be grouped together.*'
+
+        private abstract class Inner {
+            Inner() {}
+
+            int x;
+
+            String neko;
+
+            Inner(String g) {}
+            // violation above 'Constructors should be grouped together.*'
+        }
+
+        InnerEnum1(double d) {}
+        // violation above 'Constructors should be grouped together.*'
+    }
+
+    InputConstructorsDeclarationGrouping(float x) {}
+    // violation above 'Constructors should be grouped together.*'
+
+    InputConstructorsDeclarationGrouping(long l) {}
+    // violation above 'Constructors should be grouped together.*'
+
+    private class Inner {
+        Inner() {}
+
+        Inner(String str) {}
+
+        // Comments are allowed between constructors.
+        Inner(int x) {}
+    }
+
+    private class Inner2 {
+      Inner2() {}
+
+      Inner2(String str) {}
+
+      int x;
+
+      Inner2(int x) {}
+      // violation above 'Constructors should be grouped together.*'
+
+      String xx;
+
+      Inner2(double d) {}
+      // violation above 'Constructors should be grouped together.*'
+
+      Inner2(float f) {}
+      // violation above 'Constructors should be grouped together.*'
+    }
+
+    InputConstructorsDeclarationGrouping(long l, double d) {}
+    // violation above 'Constructors should be grouped together.*'
+
+    InputConstructorsDeclarationGrouping annoynmous = new InputConstructorsDeclarationGrouping() {
+        int x;
+        void test() {}
+        void test2() {}
+    };
+
+    private enum InnerEnum2 {
+        ONE,TWO,THREE;
+        void test() {}
+        void test2() {}
+        void test3() {}
+    }
+
+    private enum InnerEnum3 {
+        InnerEnum3() {}
+    }
+
+    private enum InnerEnum4 {}
+
+    private class Inner3 {
+        void test() {}
+        void test2() {}
+        void test3() {}
+    }
+
+    private class Inner4 {
+        Inner4() {}
+    }
+
+    private class Inner5 {}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrder2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrder2.java
index 85b05466523..3e2f55b33a9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrder2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/declarationorder/InputDeclarationOrder2.java
@@ -11,12 +11,12 @@
 public class InputDeclarationOrder2 {
     private static char[] sHexChars = {
             '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-            'A', 'B', 'C', 'D', 'E', 'F' }; // ok
+            'A', 'B', 'C', 'D', 'E', 'F' };
 
-    int[] array = new int[] {1, 2, 3}; // ok
+    int[] array = new int[] {1, 2, 3};
 
     int[] array2 = new int[] {
             1, 2, 3
-    }; // ok
+    };
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface.java
index 4b7d1c893f6..29c072f6e73 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface.java
@@ -13,11 +13,11 @@ public interface InputDefaultComesLastDefaultMethodsInInterface {
 
     String toJson(String document);
 
-    default String toJson(Object one) { // ok
+    default String toJson(Object one) {
       return toJson(one, one, one);
     }
 
-    default String toJson(Object one, Object two) { // ok
+    default String toJson(Object one, Object two) {
       return toJson(one, one, two);
     }
   }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface2.java
index ff8bb1b6928..871f37a0a5d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/defaultcomeslast/InputDefaultComesLastDefaultMethodsInInterface2.java
@@ -8,7 +8,7 @@
 package com.puppycrawl.tools.checkstyle.checks.coding.defaultcomeslast;
 
 public interface InputDefaultComesLastDefaultMethodsInInterface2 {
-    default int apply() { // ok
+    default int apply() {
         return 1;
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNull.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNull.java
index 11dcf9e8c59..2ce086bf5be 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNull.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNull.java
@@ -440,7 +440,7 @@ class TestThisWithNotStringInstance {
     MyString notString;
 
     void foo() {
-        this.notString.equals(""); // ok
+        this.notString.equals("");
     }
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullIgnoreCase.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullIgnoreCase.java
index 883bb7b47dc..2de56b1462a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullIgnoreCase.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullIgnoreCase.java
@@ -439,7 +439,7 @@ class TestThisWithNotStringInstance1 {
     MyString1 notString;
 
     void foo() {
-        this.notString.equals(""); // ok
+        this.notString.equals("");
     }
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullSuperClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullSuperClass.java
index 278e2961b63..478c0c1fc01 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullSuperClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullSuperClass.java
@@ -15,7 +15,7 @@ class DerivedClass extends InputEqualsAvoidNullSuperClass {
    protected String classField = "DEF";
 
     void m1() {
-        if (this.stringFromBaseClass.equals("JKHKJ")) { // ok
+        if (this.stringFromBaseClass.equals("JKHKJ")) {
         }
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCode.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCode.java
index 991c0f12ce4..df415565eb5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCode.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCode.java
@@ -6,16 +6,16 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.equalshashcode;
 
-public class InputEqualsHashCode { // ok
-    public boolean notEquals() { // ok
+public class InputEqualsHashCode {
+    public boolean notEquals() {
         return true;
     }
 
-    public boolean equals() { // ok
+    public boolean equals() {
         return false;
     }
 
-    public boolean equals(Object o1) { // ok
+    public boolean equals(Object o1) {
         return false;
     }
 
@@ -23,23 +23,23 @@ private boolean equals(Object o1, Object o2) {
         return false;
     }
 
-    private boolean equals(String s) { // ok
+    private boolean equals(String s) {
         return false;
     }
 
-    protected int notHashCode() { // ok
+    protected int notHashCode() {
         return 1;
     }
 
-    public int hashCode() { // ok
+    public int hashCode() {
         return 1;
     }
 
-    public int hashCode(Object o1) { // ok
+    public int hashCode(Object o1) {
         return 1;
     }
 
-    private int hashCode(Object o1, Object o2) { // ok
+    private int hashCode(Object o1, Object o2) {
         return 1;
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeEqualsParameter.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeEqualsParameter.java
index 6485fa77435..ee3618c02fd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeEqualsParameter.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeEqualsParameter.java
@@ -7,7 +7,7 @@
 package com.puppycrawl.tools.checkstyle.checks.coding.equalshashcode;
 
 public class InputEqualsHashCodeEqualsParameter {
-    public static class TestClass1 { // ok
+    public static class TestClass1 {
         public boolean equals(String o) {
             return true;
         }
@@ -28,7 +28,7 @@ public boolean equals(String o) {
             return false;
         }
     }
-    public static class TestClass4 { // ok
+    public static class TestClass4 {
         public int hashCode() {
             return 1;
         }
@@ -39,7 +39,7 @@ public boolean equals(String o) {
             return false;
         }
     }
-    public static class TestClass5 { // ok
+    public static class TestClass5 {
         public int hashCode() {
             return 1;
         }
@@ -63,7 +63,7 @@ public static boolean equals(Object o, Object o2) {
             return true;
         }
     }
-    public static class TestClass8 { // ok
+    public static class TestClass8 {
         public native int hashCode();
         public native boolean equals(Object o);
     }
@@ -73,7 +73,7 @@ public static class TestClass9 { // violation, no `equals` implementation
     public static class TestClass10 { // violation, no `hashCode` implementation
         public native boolean equals(Object o); // violation 'without .* of 'hashCode()'.'
     }
-    public static abstract class TestClass11 { // ok
+    public static abstract class TestClass11 {
         public abstract int hashCode();
         public abstract boolean equals(Object o);
     }
@@ -89,14 +89,14 @@ public boolean equals(java.lang.Object o) { // violation 'without .* of 'hashCod
             return true;
         }
     }
-    public interface TestClass14 { // ok
+    public interface TestClass14 {
         public int hashCode();
         public boolean equals(Object o);
     }
-    public interface TestClass15 { // ok
+    public interface TestClass15 {
         public boolean equals(Object o);
     }
-    public interface TestClass16 { // ok
+    public interface TestClass16 {
         public int hashCode();
     }
     public class TestClass17 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeSemantic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeSemantic.java
index c874d4b5759..00e68b74170 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeSemantic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/InputEqualsHashCodeSemantic.java
@@ -56,7 +56,7 @@ public boolean equals(int a) // wrong arg type, ok
 
     public class EqualsVsHashCode2
     {
-        public boolean equals(String a) // ok
+        public boolean equals(String a)
         {
             return true;
         }
@@ -64,7 +64,7 @@ public boolean equals(String a) // ok
 
     public class EqualsVsHashCode3
     {
-        public boolean equals(Object a) // ok
+        public boolean equals(Object a)
         {
             return true;
         }
@@ -80,7 +80,7 @@ public class EqualsVsHashCode4
         // in anon inner class
         ByteArrayOutputStream bos1 = new ByteArrayOutputStream()
         {
-            public boolean equals(Object a) // ok
+            public boolean equals(Object a)
             {
                 return true;
             }
@@ -121,7 +121,7 @@ public <A> boolean equals(int a) // wrong arg type, ok even with generics
 
     public class EqualsVsHashCode6
     {
-        public <A> boolean equals(Comparable<A> a) // ok
+        public <A> boolean equals(Comparable<A> a)
         {
             return true;
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java
index 77f4eaa7e2b..5192bd5cbc1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough.java
@@ -13,13 +13,13 @@ public class InputFallThrough
     void method(int i, int j, boolean cond) {
         while (true) {
             switch (i) {
-            case 0: // ok
+            case 0:
             case 1:
                 i++;
                 break;
             case 2:
                 i++;
-            case 3: // violation 'Fall through from previous branch of the switch statement.'
+            case 3: // violation 'Fall\ through from previous branch of the switch statement.'
                 i++;
                 break;
             case 4:
@@ -43,7 +43,7 @@ void method(int i, int j, boolean cond) {
             case 11: {
                 i++;
             }
-            case 12: // violation 'Fall through from previous branch of the switch statement.'
+            case 12: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (false)
                     break;
                 else
@@ -52,13 +52,13 @@ void method(int i, int j, boolean cond) {
                 if (true) {
                     return;
                 }
-            case 14: // violation 'Fall through from previous branch of the switch statement.'
+            case 14: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (true) {
                     return;
                 } else {
                     //do nothing
                 }
-            case 15: // violation 'Fall through from previous branch of the switch statement.'
+            case 15: // violation 'Fall\ through from previous branch of the switch statement.'
                 do {
                     System.identityHashCode("something");
                     return;
@@ -75,7 +75,7 @@ void method(int i, int j, boolean cond) {
                 while(cond) {
                     break;
                 }
-            case 19: // violation 'Fall through from previous branch of the switch statement.'
+            case 19: // violation 'Fall\ through from previous branch of the switch statement.'
                 try {
                     i++;
                     break;
@@ -92,7 +92,7 @@ void method(int i, int j, boolean cond) {
                 } catch (Error e) {
                     return;
                 }
-            case 21: // violation 'Fall through from previous branch of the switch statement.'
+            case 21: // violation 'Fall\ through from previous branch of the switch statement.'
                 try {
                     i++;
                 } catch (RuntimeException e) {
@@ -143,7 +143,7 @@ void methodFallThru(int i, int j, boolean cond) {
           switch (i) {
           case -1: // FALLTHRU
 
-          case 0: // ok
+          case 0:
           case 1:
               i++;
               break;
@@ -184,7 +184,7 @@ void methodFallThru(int i, int j, boolean cond) {
               if (true) {
                   return;
               }
-          case 14: // violation 'Fall through from previous branch of the switch statement.'
+          case 14: // violation 'Fall\ through from previous branch of the switch statement.'
               if (true) {
                   return;
               } else {
@@ -374,12 +374,12 @@ void methodFallThruCCustomWords(int i, int j, boolean cond) {
           case 0:
               i++; /* Continue with next case */
 
-          case 1: // violation 'Fall through from previous branch of the switch statement.'
+          case 1: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
           /* Continue with next case */
-          case 2: // violation 'Fall through from previous branch of the switch statement.'
+          case 2: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
-          /* Continue with next case */case 3: // violation 'Fall through from prev.*'
+          /* Continue with next case */case 3: // violation 'Fall\ through from prev.*'
                 break;
           case 4: // violation 'Fall .* from the last branch of the switch statement.'
               i++;
@@ -421,7 +421,7 @@ void nestedSwitches() {
                 switch (hashCode()) { // causing NullPointerException in the past
                     case 1:
                 }
-            default: // violation 'Fall through from previous branch of the switch statement.'
+            default: // violation 'Fall\ through from previous branch of the switch statement.'
         }
     }
 
@@ -429,7 +429,7 @@ void nextedSwitches2() {
         switch(hashCode()) {
         case 1:
             switch(hashCode()){}
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -441,7 +441,7 @@ void ifWithoutBreak() {
             if (true) {
                 System.lineSeparator();
             }
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -451,7 +451,7 @@ void noCommentAtTheEnd() {
         switch(hashCode()) {
         case 1: System.lineSeparator();
 
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -487,9 +487,9 @@ void multipleCasesOnOneLine() {
         int i = 0;
         switch (i) {
         case 0: case 1: i *= i; // fall through
-        case 2: case 3: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
-        case 4: case 5: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
-        case 6: case 7: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
+        case 2: case 3: i *= i;
+        case 4: case 5: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
+        case 6: case 7: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
             break;
         default:
             throw new RuntimeException();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java
index 94c752089c7..695d61ad4fd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough2.java
@@ -25,7 +25,7 @@ public static void test() {
                     // some work
                     break;
                 }
-            case C: // violation 'Fall through from previous branch of the switch statement.'
+            case C: // violation 'Fall\ through from previous branch of the switch statement.'
                 break;
         }
 
@@ -40,18 +40,18 @@ public static void test() {
                 if (true) {
                     return;
                 }
-            case 4: // violation 'Fall through from previous branch of the switch statement.'
+            case 4: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (var2 == 2) {
                     break;
                 }
-            case 5: // violation 'Fall through from previous branch of the switch statement.'
+            case 5: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (var2 == 1) {
 
                 }
                 else if (true) {
                     return;
                 }
-            case 6: // violation 'Fall through from previous branch of the switch statement.'
+            case 6: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (var2 > 1) {
                     break;
                 }
@@ -65,14 +65,14 @@ else if (true) {
                 else if (true) {
                     return;
                 }
-            case 8: // violation 'Fall through from previous branch of the switch statement.'
+            case 8: // violation 'Fall\ through from previous branch of the switch statement.'
                 if(var2 == 5) {
                     System.identityHashCode("0xB16B00B5");
                 }
                 else {
                     break;
                 }
-            case 9: // violation 'Fall through from previous branch of the switch statement.'
+            case 9: // violation 'Fall\ through from previous branch of the switch statement.'
                 if(var2 == 5) {
                     System.identityHashCode("0xCAFED00D");
                 }
@@ -85,15 +85,15 @@ else if (true) {
                 switch (var3) {
                     case 0xCAFEBABE:
                         String.CASE_INSENSITIVE_ORDER.equals("0x1CEB00DA");
-                    default: // violation 'Fall through from prev.* br.* switch statement.'
+                    default: // violation 'Fall\ through from prev.* br.* switch statement.'
                         String.CASE_INSENSITIVE_ORDER.equals("");
                 }
                 if(true) {
                     break;
                 }
-            case 11: // violation 'Fall through from previous branch of the switch statement.'
+            case 11: // violation 'Fall\ through from previous branch of the switch statement.'
                 if(false) {break;}
-            case 12: // violation 'Fall through from previous branch of the switch statement.'
+            case 12: // violation 'Fall\ through from previous branch of the switch statement.'
                 if(true);
                 break;
             default:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java
index 508618aee96..97da2d1d67e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough3.java
@@ -13,13 +13,13 @@ public class InputFallThrough3
     void method(int i, int j, boolean cond) {
         while (true) {
             switch (i) {
-            case 0: // ok
+            case 0:
             case 1:
                 i++;
                 break;
             case 2:
                 i++;
-            case 3: // violation 'Fall through from previous branch of the switch statement.'
+            case 3: // violation 'Fall\ through from previous branch of the switch statement.'
                 i++;
                 break;
             case 4:
@@ -43,7 +43,7 @@ void method(int i, int j, boolean cond) {
             case 11: {
                 i++;
             }
-            case 12: // violation 'Fall through from previous branch of the switch statement.'
+            case 12: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (false)
                     break;
                 else
@@ -52,13 +52,13 @@ void method(int i, int j, boolean cond) {
                 if (true) {
                     return;
                 }
-            case 14: // violation 'Fall through from previous branch of the switch statement.'
+            case 14: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (true) {
                     return;
                 } else {
                     //do nothing
                 }
-            case 15: // violation 'Fall through from previous branch of the switch statement.'
+            case 15: // violation 'Fall\ through from previous branch of the switch statement.'
                 do {
                     System.identityHashCode("something");
                     return;
@@ -75,7 +75,7 @@ void method(int i, int j, boolean cond) {
                 while(cond) {
                     break;
                 }
-            case 19: // violation 'Fall through from previous branch of the switch statement.'
+            case 19: // violation 'Fall\ through from previous branch of the switch statement.'
                 try {
                     i++;
                     break;
@@ -92,7 +92,7 @@ void method(int i, int j, boolean cond) {
                 } catch (Error e) {
                     return;
                 }
-            case 21: // violation 'Fall through from previous branch of the switch statement.'
+            case 21: // violation 'Fall\ through from previous branch of the switch statement.'
                 try {
                     i++;
                 } catch (RuntimeException e) {
@@ -128,7 +128,7 @@ void method(int i, int j, boolean cond) {
                 default:
                     return;
                 }
-            default: // violation 'Fall through from previous branch of the switch statement.'
+            default: // violation 'Fall\ through from previous branch of the switch statement.'
                 // this is the last label
                 i++;
             }
@@ -143,14 +143,14 @@ void methodFallThru(int i, int j, boolean cond) {
           switch (i) {
           case -1: // FALLTHRU
 
-          case 0: // ok
+          case 0:
           case 1:
               i++;
               break;
           case 2:
               i++;
               // fallthru
-          case 3: // violation 'Fall through from previous branch of the switch statement.'
+          case 3: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
               break;
           case 4:
@@ -175,7 +175,7 @@ void methodFallThru(int i, int j, boolean cond) {
               i++;
           }
           // fallthru
-          case 12: // violation 'Fall through from previous branch of the switch statement.'
+          case 12: // violation 'Fall\ through from previous branch of the switch statement.'
               if (false)
                   break;
               else
@@ -184,14 +184,14 @@ void methodFallThru(int i, int j, boolean cond) {
               if (true) {
                   return;
               }
-          case 14: // violation 'Fall through from previous branch of the switch statement.'
+          case 14: // violation 'Fall\ through from previous branch of the switch statement.'
               if (true) {
                   return;
               } else {
                   //do nothing
               }
               // fallthru
-          case 15: // violation 'Fall through from previous branch of the switch statement.'
+          case 15: // violation 'Fall\ through from previous branch of the switch statement.'
               do {
                   System.identityHashCode("something");
                   return;
@@ -209,7 +209,7 @@ void methodFallThru(int i, int j, boolean cond) {
                   break;
               }
               // fallthru
-          case 19: // violation 'Fall through from previous branch of the switch statement.'
+          case 19: // violation 'Fall\ through from previous branch of the switch statement.'
               try {
                   i++;
                   break;
@@ -227,7 +227,7 @@ void methodFallThru(int i, int j, boolean cond) {
                   return;
               }
               // fallthru
-          case 21: // violation 'Fall through from previous branch of the switch statement.'
+          case 21: // violation 'Fall\ through from previous branch of the switch statement.'
               try {
                   i++;
               } catch (RuntimeException e) {
@@ -257,7 +257,7 @@ void methodFallThru(int i, int j, boolean cond) {
               }
           case 24:
               i++;
-          /* fallthru */ case 25: // violation 'Fall through from prev.* br.* switch statement.'
+          /* fallthru */ case 25: // violation 'Fall\ through from prev.* br.* switch statement.'
               i++;
               break;
 
@@ -271,7 +271,7 @@ void methodFallThru(int i, int j, boolean cond) {
                   return;
               }
               // fallthru
-          default: // violation 'Fall through from previous branch of the switch statement.'
+          default: // violation 'Fall\ through from previous branch of the switch statement.'
               // this is the last label
               i++;
           // fallthru
@@ -286,16 +286,16 @@ void methodFallThruCC(int i, int j, boolean cond) {
           case 0:
               i++; // fallthru
 
-          case 1: // violation 'Fall through from previous branch of the switch statement.'
+          case 1: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
           // fallthru
-          case 2: { // violation 'Fall through from previous branch of the switch statement.'
+          case 2: { // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
           }
           // fallthru
-          case 3: // violation 'Fall through from previous branch of the switch statement.'
+          case 3: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
-          /* fallthru */case 4: // violation 'Fall through from prev.* br.* switch statement.'
+          /* fallthru */case 4: // violation 'Fall\ through from prev.* br.* switch statement.'
                 break;
           case 5:
               i++;
@@ -311,12 +311,12 @@ void methodFallThruC(int i, int j, boolean cond) {
           case 0:
               i++; /* fallthru */
 
-          case 1: // violation 'Fall through from previous branch of the switch statement.'
+          case 1: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
           /* fallthru */
-          case 2: // violation 'Fall through from previous branch of the switch statement.'
+          case 2: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
-          /* fallthru */case 3: // violation 'Fall through from prev.* br.* switch statement.'
+          /* fallthru */case 3: // violation 'Fall\ through from prev.* br.* switch statement.'
                 break;
           case 4:
               i++;
@@ -332,12 +332,12 @@ void methodFallThruC2(int i, int j, boolean cond) {
           case 0:
               i++; /*fallthru*/
 
-          case 1: // violation 'Fall through from previous branch of the switch statement.'
+          case 1: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
           /*fallthru*/
-          case 2: // violation 'Fall through from previous branch of the switch statement.'
+          case 2: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
-          /*fallthru*/case 3: // violation 'Fall through from prev.* br.* switch statement.'
+          /*fallthru*/case 3: // violation 'Fall\ through from prev.* br.* switch statement.'
                 break;
           case 4:
               i++;
@@ -353,12 +353,12 @@ void methodFallThruCOtherWords(int i, int j, boolean cond) {
           case 0:
               i++; /* falls through */
 
-          case 1: // violation 'Fall through from previous branch of the switch statement.'
+          case 1: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
           /* falls through */
-          case 2: // violation 'Fall through from previous branch of the switch statement.'
+          case 2: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
-          /* falls through */case 3: // violation 'Fall through from prev.* br.* switch statement.'
+          /* falls through */case 3: // violation 'Fall\ through from prev.* br.* switch statement.'
                 break;
           case 4:
               i++;
@@ -421,7 +421,7 @@ void nestedSwitches() {
                 switch (hashCode()) { // causing NullPointerException in the past
                     case 1:
                 }
-            default: // violation 'Fall through from previous branch of the switch statement.'
+            default: // violation 'Fall\ through from previous branch of the switch statement.'
         }
     }
 
@@ -429,7 +429,7 @@ void nextedSwitches2() {
         switch(hashCode()) {
         case 1:
             switch(hashCode()){}
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -441,7 +441,7 @@ void ifWithoutBreak() {
             if (true) {
                 System.lineSeparator();
             }
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -451,7 +451,7 @@ void noCommentAtTheEnd() {
         switch(hashCode()) {
         case 1: System.lineSeparator();
 
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -478,7 +478,7 @@ void synchronizedStatement() {
                synchronized (this) {
                }
                // fallthru
-           default: // violation 'Fall through from previous branch of the switch statement.'
+           default: // violation 'Fall\ through from previous branch of the switch statement.'
                break;
        }
     }
@@ -487,9 +487,9 @@ void multipleCasesOnOneLine() {
         int i = 0;
         switch (i) {
         case 0: case 1: i *= i; // fall through
-        case 2: case 3: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
-        case 4: case 5: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
-        case 6: case 7: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
+        case 2: case 3: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
+        case 4: case 5: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
+        case 6: case 7: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
             break;
         default:
             throw new RuntimeException();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java
index 73e4773f2e4..0c2c78d53b1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough4.java
@@ -109,7 +109,7 @@ void method4(int i, int j, boolean cond) {
    void method5(int i, int j, boolean cond) {
       while (true) {
           switch (i){
-          case 5:
+          case 5: // violation 'Fall\ through from the last branch of the switch statement'
               i++;
               /* block */ /* fallthru */ // comment
           }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java
index 6a33883c4ee..3b27c98f4bd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough5.java
@@ -44,7 +44,7 @@ public Object visit(Object node, Void data) {
                 return null; /* block comment test for slist */
             }
         }
-        case "NEGATION": { // ok
+        case "NEGATION": {
             return booleanInvert(operandValue);
         }
         case "19": {
@@ -91,7 +91,7 @@ void method6() {
                 // fall through
                 i++;
                 // i am comment
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 break;
         }
      }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough6.java
index 3243f0f02c3..cbbfa1c4880 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough6.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough6.java
@@ -13,18 +13,18 @@ void foo(int i){
         switch(i) {
             case 1:
                  int fallthru = 2; // fallthru
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2:
                  int fallthrough = 2; //            fall thru
-            case 3: // violation 'Fall through from previous branch of the switch statement'
+            case 3:
                  break;
             case 4:
                  int fallthru2 = 3;
                  //     fall   -   thru
-            case 5: // violation 'Fall through from previous branch of the switch statement.'
+            case 5: // violation 'Fall\ through from previous branch of the switch statement.'
                  int fallthru3 = 4; // This is a fallthru comment
-            case 6: // violation 'Fall through from previous branch of the switch statement'
+            case 6:
                  int fallthru4 = 5; // falldown
-            default: // violation 'Fall through from previous branch of the switch statement.'
+            default: // violation 'Fall\ through from previous branch of the switch statement.'
             }
     }
 
@@ -35,7 +35,7 @@ void multipleCasesOnOneLine() {
          case 2: case 3: i *= i; // fall through
          case 4: case 5: i *= i; // fall through
          case 6: case 7: i *= i;
-             break; // violation above 'Fall through from previous branch of the switch statement'
+             break;
          default:
              throw new RuntimeException();
          }
@@ -49,7 +49,7 @@ void method() {
             case 1:
                 // fall through
                 i++;
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 break;
         }
      }
@@ -62,7 +62,7 @@ void method2() {
             case 1: // random
                 // fall through
                i++;
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 break;
         }
      }
@@ -77,7 +77,7 @@ void method3() {
                 // non fall
              /* comment */
                i++;
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 break;
         }
      }
@@ -91,7 +91,7 @@ void method4() {
                 /* fallthru */
             // comment
                i++;
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 break;
         }
      }
@@ -106,7 +106,7 @@ void method5() {
                 // fall through
             // comment
                 System.out.println("check");
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 break;
         }
      }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough7.java
index 60e1d30ce7c..4b941312a62 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough7.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough7.java
@@ -61,7 +61,7 @@ public void method3() {
             case 4:
             case 3:
                 c = 4;
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
             case 1:
             default:
                 c = 9;
@@ -77,7 +77,7 @@ public void method5() {
             case 3:
                 c = 4;
             // fall through
-            case 2: // ok
+            case 2:
             case 1:
             default:
                 c = 9;
@@ -93,7 +93,7 @@ public void method6() {
             case 3:
                 c = 4;
                 break;
-            case 2: // ok
+            case 2:
             case 1:
             default:
                 c = 9;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough8.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough8.java
new file mode 100644
index 00000000000..370d36096a7
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThrough8.java
@@ -0,0 +1,48 @@
+/*
+FallThrough
+checkLastCaseGroup = true
+reliefPattern = (default)falls?[ -]?thr(u|ough)
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.fallthrough;
+
+public class InputFallThrough8 {
+    void methodLastLine(int i) {
+        while (true) {
+            switch (i) {
+                case 0:
+                    i++;
+                    /* block */ // comment
+                    // fall thru
+                case 1:
+                    i++;
+                    break;
+                case 2:
+                    i++;
+                    /* comment */ /* fall thru */ /* comment */
+                case 3: // violation 'Fall\ through from previous branch of the switch statement'
+                    i--;
+                    break;
+            }
+        }
+    }
+
+    void testLastCase(int i) {
+        switch (i) {
+            case 0: // violation 'Fall\ through from the last branch of the switch statement'
+                i++;
+                /* comment */ /* fall thru */ /* comment */
+        }
+    }
+
+    void testLastCase2(int i) {
+        switch (i) {
+            case 0:
+                i++;
+                /* comment */ /* comment */
+                /* fall thru */
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughCharacterSwitch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughCharacterSwitch.java
index 4f4ec0895d1..10eba51fbc6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughCharacterSwitch.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughCharacterSwitch.java
@@ -16,7 +16,7 @@ void foo(char c, int i) {
             case 'a':
             case 'b':
                 i++;
-            case 'c': // violation 'Fall through from previous branch of the switch statement.'
+            case 'c': // violation 'Fall\ through from previous branch of the switch statement.'
                 String.valueOf(i);
                 break;
             case 'd':
@@ -27,7 +27,7 @@ void foo(char c, int i) {
                 if (true) {
                     return;
                 }
-            case 'g': // violation 'Fall through from previous branch of the switch statement.'
+            case 'g': // violation 'Fall\ through from previous branch of the switch statement.'
                 try {
                     i++;
                     break;
@@ -35,17 +35,17 @@ void foo(char c, int i) {
                 } catch (Error e) {
                     return;
                 }
-            case 'h': // violation 'Fall through from previous branch of the switch statement.'
+            case 'h': // violation 'Fall\ through from previous branch of the switch statement.'
                 switch (i) {
                 case 1:
                     continue;
                 case 2:
                     i++;
-                case 3: // violation 'Fall through from previous branch of the switch statement.'
+                case 3: // violation 'Fall\ through from previous branch of the switch statement.'
                     String.valueOf(i);
                     return;
                 }
-            case 'i': // violation 'Fall through from previous branch of the switch statement.'
+            case 'i': // violation 'Fall\ through from previous branch of the switch statement.'
                 switch (i) {
                 case 1:
                     continue;
@@ -60,7 +60,7 @@ void foo(char c, int i) {
             case 'A':
                 i++;
                 // FALL-THRU (case-sensitive)
-            case 'B': // violation 'Fall through from previous branch of the switch statement.'
+            case 'B': // violation 'Fall\ through from previous branch of the switch statement.'
                 i++;
                 // fall-through
             default:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughDefault.java
index 7928f6b32a9..f204a2acccd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughDefault.java
@@ -13,13 +13,13 @@ public class InputFallThroughDefault
     void method(int i, int j, boolean cond) {
         while (true) {
             switch (i) {
-            case 0: // ok
+            case 0:
             case 1:
                 i++;
                 break;
             case 2:
                 i++;
-            case 3: // violation 'Fall through from previous branch of the switch statement.'
+            case 3: // violation 'Fall\ through from previous branch of the switch statement.'
                 i++;
                 break;
             case 4:
@@ -43,7 +43,7 @@ void method(int i, int j, boolean cond) {
             case 11: {
                 i++;
             }
-            case 12: // violation 'Fall through from previous branch of the switch statement.'
+            case 12: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (false)
                     break;
                 else
@@ -52,13 +52,13 @@ void method(int i, int j, boolean cond) {
                 if (true) {
                     return;
                 }
-            case 14: // violation 'Fall through from previous branch of the switch statement.'
+            case 14: // violation 'Fall\ through from previous branch of the switch statement.'
                 if (true) {
                     return;
                 } else {
                     //do nothing
                 }
-            case 15: // violation 'Fall through from previous branch of the switch statement.'
+            case 15: // violation 'Fall\ through from previous branch of the switch statement.'
                 do {
                     System.identityHashCode("something");
                     return;
@@ -75,7 +75,7 @@ void method(int i, int j, boolean cond) {
                 while(cond) {
                     break;
                 }
-            case 19: // violation 'Fall through from previous branch of the switch statement.'
+            case 19: // violation 'Fall\ through from previous branch of the switch statement.'
                 try {
                     i++;
                     break;
@@ -92,7 +92,7 @@ void method(int i, int j, boolean cond) {
                 } catch (Error e) {
                     return;
                 }
-            case 21: // violation 'Fall through from previous branch of the switch statement.'
+            case 21: // violation 'Fall\ through from previous branch of the switch statement.'
                 try {
                     i++;
                 } catch (RuntimeException e) {
@@ -128,7 +128,7 @@ void method(int i, int j, boolean cond) {
                 default:
                     return;
                 }
-            default: // violation 'Fall through from previous branch of the switch statement.'
+            default: // violation 'Fall\ through from previous branch of the switch statement.'
                 // this is the last label
                 i++;
             }
@@ -143,7 +143,7 @@ void methodFallThru(int i, int j, boolean cond) {
           switch (i) {
           case -1: // FALLTHRU
 
-          case 0: // ok
+          case 0:
           case 1:
               i++;
               break;
@@ -184,7 +184,7 @@ void methodFallThru(int i, int j, boolean cond) {
               if (true) {
                   return;
               }
-          case 14: // violation 'Fall through from previous branch of the switch statement.'
+          case 14: // violation 'Fall\ through from previous branch of the switch statement.'
               if (true) {
                   return;
               } else {
@@ -374,12 +374,12 @@ void methodFallThruCCustomWords(int i, int j, boolean cond) {
           case 0:
               i++; /* Continue with next case */
 
-          case 1: // violation 'Fall through from previous branch of the switch statement.'
+          case 1: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
           /* Continue with next case */
-          case 2: // violation 'Fall through from previous branch of the switch statement.'
+          case 2: // violation 'Fall\ through from previous branch of the switch statement.'
               i++;
-          /* Continue with next case */case 3: // violation 'Fall through from prev.* br.* switch.*'
+          /* Continue.* */case 3: // violation 'Fall\ through from previous branch.* switch.*'
                 break;
           case 4:
               i++;
@@ -421,7 +421,7 @@ void nestedSwitches() {
                 switch (hashCode()) { // causing NullPointerException in the past
                     case 1:
                 }
-            default: // violation 'Fall through from previous branch of the switch statement.'
+            default: // violation 'Fall\ through from previous branch of the switch statement.'
         }
     }
 
@@ -429,7 +429,7 @@ void nextedSwitches2() {
         switch(hashCode()) {
         case 1:
             switch(hashCode()){}
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -441,7 +441,7 @@ void ifWithoutBreak() {
             if (true) {
                 System.lineSeparator();
             }
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -451,7 +451,7 @@ void noCommentAtTheEnd() {
         switch(hashCode()) {
         case 1: System.lineSeparator();
 
-        case 2: // violation 'Fall through from previous branch of the switch statement.'
+        case 2: // violation 'Fall\ through from previous branch of the switch statement.'
             System.lineSeparator();
             break;
         }
@@ -487,9 +487,9 @@ void multipleCasesOnOneLine() {
         int i = 0;
         switch (i) {
         case 0: case 1: i *= i;
-        case 2: case 3: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
-        case 4: case 5: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
-        case 6: case 7: i *= i; // violation 'Fall through from prev.* br.* switch statement.'
+        case 2: case 3: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
+        case 4: case 5: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
+        case 6: case 7: i *= i; // violation 'Fall\ through from prev.* br.* switch statement.'
             break;
         default:
             throw new RuntimeException();
@@ -526,15 +526,15 @@ void methodFallThruWithDash(int i, int j, boolean cond) {
                   i++; // falls-through
               case 12:
                   i++; // fall--through
-              case 13: // violation 'Fall through from previous branch of the switch statement.'
+              case 13: // violation 'Fall\ through from previous branch of the switch statement.'
                   i++; // fall+through
-              case 14: // violation 'Fall through from previous branch of the switch statement.'
+              case 14: // violation 'Fall\ through from previous branch of the switch statement.'
                   i++; // falls_thru
-              case 15: // violation 'Fall through from previous branch of the switch statement.'
+              case 15: // violation 'Fall\ through from previous branch of the switch statement.'
                   i++; // falls=through
-              case 16: // violation 'Fall through from previous branch of the switch statement.'
+              case 16: // violation 'Fall\ through from previous branch of the switch statement.'
                   i++; // falls-throug
-              default: // violation 'Fall through from previous branch of the switch statement.'
+              default: // violation 'Fall\ through from previous branch of the switch statement.'
                   throw new RuntimeException();
           }
       }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment.java
index f96998728d3..1ed902689c8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment.java
@@ -17,7 +17,7 @@ void method(int lineNumber) {
                 int line = 2;
                 // fall-through intended - the line contains already the first entries
                 // the following 4 lines contain additional satellite ids
-            case 4: // violation 'Fall through from previous branch of the switch statement'
+            case 4: // violation 'Fall\ through from previous branch of the switch statement'
             case 5:
             case 6:
             case 7: {
@@ -40,7 +40,7 @@ void method(int lineNumber) {
 
                 // base = line.substring(14, 26).trim();
             }
-            case 16: // violation 'Fall through from previous branch of the switch statement'
+            case 16: // violation 'Fall\ through from previous branch of the switch statement'
             case 17:
             case 18:
                 // ignore additional custom parameters
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment2.java
index 14d20d56d26..004cbb13e49 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughFallThroughLotsOfComment2.java
@@ -56,7 +56,7 @@ public void onEntryHitWrite(Node<K, V> e, V value, String line) {
                 case "EVICTING":
                     // In the case of eviction we add the node back as if it was a HIR_RESIDENT
                     // we now have a HIR resident
-                case "HIR_RESIDENT": // ok
+                case "HIR_RESIDENT":
                     // case 2
                     if (lirsNode.stackNode != null) {
                         // This is the (a) example
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughLabeledBreak.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughLabeledBreak.java
new file mode 100644
index 00000000000..b0d5d20b6e2
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughLabeledBreak.java
@@ -0,0 +1,104 @@
+/*
+FallThrough
+checkLastCaseGroup = (default)false
+reliefPattern = (default)falls?[ -]?thr(u|ough)
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.fallthrough;
+
+public class InputFallThroughLabeledBreak {
+
+    int method(int a, int b) {
+        top: switch (a) {
+            case 1:
+                switch (b) {
+                    case 10:
+                        break top; // ok as terminates outer 'top' switch
+                    default:
+                        return 11;
+                }
+            case 2:
+                return 2;
+        }
+        outer: outer2: switch (a) {
+            case 1:
+                inner1: inner2: switch (b) {
+                    case 10:
+                        break outer; // ok as terminates outer 'outer' switch
+                    default:
+                        return 11;
+                }
+            case 2:
+                inner: for (int i = 0;i < 3;i++) {
+                    // ok below as terminates outer 'outer2' switch
+                    break outer2;
+                }
+            case 3:
+                return 2;
+        }
+
+        loop_outer: for(int c = 0; c < 2; c++) {
+            outer:switch (a) {
+                case 1:
+                    inner:inner2:switch (b) {
+                        case 10:
+                            break inner;
+                        default:
+                            return 11;
+                    }
+                case 2: // violation 'Fall through from previous branch of the switch statement.'
+                    inner: inner2: for (int i = 0; i < 3; i++) {
+                        break inner2;
+                    }
+                case 3: // violation 'Fall through from previous branch of the switch statement.'
+                    return 1;
+                case 4:
+                    switch (b) {
+                        case 10:
+                            break outer; // ok as terminates outer 'outer' switch
+                        default:
+                            return 11;
+                    }
+                case 5:
+                    inner:{ switch (a) {
+                        case 1: break inner;
+                        }
+                    }
+                case 6: // violation 'Fall through from previous branch of the switch statement.'
+                    inner:
+                    while (true) {
+                        break outer;
+                    }
+                case 7:
+                    inner: while (true) {
+                        break inner;
+                    }
+                case 8:  // violation 'Fall through from previous branch of the switch statement.'
+                    inner:
+                    while (true) {
+                        continue loop_outer;
+                    }
+                case 9:
+                    loop_inner:
+                    while (true) {
+                        continue loop_inner;
+                    }
+                case 10:  // violation 'Fall through from previous branch of the switch statement.'
+                    inner1:
+                    {
+                        switch (a) {
+                            case 1:
+                                // ok below as terminates outer 'outer' switch
+                                break outer;
+
+                        }
+                    }
+                case 11:
+                    return 1;
+            }
+        }
+        return -1;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughLastLineCommentCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughLastLineCommentCheck.java
index a3bea404713..bca74ffbf73 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughLastLineCommentCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughLastLineCommentCheck.java
@@ -18,7 +18,7 @@ public void method(int i) {
                 // comment
                 // fall through
                 // check
-            case 2: // violation 'Fall through from previous branch of the switch statement'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 break;
             case 3:
                 break;
@@ -30,7 +30,7 @@ public void method2(int i) {
             case 1:
                 i++;
                 /* block */ /* fallthru */ // comment
-            case 2:
+            case 2: // violation 'Fall\ through from previous branch of the switch statement'
                 // this is comment
                 i++;
                 // fall through
@@ -104,7 +104,7 @@ void method6(String str) {
    void method7(int i, int j, boolean cond) {
       while (true) {
           switch (i){
-          case 5:
+          case 5: // violation 'Fall\ through from the last branch of the switch statement'
               i++;
               /* block */ i++; /* fallthru */ // comment
           }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughStringSwitch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughStringSwitch.java
index 545f173b90d..cae8cbe719d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughStringSwitch.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughStringSwitch.java
@@ -13,12 +13,12 @@ public class InputFallThroughStringSwitch
     int method(String arg) {
         int i = 0;
         switch (arg) {
-        case "ok": // ok
+        case "ok":
         case "break":
             break;
         case "violation":
             i++;
-        case "fallthru": // violation 'Fall through from previous branch of the switch statement.'
+        case "fallthru": // violation 'Fall\ through from previous branch of the switch statement.'
       }
       return i;
    }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughTryCatchInSwitch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughTryCatchInSwitch.java
index dd3a3bc82dd..94c71856d00 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughTryCatchInSwitch.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughTryCatchInSwitch.java
@@ -34,7 +34,7 @@ public int foo(int x) {
                 } finally {
                     // Some code
                 }
-            default: // violation 'Fall through from previous branch of the switch statement.'
+            default: // violation 'Fall\ through from previous branch of the switch statement.'
                 // Some code
         }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWeird.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWeird.java
index 68bb1ff3ac7..bdc8ce6f2e3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWeird.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWeird.java
@@ -12,7 +12,7 @@ void foo(int i){
         switch(i) {
             case 1:
                  int fallthru = 2; // some comment
-            case 2: // violation 'Fall through from previous branch of the switch statement.'
+            case 2: // violation 'Fall\ through from previous branch of the switch statement.'
                  break;
             case 3:
                  int c = 2; // fall thru
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWithEmoji.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWithEmoji.java
index 0951442f73a..993c361e03b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWithEmoji.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/InputFallThroughWithEmoji.java
@@ -15,15 +15,15 @@ void foo() {
         while (true) {
             int i = 0;
             switch ("👍") {
-                case "ds😂": // ok
+                case "ds😂":
                 case "": i++; break;
                 case "👇🏻":
                     i++;
                 case "😂sda":
-                    // violation above 'Fall through from previous branch of the switch statement.'
+                    // violation above 'Fall\ through from previous branch of the switch statement.'
                     i++;
                 case "d😂sda": return;
-                    // violation above 'Fall through from previous branch of the switch statement.'
+                    // violation above 'Fall\ through from previous branch of the switch statement.'
 
                 case "5😆": throw new RuntimeException("");
                 case "🧐6":
@@ -47,9 +47,9 @@ void foo() {
                     }
                     // fall👉🏻through,
                 case "9": String s = "s🥳d🥳s";
-                // violation above 'Fall through from previous branch of the switch statement.'
+                // violation above 'Fall\ through from previous branch of the switch statement.'
                 // FALLTHRU (case-sensitive)
-                default: // violation 'Fall through from previous branch of the switch statement.'
+                default: // violation 'Fall\ through from previous branch of the switch statement.'
                     "🥳".toString().equals("🥳");
 
                     // this is the last label
@@ -62,7 +62,7 @@ void fooFallThru() {
         int i = 0;
         switch ("") {
 
-            case "ds😂": // ok
+            case "ds😂":
             case "":
                 i++;
                 break;
@@ -97,7 +97,7 @@ void fooFallThru() {
                 //🥳d🥳 fallthru
 
             case "10": String s2 = "s🥳d🥳s";
-            /*🥳🥳🥳🥳🥳🥳*/ /* fallthru */ default: i++; // ok
+            /*🥳🥳🥳🥳🥳🥳*/ /* fallthru */ default: i++;
 
     }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable.java
deleted file mode 100644
index 6212fbed850..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
-FinalLocalVariable
-validateEnhancedForLoopVariable = (default)false
-tokens = (default)VARIABLE_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
-
-public class InputFinalLocalVariable
-{
-    private int m_ClassVariable = 0;
-    //static block
-    static
-    {
-        int i, j = 0; // 2 violations
-        Runnable runnable = new Runnable() // violation
-        {
-            public void run()
-            {
-            }
-        };
-    }
-    /** constructor */
-    public InputFinalLocalVariable()
-    {
-        int i = 0; // violation
-        // final variable
-        final int j = 2;
-
-        int z; // violation
-
-        Object obj = new Object(); // violation
-
-        int k = 0;
-
-        String x = obj.toString(); // violation
-
-        k++;
-
-        k = 2;
-
-        Runnable runnable = new Runnable() // violation
-        {
-            public void run()
-            {
-                int q = 0; // violation
-            }
-        };
-    }
-
-    public void method(int aArg, final int aFinal, int aArg2)
-    {
-        int z = 0;
-
-        z++;
-
-        aArg2++;
-    }
-
-    public void aMethod()
-    {
-        int i = 0; // violation
-
-        final int j = 2;
-
-        int z; // violation
-
-        Object obj = new Object(); // violation
-
-        int k = 0;
-
-        String x = obj.toString(); // violation
-
-        k++;
-
-        final class Inner
-        {
-            public Inner()
-            {
-                int w = 0; // violation
-                Runnable runnable = new Runnable() // violation
-                {
-                    public void run()
-                    {
-                    }
-                };
-            }
-        }
-    }
-
-    public void anotherMethod()
-    {
-        boolean aBool = true;
-        for (int i = 0, j = 1, k = 1; j < 10 ; j++)
-        {
-            k++;
-            aBool = false;
-        }
-
-        int l = 0;
-        {
-            int weird = 0; // violation
-            int j = 0; // violation
-            int k = 0; // violation
-            {
-               l++;
-            }
-        }
-
-        int weird = 0;
-        weird++;
-
-        final InnerClass ic = new InnerClass();
-
-        ic.mInner2 = 1;
-    }
-
-    class InnerClass
-    {
-        private int mInner = 0;
-
-        public int mInner2 = 0;
-    }
-}
-
-interface Inter
-{
-    void method(int aParam);
-}
-
-abstract class AbstractClass
-{
-    public abstract void abstractMethod(int aParam);
-}
-
-class Blah
-{
-    static
-    {
-        for(int a : getInts())
-        {
-
-        }
-    }
-
-    static int[] getInts() {
-        return null;
-    }
-}
-
-class test_1241722
-{
-    private Object o_;
-
-    public void doSomething(Object _o)
-    {
-        System.identityHashCode(_o);
-    }
-
-    public void doSomething2(Object _o1)
-    {
-        o_ = _o1;
-    }
-}
-
-class class1
-{
-    public class1(final int x){
-
-    }
-}
-
-class AA {
-    {
-        int y = 0;
-        y = 9;
-    }
-}
-
-enum Enum1 {
-    ;
-
-    {
-        int var = 0;
-        var = 1;
-    }
-}
-
-class class2 {
-    public void method1(){
-        int x; // violation
-        x = 3;
-    }
-    public void method2() {
-        for(int i=0;i<5;i++){
-            int x; // violation
-            x = 3;
-        }
-        int y;
-        for(int i=0;i<5;i++) {
-            y = 3;
-        }
-        for(int i=0;i<5;i++) {
-            int z;
-            for(int j=0;j<5;j++) {
-                z = 3;
-            }
-        }
-    }
-    public void method3() {
-        int m;
-        do {
-           m = 0;
-        } while (false);
-        do {
-            int n; // violation
-           n = 0;
-        } while (true);
-    }
-
-    private void foo() {
-        int q; // violation
-        int w; // violation
-        int e;
-        q = 1;
-        w = 1;
-        e = 1;
-        e = 2;
-        class Local {
-            void bar() {
-                int q;
-                int w; // violation
-                int e; // violation
-                q = 1;
-                q = 2;
-                w = 1;
-                e = 1;
-            }
-        }
-
-        int i;
-        for (;; i = 1) { }
-    }
-
-    public void method4() {
-        int m;
-        int i = 5;
-        while (i > 1) {
-            m = 0;
-            i++;
-        }
-        while (true) {
-            int n; // violation
-            n = 0;
-        }
-    }
-
-    int[] array = new int[10];
-    public void method5() {
-        int r;
-        for (int a: array) {
-            r = 0;
-        }
-        for (int a: array) {
-            int t; // violation
-            t = 0;
-        }
-    }
-}
-
-class classs3 {
-    public void method(final int i) {
-        switch (i) {
-            case 1:
-                int foo = 1;    // violation
-                break;
-            default:
-        }
-        switch (i) {
-            case 1:
-                int foo = 1;    // No Violation
-                break;
-            case 2:
-                foo = 2;
-                break;
-            default:
-        }
-    }
-}
-
-class Class3 {
-    public void test1() {
-        final boolean b = true;
-        int shouldBeFinal;        // violation
-
-        if (b) {
-            shouldBeFinal = 1;
-        }
-        else {
-            shouldBeFinal = 2;
-        }
-    }
-
-    public void test2() {
-        final int b = 10;
-        int shouldBeFinal;        // violation
-
-        switch (b) {
-        case 0:
-            shouldBeFinal = 1;
-            break;
-        default:
-            shouldBeFinal = 2;
-            break;
-        }
-    }
-
-    public void test3() {
-        int x;        // No Violation
-        try {
-            x = 0;
-        } catch (final Exception e) {
-            x = 1;
-        }
-
-        int y;        // No Violation
-        try {
-            y = 0;
-        } finally {
-            y = 1;
-        }
-    }
-
-    public void test4() {
-        final boolean b = false;
-        int x;        // No Violation
-        if (b) {
-            x = 1;
-        } else {
-            x = 2;
-        }
-
-        if(b) {
-            x = 3;
-        }
-    }
-
-    public void test5() {
-        final boolean b = false;
-        int shouldBeFinal;    // violation
-        if(b) {
-        }
-        if (b) {
-            shouldBeFinal = 1;
-        } else {
-            shouldBeFinal = 2;
-        }
-    }
-}
-
-class class4 {
-    public void foo() {
-        int shouldBeFinal;    // violation
-        class Bar {
-            void bar () {
-                int shouldBeFinal;    // violation
-                final boolean b = false;
-                if (b) {
-                    shouldBeFinal = 1;
-                } else {
-                    shouldBeFinal = 2;
-                }
-            }
-        }
-    }
-}
-
-class class5 {
-    public void test1(){
-        final boolean b = false;
-        int shouldBeFinal;    // violation
-        if(b){
-            if(b){
-                shouldBeFinal = 1;
-            } else {
-                shouldBeFinal = 2;
-            }
-        }
-    }
-    public void test2() {
-        final int b = 10;
-        int shouldBeFinal;        // violation
-
-        switch (b) {
-        case 0:
-            switch (b) {
-            case 0:
-                shouldBeFinal = 1;
-                break;
-            default:
-                shouldBeFinal = 2;
-                break;
-            }
-            break;
-        default:
-            shouldBeFinal = 3;
-            break;
-        }
-    }
-    public void test3() {
-        int x;    //No Violation
-        try {
-            x = 0;
-            try {
-                x = 0;
-            } catch (final Exception e) {
-                x = 1;
-            }
-        } catch (final Exception e) {
-            x = 1;
-        }
-    }
-    public void test4() {
-        int shouldBeFinal;    // violation
-        class Bar {
-            void bar () {
-                int shouldBeFinal;    // violation
-                final boolean b = false;
-                if (b) {
-                    if (b) {
-                        shouldBeFinal = 1;
-                    } else {
-                        shouldBeFinal = 2;
-                    }
-                } else {
-                    shouldBeFinal = 2;
-                }
-            }
-        }
-
-        abstract class Bar2 {
-            abstract void method(String param);
-        }
-    }
-
-    public void test5() {
-        InputFinalLocalVariable table = new InputFinalLocalVariable(); // violation
-        new Runnable() {
-            @Override
-            public void run() {
-                InputFinalLocalVariable table = null;
-                table = new InputFinalLocalVariable();
-            }
-        };
-    }
-
-    public void test6() {
-        byte tmpByte[];
-
-        if (true) {
-                if (true) {
-                    tmpByte = new byte[0];
-                }
-        } else {
-            if (true) {
-                if (true) {
-                    tmpByte = new byte[1];
-                }
-            }
-            if (false) {
-                if (true) {
-                    tmpByte = new byte[2];
-                }
-            }
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2.java
deleted file mode 100644
index 91ee2c39b8d..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-FinalLocalVariable
-validateEnhancedForLoopVariable = (default)false
-tokens = PARAMETER_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
-
-public class InputFinalLocalVariable2
-{
-    private int m_ClassVariable = 0;
-    //static block
-    static
-    {
-        int i, j = 0;
-        Runnable runnable = new Runnable()
-        {
-            public void run()
-            {
-            }
-        };
-    }
-    /** constructor */
-    public InputFinalLocalVariable2()
-    {
-        int i = 0;
-        // final variable
-        final int j = 2;
-
-        int z;
-
-        Object obj = new Object();
-
-        int k = 0;
-
-        String x = obj.toString();
-
-        k++;
-
-        k = 2;
-
-        Runnable runnable = new Runnable()
-        {
-            public void run()
-            {
-                int q = 0;
-            }
-        };
-    }
-
-    public void method(int aArg, final int aFinal, int aArg2) // violation
-    {
-        int z = 0;
-
-        z++;
-
-        aArg2++;
-    }
-
-    public void aMethod()
-    {
-        int i = 0;
-
-        final int j = 2;
-
-        int z;
-
-        Object obj = new Object();
-
-        int k = 0;
-
-        String x = obj.toString();
-
-        k++;
-
-        final class Inner
-        {
-            public Inner()
-            {
-                int w = 0;
-                Runnable runnable = new Runnable()
-                {
-                    public void run()
-                    {
-                    }
-                };
-            }
-        }
-    }
-
-    public void anotherMethod()
-    {
-        boolean aBool = true;
-        for (int i = 0, j = 1, k = 1; j < 10 ; j++)
-        {
-            k++;
-            aBool = false;
-        }
-
-        int l = 0;
-        {
-            int weird = 0;
-            int j = 0;
-            int k = 0;
-            {
-               l++;
-            }
-        }
-
-        int weird = 0;
-        weird++;
-
-        final InnerClass ic = new InnerClass();
-
-        ic.mInner2 = 1;
-    }
-
-    class InnerClass
-    {
-        private int mInner = 0;
-
-        public int mInner2 = 0;
-    }
-}
-
-interface Inter2
-{
-    void method(int aParam);
-}
-
-abstract class AbstractClass2
-{
-    public abstract void abstractMethod(int aParam);
-}
-
-class Blah2
-{
-    static
-    {
-        for(int a : getInts())
-        {
-
-        }
-    }
-
-    static int[] getInts() {
-        return null;
-    }
-}
-
-class test_12417222
-{
-    private Object o_;
-
-    public void doSomething(Object _o) // violation
-    {
-        System.identityHashCode(_o);
-    }
-
-    public void doSomething2(Object _o1) // violation
-    {
-        o_ = _o1;
-    }
-}
-
-class class12
-{
-    public class12(final int x){
-
-    }
-}
-
-class AA2 {
-    {
-        int y = 0;
-        y = 9;
-    }
-}
-
-enum Enum12 {
-    ;
-
-    {
-        int var = 0;
-        var = 1;
-    }
-}
-
-class class22 {
-    public void method1(){
-        int x;
-        x = 3;
-    }
-    public void method2() {
-        for(int i=0;i<5;i++){
-            int x;
-            x = 3;
-        }
-        int y;
-        for(int i=0;i<5;i++) {
-            y = 3;
-        }
-        for(int i=0;i<5;i++) {
-            int z;
-            for(int j=0;j<5;j++) {
-                z = 3;
-            }
-        }
-    }
-    public void method3() {
-        int m;
-        do {
-           m = 0;
-        } while (false);
-        do {
-            int n;
-           n = 0;
-        } while (true);
-    }
-
-    private void foo() {
-        int q;
-        int w;
-        int e;
-        q = 1;
-        w = 1;
-        e = 1;
-        e = 2;
-        class Local {
-            void bar() {
-                int q;
-                int w;
-                int e;
-                q = 1;
-                q = 2;
-                w = 1;
-                e = 1;
-            }
-        }
-
-        int i;
-        for (;; i = 1) { }
-    }
-
-    public void method4() {
-        int m;
-        int i = 5;
-        while (i > 1) {
-            m = 0;
-            i++;
-        }
-        while (true) {
-            int n;
-            n = 0;
-        }
-    }
-
-    int[] array = new int[10];
-    public void method5() {
-        int r;
-        for (int a: array) {
-            r = 0;
-        }
-        for (int a: array) {
-            int t;
-            t = 0;
-        }
-    }
-}
-
-class classs32 {
-    public void method(final int i) {
-        switch (i) {
-            case 1:
-                int foo = 1;    // Violation
-                break;
-            default:
-        }
-        switch (i) {
-            case 1:
-                int foo = 1;    // No Violation
-                break;
-            case 2:
-                foo = 2;
-                break;
-            default:
-        }
-    }
-}
-
-class Class32 {
-    public void test1() {
-        final boolean b = true;
-        int shouldBeFinal;        //Violation
-
-        if (b) {
-            shouldBeFinal = 1;
-        }
-        else {
-            shouldBeFinal = 2;
-        }
-    }
-
-    public void test2() {
-        final int b = 10;
-        int shouldBeFinal;        //Violation
-
-        switch (b) {
-        case 0:
-            shouldBeFinal = 1;
-            break;
-        default:
-            shouldBeFinal = 2;
-            break;
-        }
-    }
-
-    public void test3() {
-        int x;        // No Violation
-        try {
-            x = 0;
-        } catch (final Exception e) {
-            x = 1;
-        }
-
-        int y;        // No Violation
-        try {
-            y = 0;
-        } finally {
-            y = 1;
-        }
-    }
-
-    public void test4() {
-        final boolean b = false;
-        int x;        // No Violation
-        if (b) {
-            x = 1;
-        } else {
-            x = 2;
-        }
-
-        if(b) {
-            x = 3;
-        }
-    }
-
-    public void test5() {
-        final boolean b = false;
-        int shouldBeFinal;    //Violation
-        if(b) {
-        }
-        if (b) {
-            shouldBeFinal = 1;
-        } else {
-            shouldBeFinal = 2;
-        }
-    }
-}
-
-class class42 {
-    public void foo() {
-        int shouldBeFinal;
-        class Bar {
-            void bar () {
-                int shouldBeFinal;    //Violation
-                final boolean b = false;
-                if (b) {
-                    shouldBeFinal = 1;
-                } else {
-                    shouldBeFinal = 2;
-                }
-            }
-        }
-    }
-}
-
-class class52 {
-    public void test1(){
-        final boolean b = false;
-        int shouldBeFinal;    //Violation
-        if(b){
-            if(b){
-                shouldBeFinal = 1;
-            } else {
-                shouldBeFinal = 2;
-            }
-        }
-    }
-    public void test2() {
-        final int b = 10;
-        int shouldBeFinal;        //Violation
-
-        switch (b) {
-        case 0:
-            switch (b) {
-            case 0:
-                shouldBeFinal = 1;
-                break;
-            default:
-                shouldBeFinal = 2;
-                break;
-            }
-            break;
-        default:
-            shouldBeFinal = 3;
-            break;
-        }
-    }
-    public void test3() {
-        int x;    //No Violation
-        try {
-            x = 0;
-            try {
-                x = 0;
-            } catch (final Exception e) {
-                x = 1;
-            }
-        } catch (final Exception e) {
-            x = 1;
-        }
-    }
-    public void test4() {
-        int shouldBeFinal;
-        class Bar {
-            void bar () {
-                int shouldBeFinal;    //Violation
-                final boolean b = false;
-                if (b) {
-                    if (b) {
-                        shouldBeFinal = 1;
-                    } else {
-                        shouldBeFinal = 2;
-                    }
-                } else {
-                    shouldBeFinal = 2;
-                }
-            }
-        }
-
-        abstract class Bar2 {
-            abstract void method(String param);
-        }
-    }
-
-    public void test5() {
-        InputFinalLocalVariable table = new InputFinalLocalVariable();
-        new Runnable() {
-            @Override
-            public void run() {
-                InputFinalLocalVariable table = null;
-                table = new InputFinalLocalVariable();
-            }
-        };
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Five.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Five.java
new file mode 100644
index 00000000000..5050aeb5767
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Five.java
@@ -0,0 +1,110 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = PARAMETER_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariable2Five {
+    class class42 {
+        public void foo() {
+            int shouldBeFinal;
+            class Bar {
+                void bar () {
+                    int shouldBeFinal;    //Violation
+                    final boolean b = false;
+                    if (b) {
+                        shouldBeFinal = 1;
+                    } else {
+                        shouldBeFinal = 2;
+                    }
+                }
+            }
+        }
+    }
+
+    class class52 {
+        public void test1(){
+            final boolean b = false;
+            int shouldBeFinal;    //Violation
+            if(b){
+                if(b){
+                    shouldBeFinal = 1;
+                } else {
+                    shouldBeFinal = 2;
+                }
+            }
+        }
+        public void test2() {
+            final int b = 10;
+            int shouldBeFinal;        //Violation
+
+            switch (b) {
+                case 0:
+                    switch (b) {
+                        case 0:
+                            shouldBeFinal = 1;
+                            break;
+                        default:
+                            shouldBeFinal = 2;
+                            break;
+                    }
+                    break;
+                default:
+                    shouldBeFinal = 3;
+                    break;
+            }
+        }
+        public void test3() {
+            int x;    //No Violation
+            try {
+                x = 0;
+                try {
+                    x = 0;
+                } catch (final Exception e) {
+                    x = 1;
+                }
+            } catch (final Exception e) {
+                x = 1;
+            }
+        }
+        public void test4() {
+            int shouldBeFinal;
+            class Bar {
+                void bar () {
+                    int shouldBeFinal;    //Violation
+                    final boolean b = false;
+                    if (b) {
+                        if (b) {
+                            shouldBeFinal = 1;
+                        } else {
+                            shouldBeFinal = 2;
+                        }
+                    } else {
+                        shouldBeFinal = 2;
+                    }
+                }
+            }
+
+            abstract class Bar2 {
+                abstract void method(String param);
+            }
+        }
+
+        public void test5() {
+            InputFinalLocalVariableFive table
+                    = new InputFinalLocalVariableFive();
+            new Runnable() {
+                @Override
+                public void run() {
+                    InputFinalLocalVariableFive table = null;
+                    table = new InputFinalLocalVariableFive();
+                }
+            };
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Four.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Four.java
new file mode 100644
index 00000000000..654eb4fdaf1
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Four.java
@@ -0,0 +1,81 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = PARAMETER_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariable2Four {
+    class Class32 {
+        public void test1() {
+            final boolean b = true;
+            int shouldBeFinal;        //Violation
+
+            if (b) {
+                shouldBeFinal = 1;
+            }
+            else {
+                shouldBeFinal = 2;
+            }
+        }
+
+        public void test2() {
+            final int b = 10;
+            int shouldBeFinal;        //Violation
+
+            switch (b) {
+                case 0:
+                    shouldBeFinal = 1;
+                    break;
+                default:
+                    shouldBeFinal = 2;
+                    break;
+            }
+        }
+
+        public void test3() {
+            int x;        // No Violation
+            try {
+                x = 0;
+            } catch (final Exception e) {
+                x = 1;
+            }
+
+            int y;        // No Violation
+            try {
+                y = 0;
+            } finally {
+                y = 1;
+            }
+        }
+
+        public void test4() {
+            final boolean b = false;
+            int x;        // No Violation
+            if (b) {
+                x = 1;
+            } else {
+                x = 2;
+            }
+
+            if(b) {
+                x = 3;
+            }
+        }
+
+        public void test5() {
+            final boolean b = false;
+            int shouldBeFinal;    //Violation
+            if(b) {
+            }
+            if (b) {
+                shouldBeFinal = 1;
+            } else {
+                shouldBeFinal = 2;
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2One.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2One.java
new file mode 100644
index 00000000000..eed35856e4e
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2One.java
@@ -0,0 +1,91 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = PARAMETER_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariable2One {
+    private int m_ClassVariable = 0;
+    //static block
+    static
+    {
+        int i, j = 0;
+        Runnable runnable = new Runnable()
+        {
+            public void run()
+            {
+            }
+        };
+    }
+    /** constructor */
+    public InputFinalLocalVariable2One()
+    {
+        int i = 0;
+        // final variable
+        final int j = 2;
+
+        int z;
+
+        Object obj = new Object();
+
+        int k = 0;
+
+        String x = obj.toString();
+
+        k++;
+
+        k = 2;
+
+        Runnable runnable = new Runnable()
+        {
+            public void run()
+            {
+                int q = 0;
+            }
+        };
+    }
+
+    public void method(int aArg, final int aFinal, int aArg2) // violation
+    {
+        int z = 0;
+
+        z++;
+
+        aArg2++;
+    }
+
+    public void aMethod()
+    {
+        int i = 0;
+
+        final int j = 2;
+
+        int z;
+
+        Object obj = new Object();
+
+        int k = 0;
+
+        String x = obj.toString();
+
+        k++;
+
+        final class Inner
+        {
+            public Inner()
+            {
+                int w = 0;
+                Runnable runnable = new Runnable()
+                {
+                    public void run()
+                    {
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Three.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Three.java
new file mode 100644
index 00000000000..d9bab87ac48
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Three.java
@@ -0,0 +1,113 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = PARAMETER_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariable2Three {
+    class class22 {
+        public void method1(){
+            int x;
+            x = 3;
+        }
+        public void method2() {
+            for(int i=0;i<5;i++){
+                int x;
+                x = 3;
+            }
+            int y;
+            for(int i=0;i<5;i++) {
+                y = 3;
+            }
+            for(int i=0;i<5;i++) {
+                int z;
+                for(int j=0;j<5;j++) {
+                    z = 3;
+                }
+            }
+        }
+        public void method3() {
+            int m;
+            do {
+                m = 0;
+            } while (false);
+            do {
+                int n;
+                n = 0;
+            } while (true);
+        }
+
+        private void foo() {
+            int q;
+            int w;
+            int e;
+            q = 1;
+            w = 1;
+            e = 1;
+            e = 2;
+            class Local {
+                void bar() {
+                    int q;
+                    int w;
+                    int e;
+                    q = 1;
+                    q = 2;
+                    w = 1;
+                    e = 1;
+                }
+            }
+
+            int i;
+            for (;; i = 1) { }
+        }
+
+        public void method4() {
+            int m;
+            int i = 5;
+            while (i > 1) {
+                m = 0;
+                i++;
+            }
+            while (true) {
+                int n;
+                n = 0;
+            }
+        }
+
+        int[] array = new int[10];
+        public void method5() {
+            int r;
+            for (int a: array) {
+                r = 0;
+            }
+            for (int a: array) {
+                int t;
+                t = 0;
+            }
+        }
+    }
+
+    class classs32 {
+        public void method(final int i) {
+            switch (i) {
+                case 1:
+                    int foo = 1;    // Violation
+                    break;
+                default:
+            }
+            switch (i) {
+                case 1:
+                    int foo = 1;    // No Violation
+                    break;
+                case 2:
+                    foo = 2;
+                    break;
+                default:
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Two.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Two.java
new file mode 100644
index 00000000000..3e1820560f0
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariable2Two.java
@@ -0,0 +1,110 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = PARAMETER_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariable2Two {
+
+    public void anotherMethod()
+    {
+        boolean aBool = true;
+        for (int i = 0, j = 1, k = 1; j < 10 ; j++)
+        {
+            k++;
+            aBool = false;
+        }
+
+        int l = 0;
+        {
+            int weird = 0;
+            int j = 0;
+            int k = 0;
+            {
+                l++;
+            }
+        }
+
+        int weird = 0;
+        weird++;
+
+        final InputFinalLocalVariable2Two.InnerClass ic =
+                new InputFinalLocalVariable2Two.InnerClass();
+
+        ic.mInner2 = 1;
+    }
+
+    class InnerClass
+    {
+        private int mInner = 0;
+
+        public int mInner2 = 0;
+    }
+}
+
+interface Inter2
+{
+    void method(int aParam);
+}
+
+abstract class AbstractClass2
+{
+    public abstract void abstractMethod(int aParam);
+}
+
+class Blah2
+{
+    static
+    {
+        for(int a : getInts())
+        {
+
+        }
+    }
+
+    static int[] getInts() {
+        return null;
+    }
+}
+
+class test_12417222
+{
+    private Object o_;
+
+    public void doSomething(Object _o) // violation
+    {
+        System.identityHashCode(_o);
+    }
+
+    public void doSomething2(Object _o1) // violation
+    {
+        o_ = _o1;
+    }
+}
+
+class class12
+{
+    public class12(final int x){
+
+    }
+}
+
+class AA2 {
+    {
+        int y = 0;
+        y = 9;
+    }
+}
+
+enum Enum12 {
+    ;
+
+    {
+        int var = 0;
+        var = 1;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableConstructor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableConstructor.java
index 80dda49a9af..70002ffef05 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableConstructor.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableConstructor.java
@@ -26,10 +26,10 @@ public class InputFinalLocalVariableConstructor {
 
 class Mutation {
 
-    Mutation(final int a) { // ok
+    Mutation(final int a) {
     }
 
-    Mutation(final String check) { // ok
+    Mutation(final String check) {
     }
 
     Mutation(String str, final int b) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFalsePositive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFalsePositive.java
index a49bb705717..9b40b3f84a5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFalsePositive.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFalsePositive.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
-public class InputFinalLocalVariableFalsePositive // ok
+public class InputFinalLocalVariableFalsePositive
 {
     public void method()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFive.java
new file mode 100644
index 00000000000..6ebf07a01cb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFive.java
@@ -0,0 +1,113 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = (default)VARIABLE_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariableFive {
+    class class5 {
+        public void test1(){
+            final boolean b = false;
+            int shouldBeFinal;    // violation
+            if(b){
+                if(b){
+                    shouldBeFinal = 1;
+                } else {
+                    shouldBeFinal = 2;
+                }
+            }
+        }
+        public void test2() {
+            final int b = 10;
+            int shouldBeFinal;        // violation
+
+            switch (b) {
+                case 0:
+                    switch (b) {
+                        case 0:
+                            shouldBeFinal = 1;
+                            break;
+                        default:
+                            shouldBeFinal = 2;
+                            break;
+                    }
+                    break;
+                default:
+                    shouldBeFinal = 3;
+                    break;
+            }
+        }
+        public void test3() {
+            int x;    //No Violation
+            try {
+                x = 0;
+                try {
+                    x = 0;
+                } catch (final Exception e) {
+                    x = 1;
+                }
+            } catch (final Exception e) {
+                x = 1;
+            }
+        }
+        public void test4() {
+            int shouldBeFinal;    // violation
+            class Bar {
+                void bar () {
+                    int shouldBeFinal;    // violation
+                    final boolean b = false;
+                    if (b) {
+                        if (b) {
+                            shouldBeFinal = 1;
+                        } else {
+                            shouldBeFinal = 2;
+                        }
+                    } else {
+                        shouldBeFinal = 2;
+                    }
+                }
+            }
+
+            abstract class Bar2 {
+                abstract void method(String param);
+            }
+        }
+
+        public void test5() {
+            InputFinalLocalVariableFive table = new InputFinalLocalVariableFive(); // violation
+            new Runnable() {
+                @Override
+                public void run() {
+                    InputFinalLocalVariableFive table = null;
+                    table = new InputFinalLocalVariableFive();
+                }
+            };
+        }
+
+        public void test6() {
+            byte tmpByte[];
+
+            if (true) {
+                if (true) {
+                    tmpByte = new byte[0];
+                }
+            } else {
+                if (true) {
+                    if (true) {
+                        tmpByte = new byte[1];
+                    }
+                }
+                if (false) {
+                    if (true) {
+                        tmpByte = new byte[2];
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFour.java
new file mode 100644
index 00000000000..c4263a8f0a9
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableFour.java
@@ -0,0 +1,100 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = (default)VARIABLE_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariableFour {
+
+    class Class3 {
+        public void test1() {
+            final boolean b = true;
+            int shouldBeFinal;        // violation
+
+            if (b) {
+                shouldBeFinal = 1;
+            }
+            else {
+                shouldBeFinal = 2;
+            }
+        }
+
+        public void test2() {
+            final int b = 10;
+            int shouldBeFinal;        // violation
+
+            switch (b) {
+                case 0:
+                    shouldBeFinal = 1;
+                    break;
+                default:
+                    shouldBeFinal = 2;
+                    break;
+            }
+        }
+
+        public void test3() {
+            int x;        // No Violation
+            try {
+                x = 0;
+            } catch (final Exception e) {
+                x = 1;
+            }
+
+            int y;        // No Violation
+            try {
+                y = 0;
+            } finally {
+                y = 1;
+            }
+        }
+
+        public void test4() {
+            final boolean b = false;
+            int x;        // No Violation
+            if (b) {
+                x = 1;
+            } else {
+                x = 2;
+            }
+
+            if(b) {
+                x = 3;
+            }
+        }
+
+        public void test5() {
+            final boolean b = false;
+            int shouldBeFinal;    // violation
+            if(b) {
+            }
+            if (b) {
+                shouldBeFinal = 1;
+            } else {
+                shouldBeFinal = 2;
+            }
+        }
+    }
+
+    class class4 {
+        public void foo() {
+            int shouldBeFinal;    // violation
+            class Bar {
+                void bar () {
+                    int shouldBeFinal;    // violation
+                    final boolean b = false;
+                    if (b) {
+                        shouldBeFinal = 1;
+                    } else {
+                        shouldBeFinal = 2;
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableLeavingSlistToken.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableLeavingSlistToken.java
index cf371d56cb7..f08d67219eb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableLeavingSlistToken.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableLeavingSlistToken.java
@@ -10,7 +10,7 @@
 
 import java.util.stream.Stream;
 
-public class InputFinalLocalVariableLeavingSlistToken { // ok
+public class InputFinalLocalVariableLeavingSlistToken {
 
     private int assignedInInstanceInitAndCtor;
     private static int assignedInStaticInitAndFoo1;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultiCatch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultiCatch.java
index 840eb11af5f..496aefa8fa4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultiCatch.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultiCatch.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
-public class InputFinalLocalVariableMultiCatch { // ok
+public class InputFinalLocalVariableMultiCatch {
     public void demo() throws Throwable {
         try {
             // do nothing
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultipleAndNestedConditions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultipleAndNestedConditions.java
index cd685d11c40..bcf028d3018 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultipleAndNestedConditions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableMultipleAndNestedConditions.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
-public class InputFinalLocalVariableMultipleAndNestedConditions { // ok
+public class InputFinalLocalVariableMultipleAndNestedConditions {
 
     // False positive
     // https://github.com/checkstyle/checkstyle/issues/3186
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableNativeMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableNativeMethods.java
index 1743f2444bd..1ff0763d41d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableNativeMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableNativeMethods.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
-public class InputFinalLocalVariableNativeMethods // ok
+public class InputFinalLocalVariableNativeMethods
 {
     public native String nativeFoo(int a, int b);
     private native double average(int n1, int n2);
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableOne.java
new file mode 100644
index 00000000000..4f418aa520a
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableOne.java
@@ -0,0 +1,92 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = (default)VARIABLE_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariableOne {
+
+    private int m_ClassVariable = 0;
+    //static block
+    static
+    {
+        int i, j = 0; // 2 violations
+        Runnable runnable = new Runnable() // violation
+        {
+            public void run()
+            {
+            }
+        };
+    }
+    /** constructor */
+    public InputFinalLocalVariableOne()
+    {
+        int i = 0; // violation
+        // final variable
+        final int j = 2;
+
+        int z; // violation
+
+        Object obj = new Object(); // violation
+
+        int k = 0;
+
+        String x = obj.toString(); // violation
+
+        k++;
+
+        k = 2;
+
+        Runnable runnable = new Runnable() // violation
+        {
+            public void run()
+            {
+                int q = 0; // violation
+            }
+        };
+    }
+
+    public void method(int aArg, final int aFinal, int aArg2)
+    {
+        int z = 0;
+
+        z++;
+
+        aArg2++;
+    }
+
+    public void aMethod()
+    {
+        int i = 0; // violation
+
+        final int j = 2;
+
+        int z; // violation
+
+        Object obj = new Object(); // violation
+
+        int k = 0;
+
+        String x = obj.toString(); // violation
+
+        k++;
+
+        final class Inner
+        {
+            public Inner()
+            {
+                int w = 0; // violation
+                Runnable runnable = new Runnable() // violation
+                {
+                    public void run()
+                    {
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableReceiverParameter.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableReceiverParameter.java
index 86d71639114..319b2f3a777 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableReceiverParameter.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableReceiverParameter.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
 
-public class InputFinalLocalVariableReceiverParameter { // ok
+public class InputFinalLocalVariableReceiverParameter {
     public void foo4(InputFinalLocalVariableReceiverParameter this)
     {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableSwitchStatement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableSwitchStatement.java
index afbfac4c03a..7c1b4ba9045 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableSwitchStatement.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableSwitchStatement.java
@@ -15,7 +15,7 @@ enum T {
     }
 
     public void foo() {
-        int x; // ok
+        int x;
 
         {
             final T y = T.A;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableThree.java
new file mode 100644
index 00000000000..202c3c6d2c3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableThree.java
@@ -0,0 +1,117 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = (default)VARIABLE_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariableThree {
+    class class2 {
+        public void method1() {
+            int x; // violation
+            x = 3;
+        }
+
+        public void method2() {
+            for (int i = 0; i < 5; i++) {
+                int x; // violation
+                x = 3;
+            }
+            int y;
+            for (int i = 0; i < 5; i++) {
+                y = 3;
+            }
+            for (int i = 0; i < 5; i++) {
+                int z;
+                for (int j = 0; j < 5; j++) {
+                    z = 3;
+                }
+            }
+        }
+
+        public void method3() {
+            int m;
+            do {
+                m = 0;
+            } while (false);
+            do {
+                int n; // violation
+                n = 0;
+            } while (true);
+        }
+
+        private void foo() {
+            int q; // violation
+            int w; // violation
+            int e;
+            q = 1;
+            w = 1;
+            e = 1;
+            e = 2;
+            class Local {
+                void bar() {
+                    int q;
+                    int w; // violation
+                    int e; // violation
+                    q = 1;
+                    q = 2;
+                    w = 1;
+                    e = 1;
+                }
+            }
+
+            int i;
+            for (; ; i = 1) {
+            }
+        }
+
+        public void method4() {
+            int m;
+            int i = 5;
+            while (i > 1) {
+                m = 0;
+                i++;
+            }
+            while (true) {
+                int n; // violation
+                n = 0;
+            }
+        }
+
+        int[] array = new int[10];
+
+        public void method5() {
+            int r;
+            for (int a : array) {
+                r = 0;
+            }
+            for (int a : array) {
+                int t; // violation
+                t = 0;
+            }
+        }
+    }
+
+    class classs3 {
+        public void method(final int i) {
+            switch (i) {
+                case 1:
+                    int foo = 1;    // violation
+                    break;
+                default:
+            }
+            switch (i) {
+                case 1:
+                    int foo = 1;    // No Violation
+                    break;
+                case 2:
+                    foo = 2;
+                    break;
+                default:
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableTwo.java
new file mode 100644
index 00000000000..dc5e1547ab3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/finallocalvariable/InputFinalLocalVariableTwo.java
@@ -0,0 +1,110 @@
+/*
+FinalLocalVariable
+validateEnhancedForLoopVariable = (default)false
+tokens = (default)VARIABLE_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.finallocalvariable;
+
+public class InputFinalLocalVariableTwo {
+
+    public void anotherMethod()
+    {
+        boolean aBool = true;
+        for (int i = 0, j = 1, k = 1; j < 10 ; j++)
+        {
+            k++;
+            aBool = false;
+        }
+
+        int l = 0;
+        {
+            int weird = 0; // violation
+            int j = 0; // violation
+            int k = 0; // violation
+            {
+                l++;
+            }
+        }
+
+        int weird = 0;
+        weird++;
+
+        final InputFinalLocalVariableTwo.InnerClass ic
+                = new InputFinalLocalVariableTwo.InnerClass();
+
+        ic.mInner2 = 1;
+    }
+
+    class InnerClass
+    {
+        private int mInner = 0;
+
+        public int mInner2 = 0;
+    }
+}
+
+interface Inter
+{
+    void method(int aParam);
+}
+
+abstract class AbstractClass
+{
+    public abstract void abstractMethod(int aParam);
+}
+
+class Blah
+{
+    static
+    {
+        for(int a : getInts())
+        {
+
+        }
+    }
+
+    static int[] getInts() {
+        return null;
+    }
+}
+
+class test_1241722
+{
+    private Object o_;
+
+    public void doSomething(Object _o)
+    {
+        System.identityHashCode(_o);
+    }
+
+    public void doSomething2(Object _o1)
+    {
+        o_ = _o1;
+    }
+}
+
+class class1
+{
+    public class1(final int x){
+
+    }
+}
+
+class AA {
+    {
+        int y = 0;
+        y = 9;
+    }
+}
+
+enum Enum1 {
+    ;
+
+    {
+        int var = 0;
+        var = 1;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenField8.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenField8.java
index 0018da20784..8554f7fd356 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenField8.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenField8.java
@@ -21,7 +21,7 @@
  * Test case for hidden fields
  * @author Rick Giles
  **/
-class InputHiddenField8 // ok
+class InputHiddenField8
 {
     private int hidden = 0;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldReceiver.java
index d88792696ab..aa2e7b8c62c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldReceiver.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/hiddenfield/InputHiddenFieldReceiver.java
@@ -12,7 +12,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.hiddenfield;
 
-public class InputHiddenFieldReceiver { // ok
+public class InputHiddenFieldReceiver {
     public void foo4(InputHiddenFieldReceiver this) {}
 
     private class Inner {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch.java
deleted file mode 100644
index e3ea4fc41bc..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-IllegalCatch
-illegalClassNames = (default)Error, Exception, RuntimeException, Throwable, java.lang.Error, \
-                    java.lang.Exception, java.lang.RuntimeException, java.lang.Throwable
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
-
-public class InputIllegalCatch {
-    public void foo() {
-        try { //class names
-        } catch (RuntimeException e) { // violation
-        } catch (Exception e) { // violation
-        } catch (Throwable e) { // violation
-        }
-    }
-
-    public void bar() {
-        try { /* fully qualified class names */
-        } catch (java.lang.RuntimeException e) { // violation
-        } catch (java.lang.Exception e) { // violation
-        } catch (java.lang.Throwable e) { // violation
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch2.java
deleted file mode 100644
index 396513c3c53..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch2.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-IllegalCatch
-illegalClassNames = java.lang.Error, java.lang.Exception, NullPointerException, \
-                    OneMoreException, RuntimeException, SQLException
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
-
-public class InputIllegalCatch2 {
-    public void foo() throws OneMoreException {
-        try {
-                foo1();
-        } catch (RuntimeException | SQLException e) {} // 2 violations
-        try {
-                foo1();
-        } catch (RuntimeException | SQLException | OneMoreException e) {} // 3 violations
-        try {
-                foo1();
-        } catch (OneMoreException | RuntimeException | SQLException e) {} // 3 violations
-        try {
-                foo1();
-        } catch (OneMoreException | SQLException | RuntimeException e) {} // 3 violations
-
-    }
-
-    private void foo1() throws RuntimeException, SQLException, OneMoreException {
-
-    }
-
-    private class SQLException extends Exception {
-
-    }
-
-    private class OneMoreException extends Exception {
-
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch3.java
deleted file mode 100644
index b200e197a73..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-IllegalCatch
-illegalClassNames = java.lang.Error, java.lang.Exception, java.lang.Throwable
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
-
-public class InputIllegalCatch3 {
-    public void foo() {
-        try { //class names
-        } catch (RuntimeException e) {
-        } catch (Exception e) { // violation
-        } catch (Throwable e) { // violation
-        }
-    }
-
-    public void bar() {
-        try { /* fully qualified class names */
-        } catch (java.lang.RuntimeException e) {
-        } catch (java.lang.Exception e) { // violation
-        } catch (java.lang.Throwable e) { // violation
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch4.java
deleted file mode 100644
index c04f4e43cf7..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatch4.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-IllegalCatch
-illegalClassNames = java.lang.Error, java.lang.Exception, NullPointerException,\
-                    java.lang.IOException.
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
-
-public class InputIllegalCatch4 {
-    public void foo() {
-        try { //class names
-        } catch (RuntimeException e) {
-        } catch (Exception e) { // violation
-        } catch (Throwable e) {
-        }
-    }
-
-    public void bar() {
-        try { /* fully qualified class names */
-        } catch (java.lang.RuntimeException e) {
-        } catch (java.lang.Exception e) { // violation
-        } catch (java.lang.Throwable e) {
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckDefaultTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckDefaultTokens.java
new file mode 100644
index 00000000000..2f9e5907cb5
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckDefaultTokens.java
@@ -0,0 +1,27 @@
+/*
+IllegalCatch
+illegalClassNames = (default)Error, Exception, RuntimeException, Throwable, java.lang.Error, \
+                    java.lang.Exception, java.lang.RuntimeException, java.lang.Throwable
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
+
+public class InputIllegalCatchCheckDefaultTokens {
+    public void foo() {
+        try { //class names
+        } catch (RuntimeException e) { // violation
+        } catch (Exception e) { // violation
+        } catch (Throwable e) { // violation
+        }
+    }
+
+    public void bar() {
+        try { /* fully qualified class names */
+        } catch (java.lang.RuntimeException e) { // violation
+        } catch (java.lang.Exception e) { // violation
+        } catch (java.lang.Throwable e) { // violation
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckMultipleExceptions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckMultipleExceptions.java
new file mode 100644
index 00000000000..1ace07ed795
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckMultipleExceptions.java
@@ -0,0 +1,39 @@
+/*
+IllegalCatch
+illegalClassNames = java.lang.Error, java.lang.Exception, NullPointerException, \
+                    OneMoreException, RuntimeException, SQLException
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
+
+public class InputIllegalCatchCheckMultipleExceptions {
+    public void foo() throws OneMoreException {
+        try {
+                foo1();
+        } catch (RuntimeException | SQLException e) {} // 2 violations
+        try {
+                foo1();
+        } catch (RuntimeException | SQLException | OneMoreException e) {} // 3 violations
+        try {
+                foo1();
+        } catch (OneMoreException | RuntimeException | SQLException e) {} // 3 violations
+        try {
+                foo1();
+        } catch (OneMoreException | SQLException | RuntimeException e) {} // 3 violations
+
+    }
+
+    private void foo1() throws RuntimeException, SQLException, OneMoreException {
+
+    }
+
+    private class SQLException extends Exception {
+
+    }
+
+    private class OneMoreException extends Exception {
+
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckSuperclassException.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckSuperclassException.java
new file mode 100644
index 00000000000..fce5240efae
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckSuperclassException.java
@@ -0,0 +1,27 @@
+/*
+IllegalCatch
+illegalClassNames = java.lang.Error, java.lang.Exception, NullPointerException,\
+                    java.lang.IOException.
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
+
+public class InputIllegalCatchCheckSuperclassException {
+    public void foo() {
+        try { //class names
+        } catch (RuntimeException e) {
+        } catch (Exception e) { // violation
+        } catch (Throwable e) {
+        }
+    }
+
+    public void bar() {
+        try { /* fully qualified class names */
+        } catch (java.lang.RuntimeException e) {
+        } catch (java.lang.Exception e) { // violation
+        } catch (java.lang.Throwable e) {
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckSuperclassThrowable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckSuperclassThrowable.java
new file mode 100644
index 00000000000..0a0fce2264f
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalcatch/InputIllegalCatchCheckSuperclassThrowable.java
@@ -0,0 +1,26 @@
+/*
+IllegalCatch
+illegalClassNames = java.lang.Error, java.lang.Exception, java.lang.Throwable
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegalcatch;
+
+public class InputIllegalCatchCheckSuperclassThrowable {
+    public void foo() {
+        try { //class names
+        } catch (RuntimeException e) {
+        } catch (Exception e) { // violation
+        } catch (Throwable e) { // violation
+        }
+    }
+
+    public void bar() {
+        try { /* fully qualified class names */
+        } catch (java.lang.RuntimeException e) {
+        } catch (java.lang.Exception e) { // violation
+        } catch (java.lang.Throwable e) { // violation
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiation.java
index 185436b2789..885a072047e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiation.java
@@ -12,7 +12,7 @@
 import java.util.function.Supplier;
 
 
-public class InputIllegalInstantiation // ok
+public class InputIllegalInstantiation
 {
 
     public static void main(String[] args)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree1.java
index ffc571e93f9..376d67d1f81 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree1.java
@@ -1,5 +1,4 @@
 package com.puppycrawl.tools.checkstyle.checks.coding.illegalinstantiation;
 
-// ok
 public class InputIllegalInstantiationBeginTree1 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree2.java
index f8f3ff2e139..4889e6ca7d0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationBeginTree2.java
@@ -7,7 +7,7 @@
 
 */
 
-// ok
+
 public class InputIllegalInstantiationBeginTree2 {
 
     void otherInstantiations()
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang3.java
index c5b4dd094a2..87d541d91a7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationLang3.java
@@ -9,6 +9,6 @@
 package com.puppycrawl.tools.checkstyle.checks.coding.illegalinstantiation;
 
 class InputIllegalInstantiationLang3 {
-    Boolean obj = new Boolean(true); // ok
+    Boolean obj = new Boolean(true);
     Integer obj2 = new Integer(0);
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationNameSimilarToStandardClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationNameSimilarToStandardClasses.java
index 5e67358cf05..efa855b5401 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationNameSimilarToStandardClasses.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationNameSimilarToStandardClasses.java
@@ -10,7 +10,7 @@
 
 public class InputIllegalInstantiationNameSimilarToStandardClasses {
     void method() {
-        new foo(); // ok
+        new foo();
     }
 
     class foo {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSameClassNameJavaLang.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSameClassNameJavaLang.java
index f4aef4689ef..490d74f534d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSameClassNameJavaLang.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSameClassNameJavaLang.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.illegalinstantiation;
 
-public class InputIllegalInstantiationSameClassNameJavaLang // ok
+public class InputIllegalInstantiationSameClassNameJavaLang
 {
     InputTest obj = new InputTest();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSemantic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSemantic.java
index 647b9d099c1..db313007c80 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSemantic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalinstantiation/InputIllegalInstantiationSemantic.java
@@ -16,7 +16,7 @@
  * Test case for detecting simple semantic violations.
  * @author Lars Kühne
  **/
-class InputIllegalInstantiationSemantic // ok
+class InputIllegalInstantiationSemantic
 {
     /* Boolean instantiation in a static initializer */
     static {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreMethodNames.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreMethodNames.java
index e265691300a..bdf09a02cd6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreMethodNames.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreMethodNames.java
@@ -12,7 +12,7 @@
 
 public class InputIllegalThrowsIgnoreMethodNames {
 
-    public void method() throws NullPointerException // ok
+    public void method() throws NullPointerException
     { // no code
     }
 
@@ -21,7 +21,7 @@ public java.lang.Throwable methodOne() throws RuntimeException // violation
         return null;
     }
 
-    public void methodTwo() throws java.lang.RuntimeException, java.lang.Error // ok
+    public void methodTwo() throws java.lang.RuntimeException, java.lang.Error
     {
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreOverriddenMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreOverriddenMethods.java
index c82f9552def..a47fc47e6ea 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreOverriddenMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsIgnoreOverriddenMethods.java
@@ -14,12 +14,12 @@ public class InputIllegalThrowsIgnoreOverriddenMethods
              extends InputIllegalThrowsTestDefault
 {
     @Override
-    public void methodTwo() throws RuntimeException { // ok
+    public void methodTwo() throws RuntimeException {
 
     }
 
     @java.lang.Override
-    public java.lang.Throwable methodOne() throws RuntimeException { // ok
+    public java.lang.Throwable methodOne() throws RuntimeException {
         return null;
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestClassNames.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestClassNames.java
index 25e63993d96..8f0b109c847 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestClassNames.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestClassNames.java
@@ -15,12 +15,12 @@ public void method() throws NullPointerException // violation
     { // no code
     }
 
-    public java.lang.Throwable methodOne() throws RuntimeException // ok
+    public java.lang.Throwable methodOne() throws RuntimeException
     {
         return null;
     }
 
-    public void methodTwo() throws java.lang.RuntimeException, java.lang.Error // ok
+    public void methodTwo() throws java.lang.RuntimeException, java.lang.Error
     {
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestDefault.java
index 1d4da30bd1e..47b1aca84d2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestDefault.java
@@ -12,7 +12,7 @@
 
 public class InputIllegalThrowsTestDefault {
 
-    public void method() throws NullPointerException // ok
+    public void method() throws NullPointerException
     { // no code
     }
 
@@ -26,7 +26,7 @@ public void methodTwo() throws java.lang.RuntimeException, // violation
     {
     }
 
-    public void finalize() throws Throwable { // ok
+    public void finalize() throws Throwable {
 
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestIllegalClassNames.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestIllegalClassNames.java
index f950be6b72d..fe806682a31 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestIllegalClassNames.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegalthrows/InputIllegalThrowsTestIllegalClassNames.java
@@ -16,7 +16,7 @@ public void method() throws NullPointerException // violation
     { // no code
     }
 
-    public java.lang.Throwable methodOne() throws RuntimeException // ok
+    public java.lang.Throwable methodOne() throws RuntimeException
     {
         return null;
     }
@@ -25,7 +25,7 @@ public void methodTwo() throws java.lang.RuntimeException, java.lang.Error // vi
     {
     }
 
-    public void finalize() throws Throwable { // ok
+    public void finalize() throws Throwable {
 
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens.java
deleted file mode 100644
index 2bc26554434..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-IllegalToken
-tokens = (default)LABELED_STAT
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokens
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label: // violation
-        {
-            anotherLabel: // violation
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens2.java
deleted file mode 100644
index 8799e44cdbf..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens2.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-IllegalToken
-tokens = LITERAL_SWITCH,POST_INC,POST_DEC
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokens2
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i) // violation
-        {
-            default:
-                i--; // violation
-                i++; // violation
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens3.java
deleted file mode 100644
index 4d9b493ab4a..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens3.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-IllegalToken
-tokens = LITERAL_NATIVE
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokens3
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod(); // violation
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens4.java
deleted file mode 100644
index e9db381854b..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens4.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* // violation
-IllegalToken
-tokens = COMMENT_CONTENT
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
-
-/** // violation
- * Test for illegal tokens
- */
-public class InputIllegalTokens4
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href // violation
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href // violation
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens5.java
deleted file mode 100644
index 82994a1e0da..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens5.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* // violation
-IllegalToken
-tokens = BLOCK_COMMENT_BEGIN
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
-
-/** // violation
- * Test for illegal tokens
- */
-public class InputIllegalTokens5
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens6.java
deleted file mode 100644
index af44fb1800c..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens6.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-IllegalToken
-tokens = BLOCK_COMMENT_END
-
-
-*/ // violation
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
-
-/**
- * Test for illegal tokens
- */ // violation
-public class InputIllegalTokens6
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens7.java
deleted file mode 100644
index f3cc82f2ab6..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokens7.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-IllegalToken
-tokens = SINGLE_LINE_COMMENT
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokens7
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // violation
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // violation
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentBegin.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentBegin.java
new file mode 100644
index 00000000000..a1a4233d514
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentBegin.java
@@ -0,0 +1,45 @@
+/* // violation
+IllegalToken
+tokens = BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
+
+/** // violation
+ * Test for illegal tokens
+ */
+public class InputIllegalTokensCheckBlockCommentBegin
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentEnd.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentEnd.java
new file mode 100644
index 00000000000..a627739c46e
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckBlockCommentEnd.java
@@ -0,0 +1,45 @@
+/*
+IllegalToken
+tokens = BLOCK_COMMENT_END
+
+
+*/ // violation
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
+
+/**
+ * Test for illegal tokens
+ */ // violation
+public class InputIllegalTokensCheckBlockCommentEnd
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckCommentsContent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckCommentsContent.java
new file mode 100644
index 00000000000..32f58d7a276
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckCommentsContent.java
@@ -0,0 +1,45 @@
+/* // violation
+IllegalToken
+tokens = COMMENT_CONTENT
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
+
+/** // violation
+ * Test for illegal tokens
+ */
+public class InputIllegalTokensCheckCommentsContent
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href // violation
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href // violation
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckDefaultTokenLabel.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckDefaultTokenLabel.java
new file mode 100644
index 00000000000..6a25504772b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckDefaultTokenLabel.java
@@ -0,0 +1,45 @@
+/*
+IllegalToken
+tokens = (default)LABELED_STAT
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokensCheckDefaultTokenLabel
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label: // violation
+        {
+            anotherLabel: // violation
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSingleLineComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSingleLineComment.java
new file mode 100644
index 00000000000..b2a1608f753
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSingleLineComment.java
@@ -0,0 +1,45 @@
+/*
+IllegalToken
+tokens = SINGLE_LINE_COMMENT
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokensCheckSingleLineComment
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // violation
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // violation
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSwitchAndPostIncDec.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSwitchAndPostIncDec.java
new file mode 100644
index 00000000000..b62dab38fb3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckSwitchAndPostIncDec.java
@@ -0,0 +1,45 @@
+/*
+IllegalToken
+tokens = LITERAL_SWITCH,POST_INC,POST_DEC
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokensCheckSwitchAndPostIncDec
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i) // violation
+        {
+            default:
+                i--; // violation
+                i++; // violation
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckTokenNative.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckTokenNative.java
new file mode 100644
index 00000000000..198626f3366
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltoken/InputIllegalTokensCheckTokenNative.java
@@ -0,0 +1,45 @@
+/*
+IllegalToken
+tokens = LITERAL_NATIVE
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltoken;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokensCheckTokenNative
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod(); // violation
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCaseInSensitive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCaseInSensitive.java
new file mode 100644
index 00000000000..dbe59b8f9c5
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCaseInSensitive.java
@@ -0,0 +1,48 @@
+/*
+IllegalTokenText
+format = a href
+ignoreCase = true
+message = (default)
+tokens = STRING_LITERAL
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokenTextCheckCaseInSensitive
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\""; // violation
+        final String refCase = "<A hReF=\""; // violation
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCommentToken.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCommentToken.java
new file mode 100644
index 00000000000..14fd475daba
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCommentToken.java
@@ -0,0 +1,48 @@
+/* // violation
+IllegalTokenText
+format = a href
+ignoreCase = (default)false
+message = (null)
+tokens = COMMENT_CONTENT
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokenTextCheckCommentToken
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\"";
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false); // violation below
+            break label; // a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCustomMessageInStringLiteral.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCustomMessageInStringLiteral.java
new file mode 100644
index 00000000000..b390beb6630
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckCustomMessageInStringLiteral.java
@@ -0,0 +1,48 @@
+/*
+IllegalTokenText
+format = a href
+ignoreCase = (default)false
+message = My custom message
+tokens = STRING_LITERAL
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokenTextCheckCustomMessageInStringLiteral
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\""; // violation
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckDefaultCaseSensitive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckDefaultCaseSensitive.java
new file mode 100644
index 00000000000..55808330b8c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckDefaultCaseSensitive.java
@@ -0,0 +1,48 @@
+/*
+IllegalTokenText
+format = a href
+ignoreCase = (default)false
+message = (default)
+tokens = STRING_LITERAL
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokenTextCheckDefaultCaseSensitive
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\""; // violation
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckNullMessageInStringLiteral.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckNullMessageInStringLiteral.java
new file mode 100644
index 00000000000..d85cfb77466
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextCheckNullMessageInStringLiteral.java
@@ -0,0 +1,48 @@
+/*
+IllegalTokenText
+format = a href
+ignoreCase = (default)false
+message = (null)
+tokens = STRING_LITERAL
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+/**
+ * Test for illegal tokens
+ */
+public class InputIllegalTokenTextCheckNullMessageInStringLiteral
+{
+    public void methodWithPreviouslyIllegalTokens()
+    {
+        int i = 0;
+        switch (i)
+        {
+            default:
+                i--;
+                i++;
+                break;
+        }
+    }
+
+    public native void nativeMethod();
+
+    public void methodWithLiterals()
+    {
+        final String ref = "<a href=\""; // violation
+        final String refCase = "<A hReF=\"";
+    }
+
+    public void methodWithLabels() {
+        label:
+        {
+            anotherLabel: // some comment href
+            do {
+                continue anotherLabel;
+            } while (false);
+            break label; // some a href
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextDefaultFormat.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextDefaultFormat.java
index ca282ae1a81..3cf9993e7bd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextDefaultFormat.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextDefaultFormat.java
@@ -11,7 +11,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
 
-public class InputIllegalTokenTextDefaultFormat { // ok
+public class InputIllegalTokenTextDefaultFormat {
     public void myTest() {
         String test = "a href";
         String test2 = "A href";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens.java
deleted file mode 100644
index fd04a93b814..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-IllegalTokenText
-format = a href
-ignoreCase = (default)false
-message = (default)
-tokens = STRING_LITERAL
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokenTextTokens
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\""; // violation
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens2.java
deleted file mode 100644
index c0e1fe1588b..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens2.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-IllegalTokenText
-format = a href
-ignoreCase = true
-message = (default)
-tokens = STRING_LITERAL
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokenTextTokens2
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\""; // violation
-        final String refCase = "<A hReF=\""; // violation
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens3.java
deleted file mode 100644
index ddd9d84cec0..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens3.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-IllegalTokenText
-format = a href
-ignoreCase = (default)false
-message = My custom message
-tokens = STRING_LITERAL
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokenTextTokens3
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\""; // violation
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens4.java
deleted file mode 100644
index f8e7e53090c..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens4.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-IllegalTokenText
-format = a href
-ignoreCase = (default)false
-message = (null)
-tokens = STRING_LITERAL
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokenTextTokens4
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\""; // violation
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false);
-            break label; // some a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens5.java
deleted file mode 100644
index d3d76967b94..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/InputIllegalTokenTextTokens5.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* // violation
-IllegalTokenText
-format = a href
-ignoreCase = (default)false
-message = (null)
-tokens = COMMENT_CONTENT
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
-
-/**
- * Test for illegal tokens
- */
-public class InputIllegalTokenTextTokens5
-{
-    public void methodWithPreviouslyIllegalTokens()
-    {
-        int i = 0;
-        switch (i)
-        {
-            default:
-                i--;
-                i++;
-                break;
-        }
-    }
-
-    public native void nativeMethod();
-
-    public void methodWithLiterals()
-    {
-        final String ref = "<a href=\"";
-        final String refCase = "<A hReF=\"";
-    }
-
-    public void methodWithLabels() {
-        label:
-        {
-            anotherLabel: // some comment href
-            do {
-                continue anotherLabel;
-            } while (false); // violation below
-            break label; // a href
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeAbstractClassNameFormat.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeAbstractClassNameFormat.java
index f97fe33b87d..b4c4344b37e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeAbstractClassNameFormat.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeAbstractClassNameFormat.java
@@ -15,7 +15,7 @@ public class InputIllegalTypeAbstractClassNameFormat {
 class Test extends Gitter { // violation 'Usage of type 'Gitter' is not allowed'
 }
 
-class Test1 extends Github { // OK
+class Test1 extends Github {
 }
 
 class Gitter{}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeEmptyStringMemberModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeEmptyStringMemberModifiers.java
index 2ab4b96eece..17e8c917c15 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeEmptyStringMemberModifiers.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeEmptyStringMemberModifiers.java
@@ -20,7 +20,7 @@
 import java.util.TreeSet;
 
 public class InputIllegalTypeEmptyStringMemberModifiers implements InputIllegalTypeSuper {
-    private AbstractClass a = null; // ok
+    private AbstractClass a = null;
     private NotAnAbstractClass b = null; /*another comment*/
 
     private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.AbstractClass
@@ -40,7 +40,7 @@ static class SomeStaticClass {
     InputIllegalTypeEmptyStringMemberModifiers(Integer i) {}
     private void table2(Integer i) {}
 
-    private void getInitialContext(java.util.TreeSet v) {} // ok
+    private void getInitialContext(java.util.TreeSet v) {}
 
     @Override
     public void foo(HashMap<?, ?> buffer) {} // ignore
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeGregCal.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeGregCal.java
index 8b05e7b520a..7c2b91425e9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeGregCal.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeGregCal.java
@@ -5,7 +5,7 @@
  */
 public class InputIllegalTypeGregCal
 {
-    class SubCal { // ok
+    class SubCal {
 
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSameFileNameFalsePositive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSameFileNameFalsePositive.java
index 1822532e9a5..ad149e3880f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSameFileNameFalsePositive.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSameFileNameFalsePositive.java
@@ -23,13 +23,13 @@
 
 public class InputIllegalTypeSameFileNameFalsePositive
 {
-    InputIllegalTypeGregCal cal = AnObject.getInstance(); // ok
+    InputIllegalTypeGregCal cal = AnObject.getInstance();
     Date date = null;
     SubCal subCalendar = null; // violation
 
-    private static class AnObject extends InputIllegalTypeGregCal { // ok
+    private static class AnObject extends InputIllegalTypeGregCal {
 
-        public static InputIllegalTypeGregCal getInstance() // ok
+        public static InputIllegalTypeGregCal getInstance()
         {
             return null;
         }
@@ -37,12 +37,12 @@ public static InputIllegalTypeGregCal getInstance() // ok
     }
 
     private void foo() {
-        List l; // ok
-        java.io.File file = null; // ok
+        List l;
+        java.io.File file = null;
     }
     java.util.List<Integer> list = new ArrayList<>(); // violation
-    private ArrayList<String> values; // ok
-    private Boolean d; // ok
+    private ArrayList<String> values;
+    private Boolean d;
     private Boolean[] d1;
     private Boolean[][] d2;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSimilarClassName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSimilarClassName.java
index a356bfe7d6d..f3510c560a3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSimilarClassName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSimilarClassName.java
@@ -18,6 +18,6 @@
 public class InputIllegalTypeSimilarClassName {
         private TreeSet example;
 
-        private static class TreeSet { // ok
+        private static class TreeSet {
         }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestAbstractClassNamesFalse.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestAbstractClassNamesFalse.java
index 881802b7167..59c813e6ba0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestAbstractClassNamesFalse.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestAbstractClassNamesFalse.java
@@ -24,7 +24,7 @@ abstract class AbstractClass {
         abstract boolean isPerfectClass();
     }
 
-    class MyNonAbstractClass extends AbstractClass { // ok
+    class MyNonAbstractClass extends AbstractClass {
 
         boolean perfect = true;
 
@@ -41,13 +41,13 @@ boolean isPerfectClass() {
         }
     }
 
-    AbstractClass a = new MyNonAbstractClass(); // ok
+    AbstractClass a = new MyNonAbstractClass();
 
-    public String getInnerClassInfo(AbstractClass clazz) { // ok
+    public String getInnerClassInfo(AbstractClass clazz) {
         return clazz.getClassInfo();
     }
 
-    public AbstractClass newInnerClassInstance() { // ok
+    public AbstractClass newInnerClassInstance() {
         return new MyNonAbstractClass();
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestClearDataBetweenFiles.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestClearDataBetweenFiles.java
index d57a7cd0a93..82e45ee8586 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestClearDataBetweenFiles.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestClearDataBetweenFiles.java
@@ -7,7 +7,7 @@
  * illegalClassNames = { java.util.TreeSet }
  */
 public class InputIllegalTypeTestClearDataBetweenFiles implements InputIllegalTypeSuper {
-    private AbstractClass a = null; // ok
+    private AbstractClass a = null;
     private NotAnAbstractClass b = null; /*another comment*/
 
     private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.AbstractClass
@@ -27,7 +27,7 @@ static class SomeStaticClass {
     InputIllegalTypeTestClearDataBetweenFiles(Integer i) {}
     private void table2(Integer i) {}
 
-    private void getInitialContext(java.util.TreeSet v) {} // ok
+    private void getInitialContext(java.util.TreeSet v) {}
 
     @Override
     public void foo(HashMap<?, ?> buffer) {} // ignore
@@ -44,9 +44,9 @@ public void foo(HashMap<?, ?> buffer) {} // ignore
 }
 
 interface InputIllegalTypeSuperTestClearDataBetweenFiles {
-    void foo(HashMap<?, ?> buffer); // ok
+    void foo(HashMap<?, ?> buffer);
 
-    HashMap<?, ?> foo(); // ok
+    HashMap<?, ?> foo();
 
     Object bar();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestDefaults.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestDefaults.java
index d63030ed0a6..c5fd0ec332a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestDefaults.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestDefaults.java
@@ -20,7 +20,7 @@
 import java.util.TreeSet;
 
 public class InputIllegalTypeTestDefaults implements InputIllegalTypeSuper {
-    private AbstractClass a = null; // ok
+    private AbstractClass a = null;
     private NotAnAbstractClass b = null; /*another comment*/
 
     private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.AbstractClass
@@ -40,7 +40,7 @@ static class SomeStaticClass {
     InputIllegalTypeTestDefaults(Integer i) {}
     private void table2(Integer i) {}
 
-    private void getInitialContext(java.util.TreeSet v) {} // ok
+    private void getInitialContext(java.util.TreeSet v) {}
 
     @Override
     public void foo(HashMap<?, ?> buffer) {} // ignore
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestExtendsImplements.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestExtendsImplements.java
index 9231a8d926a..ab7e5c4148d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestExtendsImplements.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestExtendsImplements.java
@@ -23,14 +23,14 @@ public abstract class InputIllegalTypeTestExtendsImplements {
     public abstract class Bar
         extends Hashtable // violation
             <Boolean, // violation
-                Bar> { // OK
+                Bar> {
     }
 
     public abstract class Foo<
             T extends Boolean> // violation
-        implements Cloneable, // OK
+        implements Cloneable,
             Serializable, // violation
-            Comparator, // OK
+            Comparator,
             Comparable<Foo< // violation
                 ? extends Boolean>> { // violation
     }
@@ -41,23 +41,23 @@ public interface Interface<Foo> // violation
     }
 
     abstract class NonPublicBar
-            extends Hashtable // OK
-            <Boolean, // OK
-                Bar> { // OK
+            extends Hashtable
+            <Boolean,
+                Bar> {
     }
 
     abstract class NonPublicFoo<
-            T extends Boolean> // OK
-        implements Cloneable, // OK
-            Serializable, // OK
-            Comparator, // OK
-            Comparable<Foo< // OK
-                ? extends Boolean>> { // OK
+            T extends Boolean>
+        implements Cloneable,
+            Serializable,
+            Comparator,
+            Comparable<Foo<
+                ? extends Boolean>> {
     }
 
     interface NonPublicInterface<Foo>
-        extends Comparable<Boolean>, // OK
-            Serializable { // OK
+        extends Comparable<Boolean>,
+            Serializable {
     }
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestFormat.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestFormat.java
index 6d62c8ff967..8947806e42d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestFormat.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestFormat.java
@@ -20,7 +20,7 @@
 import java.util.TreeSet;
 
 public class InputIllegalTypeTestFormat implements InputIllegalTypeSuper {
-    private AbstractClass a = null; // ok
+    private AbstractClass a = null;
     private NotAnAbstractClass b = null; /*another comment*/
 
     private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.AbstractClass
@@ -40,7 +40,7 @@ static class SomeStaticClass {
     InputIllegalTypeTestFormat(Integer i) {}
     private void table2(Integer i) {}
 
-    private void getInitialContext(java.util.TreeSet v) {} // ok
+    private void getInitialContext(java.util.TreeSet v) {}
 
     @Override
     public void foo(HashMap<?, ?> buffer) {} // ignore
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestGenerics.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestGenerics.java
index 53b4c8ead0b..912d4df5295 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestGenerics.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestGenerics.java
@@ -23,8 +23,8 @@
 
 public abstract class InputIllegalTypeTestGenerics {
 
-    private Set<Boolean> privateSet; // OK
-    private java.util.List<Map<Boolean, Foo>> privateList; // OK
+    private Set<Boolean> privateSet;
+    private java.util.List<Map<Boolean, Foo>> privateList;
     public Set<Boolean> set; // violation
     public java.util.List<Map<Boolean, Foo>> list; // 2 violations
 
@@ -40,7 +40,7 @@ public void fullName(java.util.ArrayList<? super Boolean> a) {} // violation
     public abstract Set<Boolean> shortName(Set<? super Set<Boolean>> a); // 2 violations
 
     public Set<? extends Foo<Boolean>> typeArgument() { // 2 violations
-        return new TreeSet<Foo<Boolean>>(); // OK
+        return new TreeSet<Foo<Boolean>>();
     }
 
     public class MyClass<Foo extends Boolean> {} // 2 violations
@@ -50,13 +50,13 @@ public class MyClass<Foo extends Boolean> {} // 2 violations
 class Bounded {
 
     public boolean match = new TreeSet<Integer>().stream()
-            .allMatch(new TreeSet<>()::add); // OK
+            .allMatch(new TreeSet<>()::add);
 
     public static <Boolean> void foo() {} // violation
 
 }
 
-class Foo<T extends Boolean & Serializable> { // OK
+class Foo<T extends Boolean & Serializable> {
 
     void foo() {}
 
@@ -64,7 +64,7 @@ void foo() {}
 
 @interface Annotation {
 
-    Class<? extends Boolean>[] nonPublic(); // OK
+    Class<? extends Boolean>[] nonPublic();
     public Class<? extends Boolean>[] value(); // violation
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestIgnoreMethodNames.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestIgnoreMethodNames.java
index 487f3f1e029..45e8c5fdaac 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestIgnoreMethodNames.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestIgnoreMethodNames.java
@@ -32,7 +32,7 @@ private abstract class AbstractClass {/*one more comment*/}
     private class NotAnAbstractClass {}
 
     private java.util.TreeSet table1() { return null; } // violation
-    private TreeSet table2() { return null; } // ok
+    private TreeSet table2() { return null; }
     static class SomeStaticClass {
 
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestLegalAbstractClassNames.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestLegalAbstractClassNames.java
index a9246cd8713..ad5a526a7d4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestLegalAbstractClassNames.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestLegalAbstractClassNames.java
@@ -20,7 +20,7 @@
 import java.util.TreeSet;
 
 public class InputIllegalTypeTestLegalAbstractClassNames implements InputIllegalTypeSuper {
-    private AbstractClass a = null; // ok
+    private AbstractClass a = null;
     private NotAnAbstractClass b = null; /*another comment*/
 
     private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.AbstractClass
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestSameFileNameGeneral.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestSameFileNameGeneral.java
index 32abcdd23b3..db35766b9a9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestSameFileNameGeneral.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestSameFileNameGeneral.java
@@ -24,7 +24,7 @@ public class InputIllegalTypeTestSameFileNameGeneral
 {
     InputIllegalTypeGregCal cal = AnObject.getInstance(); // violation
     java.util.Date date = null;
-    SubCal subCalendar = null; // ok
+    SubCal subCalendar = null;
 
     private static class AnObject extends InputIllegalTypeGregCal { // violation
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestStarImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestStarImports.java
index ff57042eb0e..8383f6713de 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestStarImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeTestStarImports.java
@@ -18,7 +18,6 @@
 import java.net.*;
 import java.util.*;
 import org.antlr.v4.runtime.*;
-import com.puppycrawl.tools.checkstyle.*;
 
 public class InputIllegalTypeTestStarImports
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeWhitespaceInConfig.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeWhitespaceInConfig.java
index 31fd6334b24..cfe66c20b59 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeWhitespaceInConfig.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeWhitespaceInConfig.java
@@ -19,7 +19,7 @@
 import java.util.List;
 
 public class InputIllegalTypeWhitespaceInConfig {
-    public void example(List<@MyPattern String> strings) { // ok
+    public void example(List<@MyPattern String> strings) {
     }
 
     @Target(ElementType.TYPE_USE)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignment.java
index dc4b27f1316..0f925ac63db 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignment.java
@@ -33,25 +33,6 @@ void innerAssignments()
         }
     }
 
-    public void demoBug1195047Comment3()
-    {
-        // inner assignment should flag all assignments to b or bb but none of those to i or j
-        int y = 1;
-        int b = 0;
-        boolean bb;
-        int i;
-
-        if (bb = false) {} // violation
-        for (i = 0; bb = false; i = i + 1) {} // violation
-        while (bb = false) {} // violation
-        if ((bb = false)) {} // violation
-        for (int j = 0; (bb = false); j += 1) {} // violation
-        while ((bb = false)) {} // violation
-        i = (bb = false) ? (b = 2) : (b += 1); // 3 violations
-        i = (b += 1) + (b -= 1); // 2 violations
-        do {i += 1;} while (bb = false); // violation
-    }
-
     public static void demoInputStreamIdiom(java.io.InputStream is) throws java.io.IOException
     {
         int b;
@@ -117,67 +98,4 @@ public ChildParent getParent() {
             return this;
         }
     }
-
-    void method() throws IOException {
-        Integer line;
-        FileInputStream file = null;
-        while (!((line = file.read()) != null)) {}
-        while ((line = file.read()) != null && line < 3) {}
-        while ((line = file.read()) != null && line < 3 && line > 5) {}
-        while ((line = file.read()) != null || line < 3) {}
-        while ((line = file.read()) != null || line < 3 || line > 5) {}
-        while ((line = file.read()) != null & line < 3) {}
-        while ((line = file.read()) != null & line < 3 & line > 5) {}
-        while ((line = file.read()) != null | line < 3) {}
-        while ((line = file.read()) != null | line < 3 | line > 5) {}
-        while (line < 3 && (line = file.read()) != null) {}
-        while (line < 3 || (line = file.read()) != null) {}
-        while (line < 3 & (line = file.read()) != null) {}
-        while (line < 3 | (line = file.read()) != null) {}
-
-        do{}
-        while (!((line = file.read()) != null));
-        do{}
-        while ((line = file.read()) != null && line < 3);
-        do{}
-        while ((line = file.read()) != null && line < 3 && line > 5);
-        do{}
-        while ((line = file.read()) != null || line < 3);
-        do{}
-        while ((line = file.read()) != null || line < 3 || line > 5);
-        do{}
-        while ((line = file.read()) != null & line < 3);
-        do{}
-        while ((line = file.read()) != null & line < 3 & line > 5);
-        do{}
-        while ((line = file.read()) != null | line < 3);
-        do{}
-        while ((line = file.read()) != null | line < 3 | line > 5);
-        do{}
-        while (line < 3 && (line = file.read()) != null);
-        do{}
-        while (line < 3 || (line = file.read()) != null);
-        do{}
-        while (line < 3 & (line = file.read()) != null);
-        do{}
-        while (line < 3 | (line = file.read()) != null);
-
-        for (;!((line = file.read()) != null);) {}
-        for (;(line = file.read()) != null && line < 3;) {}
-        for (;(line = file.read()) != null && line < 3 && line > 5;) {}
-        for (;(line = file.read()) != null || line < 3;) {}
-        for (;(line = file.read()) != null || line < 3 || line > 5;) {}
-        for (;(line = file.read()) != null & line < 3;) {}
-        for (;(line = file.read()) != null & line < 3 & line > 5;) {}
-        for (;(line = file.read()) != null | line < 3;) {}
-        for (;(line = file.read()) != null | line < 3 | line > 5;) {}
-        for (;line < 3 && (line = file.read()) != null;) {}
-        for (;line < 3 || (line = file.read()) != null;) {}
-        for (;line < 3 & (line = file.read()) != null;) {}
-        for (;line < 3 | (line = file.read()) != null;) {}
-
-        String str1 = "";
-        String str2 = "cd";
-        for (;;(str1 = "ab").concat(str2)) {} // violation
-    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentDemoBug1195047Comment3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentDemoBug1195047Comment3.java
new file mode 100644
index 00000000000..0095288b1bc
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentDemoBug1195047Comment3.java
@@ -0,0 +1,28 @@
+/*
+InnerAssignment
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.innerassignment;
+
+public class InputInnerAssignmentDemoBug1195047Comment3 {
+    public void demoBug1195047Comment3()
+    {
+        // inner assignment should flag all assignments to b or bb but none of those to i or j
+        int y = 1;
+        int b = 0;
+        boolean bb;
+        int i;
+
+        if (bb = false) {} // violation
+        for (i = 0; bb = false; i = i + 1) {} // violation
+        while (bb = false) {} // violation
+        if ((bb = false)) {} // violation
+        for (int j = 0; (bb = false); j += 1) {} // violation
+        while ((bb = false)) {} // violation
+        i = (bb = false) ? (b = 2) : (b += 1); // 3 violations
+        i = (b += 1) + (b -= 1); // 2 violations
+        do {i += 1;} while (bb = false); // violation
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentLambdaExpressions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentLambdaExpressions.java
index fdba4ea2eb5..e636d0dd355 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentLambdaExpressions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentLambdaExpressions.java
@@ -19,6 +19,6 @@ public void setOnAction(MyLambda my) {
     }
     private void setAction() {
         MyButton button = new MyButton();
-        button.setOnAction(e -> { boolean pressed = true; });  // ok
+        button.setOnAction(e -> { boolean pressed = true; });
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentMethod.java
new file mode 100644
index 00000000000..b4f5d3b615f
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentMethod.java
@@ -0,0 +1,75 @@
+/*
+InnerAssignment
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.innerassignment;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+public class InputInnerAssignmentMethod {
+    void method() throws IOException {
+        Integer line;
+        FileInputStream file = null;
+        while (!((line = file.read()) != null)) {}
+        while ((line = file.read()) != null && line < 3) {}
+        while ((line = file.read()) != null && line < 3 && line > 5) {}
+        while ((line = file.read()) != null || line < 3) {}
+        while ((line = file.read()) != null || line < 3 || line > 5) {}
+        while ((line = file.read()) != null & line < 3) {}
+        while ((line = file.read()) != null & line < 3 & line > 5) {}
+        while ((line = file.read()) != null | line < 3) {}
+        while ((line = file.read()) != null | line < 3 | line > 5) {}
+        while (line < 3 && (line = file.read()) != null) {}
+        while (line < 3 || (line = file.read()) != null) {}
+        while (line < 3 & (line = file.read()) != null) {}
+        while (line < 3 | (line = file.read()) != null) {}
+
+        do{}
+        while (!((line = file.read()) != null));
+        do{}
+        while ((line = file.read()) != null && line < 3);
+        do{}
+        while ((line = file.read()) != null && line < 3 && line > 5);
+        do{}
+        while ((line = file.read()) != null || line < 3);
+        do{}
+        while ((line = file.read()) != null || line < 3 || line > 5);
+        do{}
+        while ((line = file.read()) != null & line < 3);
+        do{}
+        while ((line = file.read()) != null & line < 3 & line > 5);
+        do{}
+        while ((line = file.read()) != null | line < 3);
+        do{}
+        while ((line = file.read()) != null | line < 3 | line > 5);
+        do{}
+        while (line < 3 && (line = file.read()) != null);
+        do{}
+        while (line < 3 || (line = file.read()) != null);
+        do{}
+        while (line < 3 & (line = file.read()) != null);
+        do{}
+        while (line < 3 | (line = file.read()) != null);
+
+        for (;!((line = file.read()) != null);) {}
+        for (;(line = file.read()) != null && line < 3;) {}
+        for (;(line = file.read()) != null && line < 3 && line > 5;) {}
+        for (;(line = file.read()) != null || line < 3;) {}
+        for (;(line = file.read()) != null || line < 3 || line > 5;) {}
+        for (;(line = file.read()) != null & line < 3;) {}
+        for (;(line = file.read()) != null & line < 3 & line > 5;) {}
+        for (;(line = file.read()) != null | line < 3;) {}
+        for (;(line = file.read()) != null | line < 3 | line > 5;) {}
+        for (;line < 3 && (line = file.read()) != null;) {}
+        for (;line < 3 || (line = file.read()) != null;) {}
+        for (;line < 3 & (line = file.read()) != null;) {}
+        for (;line < 3 | (line = file.read()) != null;) {}
+
+        String str1 = "";
+        String str2 = "cd";
+        for (;;(str1 = "ab").concat(str2)) {} // violation
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberDefault1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberDefault1.java
index 5a8f5159d1b..7907ecdd400 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberDefault1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberDefault1.java
@@ -22,8 +22,8 @@
 public class InputMagicNumberDefault1 {
     public void magicMethod() {
 
-        final int INT_CONST = 101_000; // ok
-        final long LONG_CONST1 = 100_000L; // ok
+        final int INT_CONST = 101_000;
+        final long LONG_CONST1 = 100_000L;
         final long LONG_CONST2 = 100l;
         final float FLOAT_CONST1 = 1.500_0F;
         final float FLOAT_CONST2 = 1.5f;
@@ -31,12 +31,12 @@ public void magicMethod() {
         final double DOUBLE_CONST2 = 1.5d;
         final double DOUBLE_CONST3 = 1.5;
 
-        int int_var1 = 1; // ok
-        int int_var2 = (2); // ok
-        long long_var1 = 0L; // ok
-        long long_var2 = 0l; // ok
-        double double_var1 = 0D; // ok
-        double double_var2 = 0d; // ok
+        int int_var1 = 1;
+        int int_var2 = (2);
+        long long_var1 = 0L;
+        long long_var2 = 0l;
+        double double_var1 = 0D;
+        double double_var2 = 0d;
 
         int[] int_array = new int[2];
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclaration1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclaration1.java
index d9a3958f1ce..9f237658d94 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclaration1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclaration1.java
@@ -33,23 +33,23 @@ public void magicMethod() {
 
 
         int int_var1 = 1;
-        int int_var2 = (2); // ok
+        int int_var2 = (2);
         long long_var1 = 0L;
         long long_var2 = 0l;
         double double_var1 = 0D;
         double double_var2 = 0d;
 
-        int[] int_array = new int[2]; // ok
+        int[] int_array = new int[2];
 
-        int_var1 = 1 + 2; // ok
+        int_var1 = 1 + 2;
         int_var1 += 1;
-        double_var1 = 1.0 + 2.0; // ok
+        double_var1 = 1.0 + 2.0;
 
-        for (int i = 0; i < 2; i++); // ok
+        for (int i = 0; i < 2; i++);
 
-        if (1 < 2); // ok
+        if (1 < 2);
 
-        if (1.0 < 2.0); // ok
+        if (1.0 < 2.0);
 
 
         int int_magic1 = 3_000; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclarationWithAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclarationWithAnnotation.java
new file mode 100644
index 00000000000..4b86307ddeb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreFieldDeclarationWithAnnotation.java
@@ -0,0 +1,26 @@
+/*
+MagicNumber
+ignoreNumbers = 0.99
+ignoreHashCodeMethod = (default)false
+ignoreAnnotation = (default)false
+ignoreFieldDeclaration = true
+ignoreAnnotationElementDefaults = false
+constantWaiverParentToken = (default)TYPECAST, METHOD_CALL, EXPR, ARRAY_INIT, UNARY_MINUS, \
+                            UNARY_PLUS, ELIST, STAR, ASSIGN, PLUS, MINUS, DIV, LITERAL_NEW
+tokens = (default)NUM_DOUBLE, NUM_FLOAT, NUM_INT, NUM_LONG
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.magicnumber;
+
+@InputMagicNumberIntMethodAnnotation(3) // violation
+public class InputMagicNumberIgnoreFieldDeclarationWithAnnotation {
+    public void createEvents(Double d, String s) {
+        if ((d != null)  && (s != null && s.equalsIgnoreCase("Fiit"))) {
+            double anotherDouble = d / 60; // violation
+            if (anotherDouble >= 20) { // violation
+                // do something
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreHashCodeMethod1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreHashCodeMethod1.java
index 5ccaa3a936f..7de994e7e94 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreHashCodeMethod1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreHashCodeMethod1.java
@@ -33,23 +33,23 @@ public void magicMethod() {
 
 
         int int_var1 = 1;
-        int int_var2 = (2); // ok
+        int int_var2 = (2);
         long long_var1 = 0L;
         long long_var2 = 0l;
         double double_var1 = 0D;
         double double_var2 = 0d;
 
-        int[] int_array = new int[2]; // ok
+        int[] int_array = new int[2];
 
-        int_var1 = 1 + 2; // ok
+        int_var1 = 1 + 2;
         int_var1 += 1;
-        double_var1 = 1.0 + 2.0; // ok
+        double_var1 = 1.0 + 2.0;
 
-        for (int i = 0; i < 2; i++); // ok
+        for (int i = 0; i < 2; i++);
 
-        if (1 < 2); // ok
+        if (1 < 2);
 
-        if (1.0 < 2.0); // ok
+        if (1.0 < 2.0);
 
 
         int int_magic1 = 3_000; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNegativeOctalHex1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNegativeOctalHex1.java
index 741a497b094..89cf386f348 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNegativeOctalHex1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNegativeOctalHex1.java
@@ -33,23 +33,23 @@ public void magicMethod() {
 
 
         int int_var1 = 1;
-        int int_var2 = (2); // ok
+        int int_var2 = (2);
         long long_var1 = 0L;
         long long_var2 = 0l;
         double double_var1 = 0D;
         double double_var2 = 0d;
 
-        int[] int_array = new int[2]; // ok
+        int[] int_array = new int[2];
 
-        int_var1 = 1 + 2; // ok
+        int_var1 = 1 + 2;
         int_var1 += 1;
-        double_var1 = 1.0 + 2.0; // ok
+        double_var1 = 1.0 + 2.0;
 
-        for (int i = 0; i < 2; i++); // ok
+        for (int i = 0; i < 2; i++);
 
-        if (1 < 2); // ok
+        if (1 < 2);
 
-        if (1.0 < 2.0); // ok
+        if (1.0 < 2.0);
 
 
         int int_magic1 = 3_000; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNone1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNone1.java
index 39bef8b7024..40a165079f0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNone1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIgnoreNone1.java
@@ -28,22 +28,22 @@
 public class InputMagicNumberIgnoreNone1 {
     public void magicMethod() {
 
-        final int INT_CONST = 101_000; // ok
-        final long LONG_CONST1 = 100_000L; // ok
-        final long LONG_CONST2 = 100l; // ok
-        final float FLOAT_CONST1 = 1.500_0F; // ok
-        final float FLOAT_CONST2 = 1.5f; // ok
-        final double DOUBLE_CONST1 = 1.500_0D; // ok
-        final double DOUBLE_CONST2 = 1.5d; // ok
-        final double DOUBLE_CONST3 = 1.5; // ok
+        final int INT_CONST = 101_000;
+        final long LONG_CONST1 = 100_000L;
+        final long LONG_CONST2 = 100l;
+        final float FLOAT_CONST1 = 1.500_0F;
+        final float FLOAT_CONST2 = 1.5f;
+        final double DOUBLE_CONST1 = 1.500_0D;
+        final double DOUBLE_CONST2 = 1.5d;
+        final double DOUBLE_CONST3 = 1.5;
 
 
         int int_var1 = 1; // violation
         int int_var2 = (2); // violation
         long long_var1 = 0L; // violation
         long long_var2 = 0l; // violation
-        double double_var1 = 0D; // ok // violation
-        double double_var2 = 0d; // ok // violation
+        double double_var1 = 0D; // violation
+        double double_var2 = 0d; // violation
 
         int[] int_array = new int[2]; // violation
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIntegersOnly1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIntegersOnly1.java
index 3d8026a398d..6f8df4e1737 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIntegersOnly1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberIntegersOnly1.java
@@ -33,23 +33,23 @@ public void magicMethod() {
 
 
         int int_var1 = 1;
-        int int_var2 = (2); // ok
+        int int_var2 = (2);
         long long_var1 = 0L;
         long long_var2 = 0l;
         double double_var1 = 0D;
         double double_var2 = 0d;
 
-        int[] int_array = new int[2]; // ok
+        int[] int_array = new int[2];
 
-        int_var1 = 1 + 2; // ok
+        int_var1 = 1 + 2;
         int_var1 += 1;
-        double_var1 = 1.0 + 2.0; // ok
+        double_var1 = 1.0 + 2.0;
 
-        for (int i = 0; i < 2; i++); // ok
+        for (int i = 0; i < 2; i++);
 
-        if (1 < 2); // ok
+        if (1 < 2);
 
-        if (1.0 < 2.0); // ok
+        if (1.0 < 2.0);
 
 
         int int_magic1 = 3_000; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables.java
index 79279577ebb..6fce8a226e5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables.java
@@ -19,15 +19,15 @@
 
 public class InputMagicNumberLocalVariables {
     @SuppressWarnings("MagicNumber")
-    private int A = 8; // ok
+    private int A = 8;
 
     @SuppressWarnings("MagicNumber")
     void method() {
-        int b = 8; // ok
+        int b = 8;
     }
 
     void method2() {
         @SuppressWarnings("MagicNumber")
-        int c = 8; // ok
+        int c = 8;
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables2.java
index ec895402a42..082575588d6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberLocalVariables2.java
@@ -19,7 +19,7 @@
 
 public class InputMagicNumberLocalVariables2 {
     @SuppressWarnings("MagicNumber")
-    private int A = 8; // ok
+    private int A = 8;
 
     void method() {
         int b = 8; // violation
@@ -27,6 +27,6 @@ void method() {
 
     void method2() {
         @SuppressWarnings("MagicNumber")
-        int c = 8; // ok
+        int c = 8;
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberMagicNumber3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberMagicNumber3.java
index 7c0e70727b8..1c670ecb034 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberMagicNumber3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberMagicNumber3.java
@@ -89,8 +89,8 @@ class innerMost {
 class Class {
     Person c = new Person(3) {
 
-        int a = 0; // ok
-        int b = 9; // ok
+        int a = 0;
+        int b = 9;
         double e = 0;
         double c = 5.5;
         float d = 12.2f;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberWaiverParentToken3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberWaiverParentToken3.java
index 570ef787072..519ca15246f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberWaiverParentToken3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/magicnumber/InputMagicNumberWaiverParentToken3.java
@@ -87,6 +87,6 @@ class A {
         }
     }
 }
-@interface InputMagicNumberIntMethodAnnotation { // ok
+@interface InputMagicNumberIntMethodAnnotation {
         int value();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java
index a7edd84e37b..05b44ad7a66 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java
@@ -12,5 +12,5 @@ public void test() { }
 
     public void foo() { }
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java
index 49a6b65cced..10ba9570e0c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java
@@ -12,5 +12,5 @@ public void test() { }
 
     public void foo() { }
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java
index 4d890f2d496..6a6f4bb65d9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java
@@ -12,5 +12,5 @@ public void test() { } // violation
 
     public void foo() { } // violation
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java
index 32370b443a8..5eec937999a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java
@@ -12,5 +12,5 @@ public void test() { }
 
     public void foo() { }
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath5.java
new file mode 100644
index 00000000000..b83ad60eb6c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath5.java
@@ -0,0 +1,11 @@
+/*
+MatchXpath
+query = count(*) div 0
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.matchxpath;
+
+public class InputMatchXpath5 {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java
index a5b3422a19a..bfff4718836 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java
@@ -11,7 +11,7 @@
 public class InputMatchXpathAvoidInstanceCreationWithoutVar {
     public void test() {
         SomeObject a = new SomeObject(); // violation
-        var b = new SomeObject(); // OK
+        var b = new SomeObject();
     }
 
     class SomeObject {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java
index 39b9b5a3c78..acc317eae7e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java
@@ -10,7 +10,7 @@
 
 public class InputMatchXpathExecutableStatementCount {
     public void test() {
-        while (true) { // ok
+        while (true) {
             Runnable runnable = new Runnable() {
                 public void run() {
                     while (true) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java
index 3affa8166a3..f4fcdfc4fc7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java
@@ -14,5 +14,5 @@ public InputMatchXpathForbidParameterizedConstructor(Object c) { } // violation
 
     public InputMatchXpathForbidParameterizedConstructor(int a, String b) { } // violation
 
-    public InputMatchXpathForbidParameterizedConstructor() { } // ok
+    public InputMatchXpathForbidParameterizedConstructor() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java
index 1b92e81d9e3..9ea5e5ed29f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java
@@ -23,7 +23,6 @@ public void test2() {
       try {
          throw new IOException();
       } catch (IOException e) {
-         // ok
       }
    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java
index 93a0a2e1672..a72592888eb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java
@@ -11,8 +11,8 @@
 
 public class InputMatchXpathIllegalThrows {
     public void func1() throws RuntimeException {} // violation
-    public void func2() throws Exception {}  // ok
+    public void func2() throws Exception {}
     public void func3() throws Error {}  // violation
     public void func4() throws Throwable {} // violation
-    public void func5() throws NullPointerException {} // ok
+    public void func5() throws NullPointerException {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java
index b479011659d..99a0ef7ea65 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java
@@ -39,5 +39,5 @@ public class InputMatchXpathNoStackoverflowError {
       +""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""
       +""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""
       +""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""
-      ; // ok
+      ;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java
index 77f7bcedd08..a86fb9722e0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java
@@ -8,7 +8,7 @@
 
 public class InputMatchXpathSingleLineComments {
     void foo() {
-        int num; // Trailing comment // ok
+        int num; // Trailing comment
 
         boolean isTrue; //Some Comment // violation
         double pi = 3.14; //Constant PI value // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtor.java
deleted file mode 100644
index 3337a0b6dd1..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-MissingCtor
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.missingctor;
-
-public class InputMissingCtor // violation
-{
-}
-// we shouldn't flag abstract classes
-abstract class AbstractClass {
-}
-
-// this class has ctor
-class CorrectClass {
-    CorrectClass() {
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtor2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtor2.java
deleted file mode 100644
index f94d612062e..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtor2.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-MissingCtor
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.missingctor;
-
-public class InputMissingCtor2 { // violation
-    class Inner1 { // violation
-        class Inner2 { // violation
-
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtorEmptyClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtorEmptyClass.java
new file mode 100644
index 00000000000..4c288590e18
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtorEmptyClass.java
@@ -0,0 +1,20 @@
+/*
+MissingCtor
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.missingctor;
+
+public class InputMissingCtorEmptyClass // violation
+{
+}
+// we shouldn't flag abstract classes
+abstract class AbstractClass {
+}
+
+// this class has ctor
+class CorrectClass {
+    CorrectClass() {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtorNestedClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtorNestedClasses.java
new file mode 100644
index 00000000000..49442e5878c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/missingctor/InputMissingCtorNestedClasses.java
@@ -0,0 +1,15 @@
+/*
+MissingCtor
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.missingctor;
+
+public class InputMissingCtorNestedClasses { // violation
+    class Inner1 { // violation
+        class Inner2 { // violation
+
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/modifiedcontrolvariable/InputModifiedControlVariableEnhancedForLoopVariable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/modifiedcontrolvariable/InputModifiedControlVariableEnhancedForLoopVariable.java
index d831939dea1..b171aff808c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/modifiedcontrolvariable/InputModifiedControlVariableEnhancedForLoopVariable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/modifiedcontrolvariable/InputModifiedControlVariableEnhancedForLoopVariable.java
@@ -7,7 +7,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.modifiedcontrolvariable;
 
-public class InputModifiedControlVariableEnhancedForLoopVariable { // ok
+public class InputModifiedControlVariableEnhancedForLoopVariable {
 
     public void method2()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsNoWarnings.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsNoWarnings.java
index 4ebb0d7a5aa..a07d386be4d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsNoWarnings.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/multiplestringliterals/InputMultipleStringLiteralsNoWarnings.java
@@ -9,6 +9,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.multiplestringliterals;
 
-public class InputMultipleStringLiteralsNoWarnings { // ok
+public class InputMultipleStringLiteralsNoWarnings {
     private final String m4 = "" + "";
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepth.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepth.java
deleted file mode 100644
index 19bfe5fc763..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepth.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-NestedForDepth
-max = 2
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.nestedfordepth;
-
-/**
- * This Class contains no logic, but serves as test-input for the unit tests for the
- * <code>NestedForDepthCheck</code>-checkstyle enhancement.
- * @author Alexander Jesse
- * @see com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck
- */
-public class InputNestedForDepth {
-
-  /**
-   * Dummy method containing 5 layers of for-statements.
-   */
-  public void nestedForFiveLevel() {
-    int i = 0;
-    int i1 = 0;
-    int i2 = 0;
-    int i3 = 0;
-    int i4 = 0;
-    int i5 = 0;
-
-    for (i1 = 0; i1 < 10; i1++) {
-      for (i2 = 0; i2 < 10; i2++) {
-        for (i3 = 0; i3 < 10; i3++) {
-          for (i4 = 0; i4 < 10; i4++) { // violation
-            for (i5 = 0; i5 < 10; i5++) { // violation
-              i += 1;
-            }
-            for (int i5a = 0; i5a < 10; i5a++) { // violation
-                i += 1;
-              }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepth1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepth1.java
deleted file mode 100644
index f38e1747f3f..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepth1.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-NestedForDepth
-max = 4
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.nestedfordepth;
-
-/**
- * This Class contains no logic, but serves as test-input for the unit tests for the
- * <code>NestedForDepthCheck</code>-checkstyle enhancement.
- * @author Alexander Jesse
- * @see com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck
- */
-public class InputNestedForDepth1 {
-
-  /**
-   * Dummy method containing 5 layers of for-statements.
-   */
-  public void nestedForFiveLevel() {
-    int i = 0;
-    int i1 = 0;
-    int i2 = 0;
-    int i3 = 0;
-    int i4 = 0;
-    int i5 = 0;
-
-    for (i1 = 0; i1 < 10; i1++) {
-      for (i2 = 0; i2 < 10; i2++) {
-        for (i3 = 0; i3 < 10; i3++) {
-          for (i4 = 0; i4 < 10; i4++) {
-            for (i5 = 0; i5 < 10; i5++) { // ok
-              i += 1;
-            }
-            for (int i5a = 0; i5a < 10; i5a++) { // ok
-                i += 1;
-              }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckCustomMaxLevelFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckCustomMaxLevelFour.java
new file mode 100644
index 00000000000..c5abc8a2733
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckCustomMaxLevelFour.java
@@ -0,0 +1,44 @@
+/*
+NestedForDepth
+max = 4
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.nestedfordepth;
+
+/**
+ * This Class contains no logic, but serves as test-input for the unit tests for the
+ * <code>NestedForDepthCheck</code>-checkstyle enhancement.
+ * @author Alexander Jesse
+ * @see com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck
+ */
+public class InputNestedForDepthCheckCustomMaxLevelFour {
+
+  /**
+   * Dummy method containing 5 layers of for-statements.
+   */
+  public void nestedForFiveLevel() {
+    int i = 0;
+    int i1 = 0;
+    int i2 = 0;
+    int i3 = 0;
+    int i4 = 0;
+    int i5 = 0;
+
+    for (i1 = 0; i1 < 10; i1++) {
+      for (i2 = 0; i2 < 10; i2++) {
+        for (i3 = 0; i3 < 10; i3++) {
+          for (i4 = 0; i4 < 10; i4++) {
+            for (i5 = 0; i5 < 10; i5++) {
+              i += 1;
+            }
+            for (int i5a = 0; i5a < 10; i5a++) {
+                i += 1;
+              }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckCustomMaxLevelTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckCustomMaxLevelTwo.java
new file mode 100644
index 00000000000..4d0b58986dd
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckCustomMaxLevelTwo.java
@@ -0,0 +1,44 @@
+/*
+NestedForDepth
+max = 2
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.nestedfordepth;
+
+/**
+ * This Class contains no logic, but serves as test-input for the unit tests for the
+ * <code>NestedForDepthCheck</code>-checkstyle enhancement.
+ * @author Alexander Jesse
+ * @see com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck
+ */
+public class InputNestedForDepthCheckCustomMaxLevelTwo {
+
+  /**
+   * Dummy method containing 5 layers of for-statements.
+   */
+  public void nestedForFiveLevel() {
+    int i = 0;
+    int i1 = 0;
+    int i2 = 0;
+    int i3 = 0;
+    int i4 = 0;
+    int i5 = 0;
+
+    for (i1 = 0; i1 < 10; i1++) {
+      for (i2 = 0; i2 < 10; i2++) {
+        for (i3 = 0; i3 < 10; i3++) {
+          for (i4 = 0; i4 < 10; i4++) { // violation
+            for (i5 = 0; i5 < 10; i5++) { // violation
+              i += 1;
+            }
+            for (int i5a = 0; i5a < 10; i5a++) { // violation
+                i += 1;
+              }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckDefaultMaxLevel.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckDefaultMaxLevel.java
new file mode 100644
index 00000000000..bbd8fe9d85a
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthCheckDefaultMaxLevel.java
@@ -0,0 +1,33 @@
+/*
+NestedForDepth
+max = (default)1
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.nestedfordepth;
+
+public class InputNestedForDepthCheckDefaultMaxLevel {
+
+  public void method() {
+    for (int i = 1; i < 5; i++) {
+      for (int j = i; j < 5; j++) {
+      }
+    }
+  }
+
+  public void method2() {
+    for (int i = 1; i < 5; i++) {
+    }
+  }
+
+  public void method3() {
+    for (int i = 1; i < 5; i++) {
+      for (int j = 4; j < 5; j++) {
+        for (int k = 3; k < 5; k++) {
+      // violation above 'Nested for depth is 2 (max allowed is 1)'
+        }
+      }
+    }
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthDefault.java
deleted file mode 100644
index d41ba677083..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedfordepth/InputNestedForDepthDefault.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-NestedForDepth
-max = (default)1
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.nestedfordepth;
-
-public class InputNestedForDepthDefault {
-
-  public void method() {
-    for (int i = 1; i < 5; i++) {
-      for (int j = i; j < 5; j++) {
-      }
-    }
-  }
-
-  public void method2() {
-    for (int i = 1; i < 5; i++) {
-    }
-  }
-
-  public void method3() {
-    for (int i = 1; i < 5; i++) {
-      for (int j = 4; j < 5; j++) {
-        for (int k = 3; k < 5; k++) {
-      // violation above 'Nested for depth is 2 (max allowed is 1)'
-        }
-      }
-    }
-  }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedifdepth/InputNestedIfDepthMax.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedifdepth/InputNestedIfDepthMax.java
index 3727d560ed9..9c7845b67ad 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedifdepth/InputNestedIfDepthMax.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nestedifdepth/InputNestedIfDepthMax.java
@@ -11,19 +11,19 @@ public class InputNestedIfDepthMax
 {
     void foo() {
         // nesting == 0
-        if (true) { // ok
+        if (true) {
         }
 
         // nesting == 1
-        if (true) { // ok
-            if (true) { // ok
+        if (true) {
+            if (true) {
             }
         }
 
         // nesting == 2
-        if (true) { // ok
-            if (true) { // ok
-                if (true) { // ok
+        if (true) {
+            if (true) {
+                if (true) {
                 }
             }
         }
@@ -31,39 +31,39 @@ void foo() {
 
     void fooWithElse() {
         // nesting == 0
-        if (true) { // ok
+        if (true) {
         } else {
         }
 
         // nesting == 1
-        if (true) { // ok
-            if (true) { // ok
+        if (true) {
+            if (true) {
             } else {
             }
         } else {
-            if (false) { // ok
+            if (false) {
             } else {
             }
         }
 
         // nesting == 2
-        if (true) { // ok
-            if (true) { // ok
-                if (true) { // ok
+        if (true) {
+            if (true) {
+                if (true) {
                 } else {
                 }
             } else {
-                if (false) { // ok
+                if (false) {
                 } else {
                 }
             }
         } else {
-            if (true) { // ok
-                if (true) { // ok
+            if (true) {
+                if (true) {
                 } else {
                 }
             } else {
-                if (false) { // ok
+                if (false) {
                 } else {
                 }
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingComma.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingComma.java
deleted file mode 100644
index 09b4960cb54..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingComma.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-NoEnumTrailingComma
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.noenumtrailingcomma;
-
-public class InputNoEnumTrailingComma {
-
-    enum Foo1 {
-        FOO,
-        BAR; // ok
-    }
-
-    enum Foo2 {
-        FOO,
-        BAR // ok
-    }
-
-    enum Foo3 {
-        FOO,
-        BAR, // violation
-    }
-
-    enum Foo4 {
-        FOO,
-        BAR, // violation
-        ;
-    }
-
-    enum Foo5 {
-        FOO,
-        BAR,; // violation
-    }
-
-    enum Foo6 { FOO, BAR,; } // violation
-
-    enum Foo7 { FOO, BAR, } // violation
-
-    enum Foo8 {
-        FOO,
-        BAR // ok
-        ;
-    }
-
-    enum Foo9 { FOO, BAR; } // ok
-
-    enum Foo10 { FOO, BAR } // ok
-
-    enum Foo11 {} // ok
-
-    enum Foo12 { FOO, } // violation
-
-    enum Foo13 { FOO } // ok
-
-    enum Foo14 {
-        FOO, // violation
-    }
-
-    enum Foo15 {
-        FOO // ok
-    }
-
-    enum Foo16 {
-    } // ok
-
-    enum Foo17 { FOO; } // ok
-
-    enum Foo18 {
-        FOO; // ok
-    }
-
-    enum Foo19 {
-        FOO
-        , // violation
-    }
-
-    enum Foo20 {
-        FOO
-        ; // ok
-    }
-
-    public enum Foo21
-    {
-        FIRST_CONSTANT,
-        SECOND_CONSTANT; // ok
-
-        public void someMethod() {
-        }
-    }
-
-    enum Foo22 {
-        A,B() // ok
-    }
-
-    enum Foo23 {
-        A,B{} // ok
-    }
-
-    enum Foo24 {
-        A,B(){ public String toString() { return "";}} // ok
-    }
-
-    enum Foo25 {
-        A,B(){ public String toString() { return "";}}, // violation
-    }
-
-    enum Foo26 {
-        A,B(), // violation
-    }
-
-    enum Foo27 {
-        A,B{}, // violation
-    }
-
-    enum Foo28 {
-        A,B(); // ok
-    }
-
-    enum Foo29 {
-        A,B{}; // ok
-    }
-
-    enum Foo30 {
-        A,B(){ public String toString() { return "";}}; // ok
-    }
-
-    enum Foo31 {
-        A,B(),; // violation
-    }
-
-    enum Foo32 {
-        A,B{},; // violation
-    }
-
-    enum Foo33 {
-        A,B(){ public String toString() { return "";}},; // violation
-    }
-
-    enum Foo34 {
-        A, B, C; // ok
-        enum NestedFoo1 {
-            First, Second, Third, // violation
-        }
-    }
-
-    enum Foo35 {
-        A, B, C; // ok
-        enum NestedFoo1 {
-            First, Second, Third,; // violation
-        }
-    }
-
-    enum Foo36 {
-        A, B, C; // ok
-        enum NestedFoo1 {
-            First, Second, Third; // ok
-        }
-    }
-
-    enum Foo37 {
-        A, B; // ok
-        Foo37() {}
-    }
-
-    enum Foo38 {
-        A, B,; // violation
-        Foo38() {};
-    }
-
-    public enum Foo39 {
-        ONE_ONE(1,1),
-        ONE_TWO(1,2); // ok
-
-        int major, minor;
-
-        Foo39(int major, int minor) {
-            this.major = major;
-            this.minor = minor;
-        }
-    }
-
-    public enum Foo40 {
-        ONE_ONE(1,1),
-        ONE_TWO(1,2),; // violation
-
-        int major, minor;
-
-        Foo40(int major, int minor) {
-            this.major = major;
-            this.minor = minor;
-        }
-    }
-
-    public enum Foo41 {
-        ONE_ONE (1, 1) {
-            @Override
-            public void someFunction() {
-            }
-        },
-        ONE_TWO (1, 2) {
-            @Override
-            public void someFunction(){
-            }
-        },; // violation
-
-        int major, minor;
-
-        Foo41 (int major, int minor) {
-            this.major = major;
-            this.minor = minor;
-        }
-
-        public void someFunction(){
-            major = 1;
-        }
-    }
-
-    public enum Foo42 {
-        ONE_ONE (1, 1) {
-            @Override
-            public void someFunction() {
-            }
-        },
-        ONE_TWO (1, 2) {
-            @Override
-            public void someFunction(){
-            }
-        }; // ok
-
-        int major, minor;
-
-        Foo42 (int major, int minor) {
-            this.major = major;
-            this.minor = minor;
-        }
-
-        public void someFunction(){
-            major = 1;
-        }
-    }
-
-    enum Foo43 {
-        A,B(){ public String toString() { return "";}}; // ok
-        interface SomeInterface {}
-    }
-
-    enum Foo44 {
-        A,B(){ public String toString() { return "";}},; // violation
-        interface SomeInterface {}
-    }
-
-    enum Foo45 {
-        , // violation
-    }
-    enum Foo46 {
-        ,; // violation
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaOne.java
new file mode 100644
index 00000000000..46ad5c85036
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaOne.java
@@ -0,0 +1,96 @@
+/*
+NoEnumTrailingComma
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.noenumtrailingcomma;
+
+public class InputNoEnumTrailingCommaOne {
+
+    enum Foo1 {
+        FOO,
+        BAR;
+    }
+
+    enum Foo2 {
+        FOO,
+        BAR
+    }
+
+    enum Foo3 {
+        FOO,
+        BAR, // violation
+    }
+
+    enum Foo4 {
+        FOO,
+        BAR, // violation
+        ;
+    }
+
+    enum Foo5 {
+        FOO,
+        BAR,; // violation
+    }
+
+    enum Foo6 { FOO, BAR,; } // violation
+
+    enum Foo7 { FOO, BAR, } // violation
+
+    enum Foo8 {
+        FOO,
+        BAR
+        ;
+    }
+
+    enum Foo9 { FOO, BAR; }
+
+    enum Foo10 { FOO, BAR }
+
+    enum Foo11 {}
+
+    enum Foo12 { FOO, } // violation
+
+    enum Foo13 { FOO }
+
+    enum Foo14 {
+        FOO, // violation
+    }
+
+    enum Foo15 {
+        FOO
+    }
+
+    enum Foo16 {
+    }
+
+    enum Foo17 { FOO; }
+
+    enum Foo18 {
+        FOO;
+    }
+
+    enum Foo19 {
+        FOO
+        , // violation
+    }
+
+    enum Foo20 {
+        FOO
+        ;
+    }
+
+    public enum Foo21
+    {
+        FIRST_CONSTANT,
+        SECOND_CONSTANT;
+
+        public void someMethod() {
+        }
+    }
+
+    enum Foo22 {
+        A,B()
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaThree.java
new file mode 100644
index 00000000000..7f90dd5a50a
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaThree.java
@@ -0,0 +1,87 @@
+/*
+NoEnumTrailingComma
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.noenumtrailingcomma;
+
+public class InputNoEnumTrailingCommaThree {
+
+    public enum Foo40 {
+        ONE_ONE(1,1),
+        ONE_TWO(1,2),; // violation
+
+        int major, minor;
+
+        Foo40(int major, int minor) {
+            this.major = major;
+            this.minor = minor;
+        }
+    }
+
+    public enum Foo41 {
+        ONE_ONE (1, 1) {
+            @Override
+            public void someFunction() {
+            }
+        },
+        ONE_TWO (1, 2) {
+            @Override
+            public void someFunction(){
+            }
+        },; // violation
+
+        int major, minor;
+
+        Foo41 (int major, int minor) {
+            this.major = major;
+            this.minor = minor;
+        }
+
+        public void someFunction(){
+            major = 1;
+        }
+    }
+
+    public enum Foo42 {
+        ONE_ONE (1, 1) {
+            @Override
+            public void someFunction() {
+            }
+        },
+        ONE_TWO (1, 2) {
+            @Override
+            public void someFunction(){
+            }
+        };
+
+        int major, minor;
+
+        Foo42 (int major, int minor) {
+            this.major = major;
+            this.minor = minor;
+        }
+
+        public void someFunction(){
+            major = 1;
+        }
+    }
+
+    enum Foo43 {
+        A,B(){ public String toString() { return "";}};
+        interface SomeInterface {}
+    }
+
+    enum Foo44 {
+        A,B(){ public String toString() { return "";}},; // violation
+        interface SomeInterface {}
+    }
+
+    enum Foo45 {
+        , // violation
+    }
+    enum Foo46 {
+        ,; // violation
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaTwo.java
new file mode 100644
index 00000000000..b595e778cd7
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/noenumtrailingcomma/InputNoEnumTrailingCommaTwo.java
@@ -0,0 +1,97 @@
+/*
+NoEnumTrailingComma
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.noenumtrailingcomma;
+
+public class InputNoEnumTrailingCommaTwo {
+
+    enum Foo23 {
+        A,B{}
+    }
+
+    enum Foo24 {
+        A,B(){ public String toString() { return "";}}
+    }
+
+    enum Foo25 {
+        A,B(){ public String toString() { return "";}}, // violation
+    }
+
+    enum Foo26 {
+        A,B(), // violation
+    }
+
+    enum Foo27 {
+        A,B{}, // violation
+    }
+
+    enum Foo28 {
+        A,B();
+    }
+
+    enum Foo29 {
+        A,B{};
+    }
+
+    enum Foo30 {
+        A,B(){ public String toString() { return "";}};
+    }
+
+    enum Foo31 {
+        A,B(),; // violation
+    }
+
+    enum Foo32 {
+        A,B{},; // violation
+    }
+
+    enum Foo33 {
+        A,B(){ public String toString() { return "";}},; // violation
+    }
+
+    enum Foo34 {
+        A, B, C;
+        enum NestedFoo1 {
+            First, Second, Third, // violation
+        }
+    }
+
+    enum Foo35 {
+        A, B, C;
+        enum NestedFoo1 {
+            First, Second, Third,; // violation
+        }
+    }
+
+    enum Foo36 {
+        A, B, C;
+        enum NestedFoo1 {
+            First, Second, Third;
+        }
+    }
+
+    enum Foo37 {
+        A, B;
+        Foo37() {}
+    }
+
+    enum Foo38 {
+        A, B,; // violation
+        Foo38() {};
+    }
+
+    public enum Foo39 {
+        ONE_ONE(1,1),
+        ONE_TWO(1,2);
+
+        int major, minor;
+
+        Foo39(int major, int minor) {
+            this.major = major;
+            this.minor = minor;
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java
index 92250be428d..80f6d767f4c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/nofinalizer/InputNoFinalizerFallThrough.java
@@ -11,7 +11,7 @@ public class InputNoFinalizerFallThrough
     void method(int i, int j, boolean cond) {
         while (true) {
             switch (i) {
-            case 0: // ok
+            case 0:
             case 1:
                 i++;
                 break;
@@ -141,7 +141,7 @@ void methodFallThru(int i, int j, boolean cond) {
           switch (i) {
           case -1: // FALLTHRU
 
-          case 0: // ok
+          case 0:
           case 1:
               i++;
               break;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTree2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTree2.java
index f4c587b4b86..5d85faba5a2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTree2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTree2.java
@@ -5,7 +5,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
 
-// ok
+
 public class InputOneStatementPerLineBeginTree2 {
     int a;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd1.java
index 7b1f436ef41..015b62c1f92 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd1.java
@@ -9,7 +9,7 @@
 
 import java.io.*;
 
-// ok
+
 public class InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd1 {
     public void resourceListExists() throws IOException {
         try (FileInputStream f1 = new FileInputStream("1"); FileInputStream f2 =
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd2.java
index 1073ab6abb5..c6c7f31992e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd2.java
@@ -9,7 +9,7 @@
 
 import java.io.*;
 
-// ok
+
 public class InputOneStatementPerLineBeginTreeLastVariableResourcesStatementEnd2 {
     void m(OutputStream out) throws IOException {
         try (out; InputStream in = new FileInputStream("filename")) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeTest.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeTest.java
index 1908fd6b7eb..16f109d8291 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeTest.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineBeginTreeTest.java
@@ -18,7 +18,7 @@ public class InputOneStatementPerLineBeginTreeTest {
     void testNestedInLambda() {
         Runnable r = () -> {
             try (OutputStream s1 = new PipedOutputStream();
-                 OutputStream s2 = new PipedOutputStream();) { // ok
+                 OutputStream s2 = new PipedOutputStream();) {
             }
             catch (IOException e) {
             }
@@ -26,7 +26,7 @@ void testNestedInLambda() {
     }
 
     public void doLegalForLoop() {
-        for (int i = 0; i < 20; i++) { // ok
+        for (int i = 0; i < 20; i++) {
         }
      }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultiline.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultiline.java
deleted file mode 100644
index 970d9384154..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultiline.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-OneStatementPerLine
-treatTryResourcesAsStatement = true
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
-import java.io.StringReader;
-/*
-    This class provides test input for OneStatementPerLineCheck with different
-    types of multiline statements.
-    A Java statement is the smallest unit that is a complete instruction.
-    Statements must end with a semicolon.
-    Statements generally contain expressions (expressions have a value).
-    One of the simplest is the Assignment Statement.
- */
-public class InputOneStatementPerLineMultiline {
-
-    /**
-     * One multiline  assignment (declaration) statement
-     * is legal.
-     */
-    int e = 1, f = 2,
-        g = 5;
-
-    /**
-     * One multiline  assignment (declaration) statement
-     * is legal.
-     */
-    int h = 1,
-        i = 2,
-        j = 5;
-
-    /**
-     * One multiline  assignment (declaration) statement
-     * is legal.
-     */
-    int k = 1,
-        l = 2,
-        m = 5
-        ;
-
-    /**
-     * Two multiline  assignment (declaration) statements
-     * on the same line are illegal.
-     */
-    int o = 1, p = 2,
-        r = 5; int t; // violation
-
-    /**
-     * Two assignment (declaration) statement
-     * which are not on the same line are legal.
-     */
-    int one = 1,
-        three = 5;
-    int two = 2;
-
-    /**
-     * Two statements on the same line
-     * (they both are distributed over two lines)
-     * are illegal.
-     */
-    int var1 = 5,
-        var4 = 5; int var2 = 6,
-        var3 = 5; // violation
-
-    /**
-     * Two statements on the same line
-     * (the second is distributed over two lines)
-     * are illegal.
-     */
-    int var6 = 5; int var7 = 6,
-        var8 = 5; // violation
-
-    /**
-     * Two statements on the same line
-     * (they both are distributed over two lines)
-     * are illegal.
-     */
-    private void foo() {
-        toString(
-
-        );toString(
-
-        ); // violation
-    }
-
-    /**
-     * While theoretically being distributed over three lines, this is a sample
-     * of 2 statements on one line.
-     */
-    int var9 = 1,
-        var10 = 5
-            ; int var11 = 2; // violation
-
-    /**
-     * Multiline for loop statement is legal.
-     */
-    private void foo2() {
-        for (int n = 0,
-             k = 1;
-             n < 5; n++,
-                 k--) {
-
-        }
-    }
-
-    /**
-     * Multiline for loop statement is legal.
-     */
-    private void foo3() {
-        for(int n = 0,
-            k = 1
-            ; n<5
-            ;
-            n++, k--) {}
-    }
-
-    /**
-     * One statement inside multiline for loop block is legal.
-     */
-    private void foo4() {
-        for(int n = 0,
-            k = 1
-            ; n<5
-            ; ) { int a = 5,
-        b = 2;}
-    }
-
-    /**
-     * Two statements on the same lne
-     * inside multiline for loop block are illegal.
-     */
-    private void foo5() {
-        for(int n = 0,
-            k = 1
-            ; n<5
-            ;
-            n++, k--) { var1++; var2++; } // violation
-    }
-
-    /**
-     * Multiple statements within try-with-resource on a separate line is legal.
-     * @see <a href="https://github.com/checkstyle/checkstyle/issues/2211">false match</a>
-     */
-    private void issue2211pass() {
-        try(
-                AutoCloseable i = new java.io.StringReader("");
-                AutoCloseable k = new java.io.StringReader("");
-        ) {
-        } catch (Exception e1) {
-        }
-    }
-
-    /**
-     * Multiple statements within try-with-resource on a separate line is legal. Per PR comment:
-     * @see <a href="https://github.com/checkstyle/checkstyle/pull/2750#issuecomment-166032327"/>
-     */
-    private void issue2211pass2() {
-        try( AutoCloseable i = new java.io.StringReader("");
-            AutoCloseable k = new java.io.StringReader("");) {
-        } catch (Exception e1) {
-        }
-    }
-
-    /**
-     * Multiple statements within try-with-resource on next line after try is illegal.
-     * @see <a href="https://github.com/checkstyle/checkstyle/issues/2211">false match</a>
-     */
-    private void issue2211fail() {
-        try(
-    AutoCloseable i=new java.io.PipedReader();AutoCloseable k=new java.io.PipedReader();// violation
-        ) {
-        } catch (Exception e1) {
-        }
-    }
-
-    /**
-     * Multiple statements within try-with-resource on a same line as try is illegal. PR comment:
-     * @see <a href="https://github.com/checkstyle/checkstyle/pull/2750#issuecomment-166032327"/>
-     */
-    private void issue2211fail2() {
-      try(AutoCloseable i=new StringReader("");AutoCloseable k=new StringReader("");) { // violation
-        } catch (Exception e1) {
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultilineForDeclarations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultilineForDeclarations.java
new file mode 100644
index 00000000000..13750305889
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultilineForDeclarations.java
@@ -0,0 +1,109 @@
+/*
+OneStatementPerLine
+treatTryResourcesAsStatement = true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
+
+/*
+    This class provides test input for OneStatementPerLineCheck with different
+    types of multiline statements.
+    A Java statement is the smallest unit that is a complete instruction.
+    Statements must end with a semicolon.
+    Statements generally contain expressions (expressions have a value).
+    One of the simplest is the Assignment Statement.
+ */
+public class InputOneStatementPerLineMultilineForDeclarations {
+
+    /**
+     * One multiline  assignment (declaration) statement
+     * is legal.
+     */
+    int e = 1, f = 2,
+        g = 5;
+
+    /**
+     * One multiline  assignment (declaration) statement
+     * is legal.
+     */
+    int h = 1,
+        i = 2,
+        j = 5;
+
+    /**
+     * One multiline  assignment (declaration) statement
+     * is legal.
+     */
+    int k = 1,
+        l = 2,
+        m = 5
+        ;
+
+    /**
+     * Two multiline  assignment (declaration) statements
+     * on the same line are illegal.
+     */
+    int o = 1, p = 2,
+        r = 5; int t; // violation
+
+    /**
+     * Two assignment (declaration) statement
+     * which are not on the same line are legal.
+     */
+    int one = 1,
+        three = 5;
+    int two = 2;
+
+    /**
+     * Two statements on the same line
+     * (they both are distributed over two lines)
+     * are illegal.
+     */
+    int var1 = 5,
+        var4 = 5; int var2 = 6,
+        var3 = 5; // violation
+
+    /**
+     * Two statements on the same line
+     * (the second is distributed over two lines)
+     * are illegal.
+     */
+    int var6 = 5; int var7 = 6,
+        var8 = 5; // violation
+
+    /**
+     * Two statements on the same line
+     * (they both are distributed over two lines)
+     * are illegal.
+     */
+    private void foo() {
+        toString(
+
+        );toString(
+
+        ); // violation
+    }
+
+    /**
+     * While theoretically being distributed over three lines, this is a sample
+     * of 2 statements on one line.
+     */
+    int var9 = 1,
+        var10 = 5
+            ; int var11 = 2; // violation
+
+    /**
+     * Multiline for loop statement is legal.
+     */
+    private void foo2() {
+        for (int n = 0,
+             k = 1;
+             n < 5; n++,
+                 k--) {
+
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultilineInLoopsAndTryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultilineInLoopsAndTryWithResources.java
new file mode 100644
index 00000000000..3e5eabb2f73
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultilineInLoopsAndTryWithResources.java
@@ -0,0 +1,102 @@
+/*
+OneStatementPerLine
+treatTryResourcesAsStatement = true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
+import java.io.StringReader;
+/*
+    This class provides test input for OneStatementPerLineCheck with different
+    types of multiline statements.
+    A Java statement is the smallest unit that is a complete instruction.
+    Statements must end with a semicolon.
+    Statements generally contain expressions (expressions have a value).
+    One of the simplest is the Assignment Statement.
+ */
+
+public class InputOneStatementPerLineMultilineInLoopsAndTryWithResources {
+    int var1 = 1,var2 = 2;
+
+    /**
+     * Multiline for loop statement is legal.
+     */
+    private void foo3() {
+        for(int n = 0,
+            k = 1
+            ; n<5
+            ;
+            n++, k--) {}
+    }
+
+    /**
+     * One statement inside multiline for loop block is legal.
+     */
+    private void foo4() {
+        for(int n = 0,
+            k = 1
+            ; n<5
+            ; ) { int a = 5,
+        b = 2;}
+    }
+
+    /**
+     * Two statements on the same lne
+     * inside multiline for loop block are illegal.
+     */
+    private void foo5() {
+        for(int n = 0,
+            k = 1
+            ; n<5
+            ;
+            n++, k--) { var1++; var2++; } // violation
+    }
+
+    /**
+     * Multiple statements within try-with-resource on a separate line is legal.
+     * @see <a href="https://github.com/checkstyle/checkstyle/issues/2211">false match</a>
+     */
+    private void issue2211pass() {
+        try(
+                AutoCloseable i = new java.io.StringReader("");
+                AutoCloseable k = new java.io.StringReader("");
+        ) {
+        } catch (Exception e1) {
+        }
+    }
+
+    /**
+     * Multiple statements within try-with-resource on a separate line is legal. Per PR comment:
+     * @see <a href="https://github.com/checkstyle/checkstyle/pull/2750#issuecomment-166032327"/>
+     */
+    private void issue2211pass2() {
+        try( AutoCloseable i = new java.io.StringReader("");
+            AutoCloseable k = new java.io.StringReader("");) {
+        } catch (Exception e1) {
+        }
+    }
+
+    /**
+     * Multiple statements within try-with-resource on next line after try is illegal.
+     * @see <a href="https://github.com/checkstyle/checkstyle/issues/2211">false match</a>
+     */
+  private void issue2211fail() {
+    try(
+  AutoCloseable i=new java.io.PipedReader();AutoCloseable k=new java.io.PipedReader();// violation
+    ) {
+    } catch (Exception e1) {
+    }
+  }
+
+    /**
+     * Multiple statements within try-with-resource on a same line as try is illegal. PR comment:
+     * @see <a href="https://github.com/checkstyle/checkstyle/pull/2750#issuecomment-166032327"/>
+     */
+  private void issue2211fail2() {
+    try(AutoCloseable i=new StringReader("");AutoCloseable k=new StringReader("");) { // violation
+    } catch (Exception e1) {
+    }
+  }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLine.java
deleted file mode 100644
index 1a72b4978b2..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLine.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
-OneStatementPerLine
-treatTryResourcesAsStatement = (default)false
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
-
-/**
- * Two import statements on the same line are illegal.
- */
-import java.io.EOFException; import java.io.BufferedReader; // violation
-
-/**
- * This Class contains no logic, but serves as test-input for the unit tests for the
- * <code>OneStatementPerLineCheck</code>-checkstyle enhancement.
- * @author Alexander Jesse
- * @see com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck
- */
-public class InputOneStatementPerLineSingleLine {
-  /**
-   * Dummy innerclass to test the behaviour in the case of a smalltalk-style
-   * statements (<code>myObject.firstMethod().secondMethod().thirdMethod()</code>).
-   * For this programming style each method must return the object itself <code>this</code>.
-   */
-  class SmallTalkStyle {
-    SmallTalkStyle doSomething1() {
-      return this;
-    }
-
-    SmallTalkStyle doSomething2() {
-      return this;
-    }
-
-    SmallTalkStyle doSomething3() {
-      return this;
-    }
-  }
-
-  /**
-   * Dummy variable to work on.
-   */
-  private int one = 0;
-
-  /**
-   * Dummy variable to work on.
-   */
-  private int two = 0;
-
-  /**
-   * Simple legal method
-   */
-  public void doLegal() {
-    one = 1;
-    two = 2;
-  }
-
-  /**
-   * The illegal format is used in a comment. Therefor the whole method is legal.
-   */
-  public void doLegalComment() {
-    one = 1;
-    //one = 1; two = 2; // ok
-    two = 2;
-    /*
-     * one = 1; two = 2; // ok
-     */
-  }
-
-  /**
-   * The illegal format is used within a String. Therefor the whole method is legal.
-   */
-  public void doLegalString() {
-    one = 1;
-    two = 2;
-    System.identityHashCode("one = 1; two = 2"); // ok
-  }
-
-  /**
-   * Within the for-header there are 3 Statements, but this is legal.
-   */
-  public void doLegalForLoop() {
-    for (int i = 0; i < 20; i++) { // ok
-      one = i;
-    }
-  }
-
-  /**
-   * Simplest form of an illegal layout.
-   */
-  public void doIllegal() {
-    one = 1; two = 2; // violation
-  }
-
-  /**
-   * Smalltalk-style is considered as one statement.
-   */
-  public void doIllegalSmallTalk() {
-    SmallTalkStyle smalltalker = new SmallTalkStyle();
-    smalltalker.doSomething1().doSomething2().doSomething3();
-  }
-
-  /**
-   * Smalltalk-style is considered as one statement.
-   */
-  public void doIllegalSmallTalk2() {
-    SmallTalkStyle smalltalker = new SmallTalkStyle();
-    smalltalker.doSomething1()
-        .doSomething2()
-        .doSomething3();
-  }
-
-  /**
-   * While theoretically being distributed over two lines, this is a sample
-   * of 2 statements on one line.
-   */
-  public void doIllegal2() {
-    one = 1
-    ; two = 2; // violation
-  }
-
-  /**
-   * The StringBuffer is a Java-API-class that permits smalltalk-style concatenation
-   * on the <code>append</code>-method.
-   */
-  public void doStringBuffer() {
-    StringBuffer sb = new StringBuffer();
-    sb.append("test ");
-    sb.append("test2 ").append("test3 ");
-    appendToSpringBuffer(sb, "test4");
-  }
-
-  /**
-   * indirect stringbuffer-method. Used only internally.
-   * @param sb The stringbuffer we want to append something
-   * @param text The text to append
-   */
-  private void appendToSpringBuffer(StringBuffer sb, String text) {
-    sb.append(text);
-  }
-
-  /**
-   * Two declaration statements on the same line are illegal.
-   */
-  int a; int b; // violation
-
-  /**
-   * Two declaration statements which are not on the same line
-   * are legal.
-   */
-  int c;
-  int d;
-
-  /**
-   * Two assignment (declaration) statements on the same line are illegal.
-   */
-  int e = 1; int f = 2; // violation
-
-  /**
-   * Two assignment (declaration) statements on the different lines
-   * are legal.
-   */
-  int g = 1;
-  int h = 2;
-
-  /**
-   * This method contains two increment statements
-   * and two object creation statements on the same line.
-   */
-  private void foo() {
-    //This is two assignment (declaration)
-    //statements on different lines
-    int var1 = 1;
-    int var2 = 2;
-
-    //Two increment statements on the same line are illegal.
-    var1++; var2++; // violation
-
-    //Two object creation statements on the same line are illegal.
-    Object obj1 = new Object(); Object obj2 = new Object(); // violation
-  }
-
-  /**
-   * This method contains break, while-loop
-   * and for-loop statements.
-   */
-  private void foo3() {
-    do {
-      one++;
-      if (two > 4) {
-        break; //legal
-      }
-      one++;
-      two++;
-    } while (two < 7); //legal
-
-    /**
-     *  One statement inside for block is legal.
-     */
-    for (int i = 0; i < 10; i++) one = 5;
-
-    /**
-     *  One statement inside for block where
-     *  increment expression is empty is legal.
-     */
-    for (int i = 0; i < 10;) one = 5;
-
-    /**
-     *  One statement inside for block where
-     *  increment and conditional expressions are empty
-     *  (forever loop) is legal
-     */
-    for (int i = 0;;) one = 5;
-  }
-
-  public void foo4() {
-    /**
-     * a "forever" loop.
-     */
-    for(;;){} //legal
-  }
-
-  public void foo5() {
-    /**
-     *  One statement inside for block is legal
-     */
-    for (;;) { one = 5; }
-  }
-
-  public void foo6() {
-      bar(() -> {
-          return;}, () -> {return;});
-  }
-
-  void bar(Runnable r1, Runnable r2) { }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineForDeclarations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineForDeclarations.java
new file mode 100644
index 00000000000..8953a12389f
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineForDeclarations.java
@@ -0,0 +1,73 @@
+/*
+OneStatementPerLine
+treatTryResourcesAsStatement = (default)false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
+
+public class InputOneStatementPerLineSingleLineForDeclarations {
+    /**
+     * Dummy variable to work on.
+     */
+    private int one = 0;
+
+    /**
+     * Dummy variable to work on.
+     */
+    private int two = 0;
+    /**
+     * This method contains break, while-loop
+     * and for-loop statements.
+     */
+    private void foo3() {
+        do {
+            one++;
+            if (two > 4) {
+                break; //legal
+            }
+            one++;
+            two++;
+        } while (two < 7); //legal
+
+        /**
+         *  One statement inside for block is legal.
+         */
+        for (int i = 0; i < 10; i++) one = 5;
+
+        /**
+         *  One statement inside for block where
+         *  increment expression is empty is legal.
+         */
+        for (int i = 0; i < 10;) one = 5;
+
+        /**
+         *  One statement inside for block where
+         *  increment and conditional expressions are empty
+         *  (forever loop) is legal
+         */
+        for (int i = 0;;) one = 5;
+    }
+
+    public void foo4() {
+        /**
+         * a "forever" loop.
+         */
+        for(;;){} //legal
+    }
+
+    public void foo5() {
+        /**
+         *  One statement inside for block is legal
+         */
+        for (;;) { one = 5; }
+    }
+
+    public void foo6() {
+        bar(() -> {
+            return;}, () -> {return;});
+    }
+
+    void bar(Runnable r1, Runnable r2) { }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineInLoops.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineInLoops.java
new file mode 100644
index 00000000000..4bb336a5d66
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineInLoops.java
@@ -0,0 +1,91 @@
+/*
+OneStatementPerLine
+treatTryResourcesAsStatement = (default)false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
+
+public class InputOneStatementPerLineSingleLineInLoops {
+    /**
+     * Dummy variable to work on.
+     */
+    private int one = 0;
+
+    /**
+     * Dummy variable to work on.
+     */
+    private int two = 0;
+
+    /**
+     * While theoretically being distributed over two lines, this is a sample
+     * of 2 statements on one line.
+     */
+    public void doIllegal2() {
+        one = 1
+        ; two = 2; // violation
+    }
+
+    /**
+     * The StringBuffer is a Java-API-class that permits smalltalk-style concatenation
+     * on the <code>append</code>-method.
+     */
+    public void doStringBuffer() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("test ");
+        sb.append("test2 ").append("test3 ");
+        appendToSpringBuffer(sb, "test4");
+    }
+
+    /**
+     * indirect stringbuffer-method. Used only internally.
+     * @param sb The stringbuffer we want to append something
+     * @param text The text to append
+     */
+    private void appendToSpringBuffer(StringBuffer sb, String text) {
+        sb.append(text);
+    }
+
+    /**
+     * Two declaration statements on the same line are illegal.
+     */
+    int a; int b; // violation
+
+    /**
+     * Two declaration statements which are not on the same line
+     * are legal.
+     */
+    int c;
+    int d;
+
+    /**
+     * Two assignment (declaration) statements on the same line are illegal.
+     */
+    int e = 1; int f = 2; // violation
+
+    /**
+     * Two assignment (declaration) statements on the different lines
+     * are legal.
+     */
+    int g = 1;
+    int h = 2;
+
+    /**
+     * This method contains two increment statements
+     * and two object creation statements on the same line.
+     */
+    private void foo() {
+        //This is two assignment (declaration)
+        //statements on different lines
+        int var1 = 1;
+        int var2 = 2;
+
+        //Two increment statements on the same line are illegal.
+        var1++; var2++; // violation
+
+        //Two object creation statements on the same line are illegal.
+        Object obj1 = new Object(); Object obj2 = new Object(); // violation
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineSmallTalkStyle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineSmallTalkStyle.java
new file mode 100644
index 00000000000..4203210bc0e
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLineSmallTalkStyle.java
@@ -0,0 +1,108 @@
+/*
+OneStatementPerLine
+treatTryResourcesAsStatement = (default)false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
+
+/**
+ * Two import statements on the same line are illegal.
+ */
+import java.io.EOFException; import java.io.BufferedReader; // violation
+
+public class InputOneStatementPerLineSingleLineSmallTalkStyle {
+  /**
+   * Dummy innerclass to test the behaviour in the case of a smalltalk-style
+   * statements (<code>myObject.firstMethod().secondMethod().thirdMethod()</code>).
+   * For this programming style each method must return the object itself <code>this</code>.
+   */
+  class SmallTalkStyle {
+    SmallTalkStyle doSomething1() {
+      return this;
+    }
+
+    SmallTalkStyle doSomething2() {
+      return this;
+    }
+
+    SmallTalkStyle doSomething3() {
+      return this;
+    }
+  }
+
+  /**
+   * Dummy variable to work on.
+   */
+  private int one = 0;
+
+  /**
+   * Dummy variable to work on.
+   */
+  private int two = 0;
+
+  /**
+   * Simple legal method
+   */
+  public void doLegal() {
+    one = 1;
+    two = 2;
+  }
+
+  /**
+   * The illegal format is used in a comment. Therefor the whole method is legal.
+   */
+  public void doLegalComment() {
+    one = 1;
+    //one = 1; two = 2;
+    two = 2;
+    /*
+     * one = 1; two = 2;
+     */
+  }
+
+  /**
+   * The illegal format is used within a String. Therefor the whole method is legal.
+   */
+  public void doLegalString() {
+    one = 1;
+    two = 2;
+    System.identityHashCode("one = 1; two = 2");
+  }
+
+  /**
+   * Within the for-header there are 3 Statements, but this is legal.
+   */
+  public void doLegalForLoop() {
+    for (int i = 0; i < 20; i++) {
+      one = i;
+    }
+  }
+
+  /**
+   * Simplest form of an illegal layout.
+   */
+  public void doIllegal() {
+    one = 1; two = 2; // violation
+  }
+
+  /**
+   * Smalltalk-style is considered as one statement.
+   */
+  public void doIllegalSmallTalk() {
+    SmallTalkStyle smalltalker = new SmallTalkStyle();
+    smalltalker.doSomething1().doSomething2().doSomething3();
+  }
+
+  /**
+   * Smalltalk-style is considered as one statement.
+   */
+  public void doIllegalSmallTalk2() {
+    SmallTalkStyle smalltalker = new SmallTalkStyle();
+    smalltalker.doSomething1()
+        .doSomething2()
+        .doSomething3();
+  }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTest.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTest.java
index 2b61486d3a5..265451e4172 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTest.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTest.java
@@ -14,7 +14,7 @@
 public class InputOneStatementPerLineTest {
     void testNestedInLambda() {
         Runnable r = () -> {
-            try (OutputStream s1 = new PipedOutputStream()) { // ok
+            try (OutputStream s1 = new PipedOutputStream()) {
             }
             catch (IOException e) {
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java
index 94877ee8ad6..a1b527fc366 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java
@@ -55,7 +55,7 @@ void method() throws IOException {
     void testNestedInLambda() {
         Runnable r = () -> {
             try (OutputStream s1 = new PipedOutputStream();
-                 OutputStream s2 = new PipedOutputStream();) { // ok
+                 OutputStream s2 = new PipedOutputStream();) {
             }
             catch (IOException e) {
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java
index 4a8d28fd96f..385afe1bda0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java
@@ -17,13 +17,13 @@ public class InputOneStatementPerLineTryWithResourcesIgnore {
     void method() throws IOException {
         OutputStream s1 = new PipedOutputStream();
         OutputStream s2 = new PipedOutputStream();
-        try (s1; s2; OutputStream s3 = new PipedOutputStream();) { // ok
+        try (s1; s2; OutputStream s3 = new PipedOutputStream();) {
         }
-        try (s1; OutputStream s4 = new PipedOutputStream(); s2;) { // ok
+        try (s1; OutputStream s4 = new PipedOutputStream(); s2;) {
         }
-        try (s1; s2; OutputStream s5 = new PipedOutputStream()) { // ok
+        try (s1; s2; OutputStream s5 = new PipedOutputStream()) {
         }
-        try (s1; OutputStream s6 = new PipedOutputStream(); s2) { // ok
+        try (s1; OutputStream s6 = new PipedOutputStream(); s2) {
         }
         try (
 OutputStream s7 = new PipedOutputStream();OutputStream s8 = new PipedOutputStream();
@@ -40,7 +40,7 @@ void method() throws IOException {
              ;s2;) {
         }
         try (OutputStream
-             s12 = new PipedOutputStream();s1;OutputStream s3 // ok
+             s12 = new PipedOutputStream();s1;OutputStream s3
                 = new PipedOutputStream()) {}
         try (s1; s2; OutputStream stream3 =
              new PipedOutputStream()) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java
index 55aad4289a8..054ce990fae 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java
@@ -60,6 +60,17 @@ public void fooMethod()
         public void overloadMethod(String s, Boolean b, int i) // violation
         {
             //some foo code
+        };
+
+        public void overloadMethod(double d)
+        {
+          // violation 2 lines above
+          /*
+           * Explanation of violation:
+           * There is a semicolon at the end of the previous method
+           * which is separating these overloaded methods
+           * and causing the violation.
+           */
         }
     };
 }
@@ -101,6 +112,7 @@ public void overloadMethod(String s)
         //some foo code
     }
 
+    // comments between overloaded methods are allowed.
     public void overloadMethod(boolean b)
     {
         //some foo code
@@ -116,6 +128,28 @@ public void overloadMethod(String s, Boolean b, int i) // violation
     {
         //some foo code
     }
+
+    void test() {}
+
+    String str;
+
+    private interface Testing {}
+
+    void test(int x) {} // violation
+
+    private class Inner {
+        void test() {}
+
+        void test(String str) {}
+
+        void test2() {}
+
+        String str;
+
+        void test(int x) {} // violation
+    }
+
+    void test(double d) {} // violation
 }
 
 enum Foo2 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java
new file mode 100644
index 00000000000..e9f454771ee
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods.java
@@ -0,0 +1,24 @@
+/*
+OverloadMethodsDeclarationOrder
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.overloadmethodsdeclarationorder;
+
+public class InputOverloadMethodsDeclarationOrderPrivateAndStaticMethods {
+    public void testing() {
+    }
+
+    private void testing(int a) {
+    }
+
+    public void testing(int a, int b) {
+    }
+
+    public static void testing(String a) {
+    }
+
+    public void testing(String a, String b) {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentReceiver.java
index 51cf652b7ca..8619b91189d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentReceiver.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/InputParameterAssignmentReceiver.java
@@ -7,10 +7,10 @@
 package com.puppycrawl.tools.checkstyle.checks.coding.parameterassignment;
 
 public class InputParameterAssignmentReceiver {
-    public void foo4(InputParameterAssignmentReceiver this) {} // ok
+    public void foo4(InputParameterAssignmentReceiver this) {}
 
     private class Inner {
         public Inner(
-                InputParameterAssignmentReceiver InputParameterAssignmentReceiver.this) {} // ok
+                InputParameterAssignmentReceiver InputParameterAssignmentReceiver.this) {}
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThis15Extensions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThis15Extensions.java
index ee28511d882..5df89127a54 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThis15Extensions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThis15Extensions.java
@@ -8,7 +8,7 @@
 */
 
 // someexamples of 1.5 extensions
-package com.puppycrawl.tools.checkstyle.checks.coding.requirethis; // ok
+package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 @interface MyAnnotation1 {
     String name();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAllowLocalVars.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAllowLocalVars.java
index 91fd24e4917..ffaf1b79da9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAllowLocalVars.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAllowLocalVars.java
@@ -9,7 +9,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
-class InputRequireThisAllowLocalVars { // ok
+class InputRequireThisAllowLocalVars {
 
     private String s1 = "foo1";
     String s2 = "foo2";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAnnotationInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAnnotationInterface.java
index 12724af92b4..dc66aab7cbe 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAnnotationInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisAnnotationInterface.java
@@ -7,7 +7,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.coding.requirethis; // ok
+package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public @interface InputRequireThisAnnotationInterface {
     String DEFAULT_VALUE = "DEFAULT_VALUE";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisBraceAlone.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisBraceAlone.java
index cfcad273cd8..2c7b56f5194 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisBraceAlone.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisBraceAlone.java
@@ -9,7 +9,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
-public final class InputRequireThisBraceAlone { // ok
+public final class InputRequireThisBraceAlone {
     protected void test() throws Exception {
         {
             boolean var1 = false;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisCaseGroup.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisCaseGroup.java
index ab1a42fa808..70de658d17e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisCaseGroup.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisCaseGroup.java
@@ -9,7 +9,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
-public class InputRequireThisCaseGroup { // ok
+public class InputRequireThisCaseGroup {
     private String aVariable;
 
     public String method1(int val) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisEnumConstant.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisEnumConstant.java
index 649bff2d224..c431a382170 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisEnumConstant.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisEnumConstant.java
@@ -7,7 +7,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.coding.requirethis; // ok
+package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
 public class InputRequireThisEnumConstant {
     private final String TEST = "";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisExtendedMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisExtendedMethod.java
index 01fc63603cb..3e271a5ef20 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisExtendedMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisExtendedMethod.java
@@ -11,7 +11,7 @@
 
 import java.util.logging.Logger;
 
-public class InputRequireThisExtendedMethod // ok
+public class InputRequireThisExtendedMethod
 {
     public class Check {
         private Logger log1 = Logger.getLogger(getClass().getName());
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisFinalInstanceVariable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisFinalInstanceVariable.java
index 45bb71e58d8..202377cbe83 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisFinalInstanceVariable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisFinalInstanceVariable.java
@@ -24,6 +24,6 @@ public InputRequireThisFinalInstanceVariable(int y, int z) {
     }
 
     public void foo(int x) {
-        x = x; // ok
+        x = x;
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisLocalClassesInsideLambdas.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisLocalClassesInsideLambdas.java
index 5b316f129d6..608efc4f21f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisLocalClassesInsideLambdas.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisLocalClassesInsideLambdas.java
@@ -23,7 +23,7 @@ class InnerSubscriber implements InputRequireThisLocalClassesInsideLambdas {
                 int index;
 
                 public InnerSubscriber(int index) {
-                    this.index = index; // ok
+                    this.index = index;
                 }
             }
         });
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisMethodReferences.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisMethodReferences.java
index 2d03e8805fc..b3e04581148 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisMethodReferences.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisMethodReferences.java
@@ -15,7 +15,7 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-public class InputRequireThisMethodReferences { // ok
+public class InputRequireThisMethodReferences {
     private Set<String> tags = Collections.unmodifiableSortedSet(
         Arrays.stream(new String[] {"br", "li", "dt", "dd", "hr", "img", "p", "td", "tr", "th",})
             .collect(Collectors.toCollection(TreeSet::new)));
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisReceiver.java
index 70b2887b7d3..a0eb66c11cd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisReceiver.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisReceiver.java
@@ -9,7 +9,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding.requirethis;
 
-public class InputRequireThisReceiver { // ok
+public class InputRequireThisReceiver {
     public void foo4(InputRequireThisReceiver this) {}
 
     private class Inner {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisStatic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisStatic.java
index 2a77c92693f..48faec718e3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisStatic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisStatic.java
@@ -14,7 +14,7 @@
 import java.io.InputStreamReader;
 import java.io.IOException;
 
-public final class InputRequireThisStatic { // ok
+public final class InputRequireThisStatic {
     public static String staticField1 = "";
 
     public static String staticField2 = new String(staticField1);
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResources.java
index 724902d7c9e..de01db952ba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResources.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResources.java
@@ -20,40 +20,40 @@ public class InputRequireThisTryWithResources implements AutoCloseable {
 
     void oneResource() {
         try (BufferedReader fldBufferedReader
-                     = new BufferedReader(new InputStreamReader(null, "utf-8"))) { } // ok
+                     = new BufferedReader(new InputStreamReader(null, "utf-8"))) { }
         catch (IOException e) { }
     }
 
     void twoResourcesReferencingEachOther() {
-        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8"); // ok
-             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) { } // ok
+        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8");
+             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) { }
         catch (IOException e) { }
     }
 
     void threeResourcesReferencingEachOther() {
-        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8"); // ok
-             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader); // ok
+        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8");
+             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader);
              Scanner fldScanner = new Scanner(
-                     fldStreamReader.toString() + fldBufferedReader.toString())) { } // ok
+                     fldStreamReader.toString() + fldBufferedReader.toString())) { }
         catch (IOException e) { }
     }
 
     void failToHandleParameter() {
         try (BufferedReader fldBufferedReader = new BufferedReader(
-                new InputStreamReader(null, fldCharset))) { } // ok
+                new InputStreamReader(null, fldCharset))) { }
         catch (IOException e) { }
     }
 
     void handleParameter() {
         try (BufferedReader fldBufferedReader = new BufferedReader(
-                new InputStreamReader(null, this.fldCharset))) { } // ok
+                new InputStreamReader(null, this.fldCharset))) { }
         catch (IOException e) { }
     }
 
     void noResources() {
         try {
             int a = 5;
-            fldCharset += a; // ok
+            fldCharset += a;
         }
         catch (Exception ex) { }
     }
@@ -64,14 +64,14 @@ String methodToInvoke() {
 
     void methodInvoke() {
         try (BufferedReader fldBufferedReader = new BufferedReader(
-                new InputStreamReader(null, methodToInvoke()))) { } // ok
+                new InputStreamReader(null, methodToInvoke()))) { }
         catch (Exception ex) { }
     }
 
     void methodIdentCopy() {
         try (BufferedReader methodToInvoke = new BufferedReader(
-                new InputStreamReader(null, this.methodToInvoke()))) { // ok
-            String a = methodToInvoke() + methodToInvoke.toString(); // ok
+                new InputStreamReader(null, this.methodToInvoke()))) {
+            String a = methodToInvoke() + methodToInvoke.toString();
         }
         catch (Exception ex) { }
     }
@@ -82,30 +82,30 @@ void methodIdentCopy() {
     InputRequireThisTryWithResources r4 = new InputRequireThisTryWithResources();
 
     void staticVariables() {
-        try (r1) { } // ok
+        try (r1) { }
         catch (Exception e) { }
 
-        try (r1.r2) { } // ok
+        try (r1.r2) { }
         catch (Exception e) { }
 
-        try (r1.r2.r4.r2.r4.r2) { } // ok
+        try (r1.r2.r4.r2.r4.r2) { }
         catch (Exception e) { }
     }
 
     void nestedTryWithResources() {
-        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8")) { // ok
-            try (BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) { // ok
+        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8")) {
+            try (BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) {
                 try (Scanner fldScanner = new Scanner(
-                        fldBufferedReader.toString() + fldStreamReader.toString())) { } // ok
+                        fldBufferedReader.toString() + fldStreamReader.toString())) { }
             }
             try (Scanner fldScanner = new Scanner(
-                    fldBufferedReader.toString() + fldStreamReader.toString())) { } // ok
-            String a = fldStreamReader.toString() // ok
-                    + fldBufferedReader.toString() + fldScanner.toString(); // ok
+                    fldBufferedReader.toString() + fldStreamReader.toString())) { }
+            String a = fldStreamReader.toString()
+                    + fldBufferedReader.toString() + fldScanner.toString();
         }
         catch (IOException e) {
-            String a = fldStreamReader.toString() // ok
-                    + fldBufferedReader.toString() + fldScanner.toString(); // ok
+            String a = fldStreamReader.toString()
+                    + fldBufferedReader.toString() + fldScanner.toString();
         }
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResourcesOnlyOverlappingFalse.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResourcesOnlyOverlappingFalse.java
index 9b487ef2fcc..b1e6591857c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResourcesOnlyOverlappingFalse.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisTryWithResourcesOnlyOverlappingFalse.java
@@ -20,22 +20,22 @@ public class InputRequireThisTryWithResourcesOnlyOverlappingFalse implements Aut
 
     void oneResource() {
         try (BufferedReader fldBufferedReader
-                     = new BufferedReader(new InputStreamReader(null, "utf-8"))) { } // ok
+                     = new BufferedReader(new InputStreamReader(null, "utf-8"))) { }
         catch (IOException e) { }
     }
 
     void twoResourcesReferencingEachOther() {
-        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8"); // ok
-             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) { } // ok
+        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8");
+             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) { }
         catch (IOException e) { }
     }
 
     void threeResourcesReferencingEachOther() {
-        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8"); // ok
-             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader); // ok
+        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8");
+             BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader);
              Scanner fldScanner
                      = new Scanner(fldStreamReader.toString()
-                     + fldBufferedReader.toString())) { } // ok
+                     + fldBufferedReader.toString())) { }
         catch (IOException e) { }
     }
 
@@ -47,7 +47,7 @@ void failToHandleParameter() {
 
     void handleParameter() {
         try (BufferedReader fldBufferedReader = new BufferedReader(
-                new InputStreamReader(null, this.fldCharset))) { } // ok
+                new InputStreamReader(null, this.fldCharset))) { }
         catch (IOException e) { }
     }
 
@@ -72,7 +72,7 @@ void methodInvoke() {
 
     void methodIdentCopy() {
         try (BufferedReader methodToInvoke = new BufferedReader(
-                new InputStreamReader(null, this.methodToInvoke()))) { // ok
+                new InputStreamReader(null, this.methodToInvoke()))) {
             // violation below 'Method .* 'methodToInvoke' needs "this."'
             String a = methodToInvoke() + methodToInvoke.toString();
         }
@@ -85,19 +85,19 @@ void methodIdentCopy() {
     InputRequireThisTryWithResources r4 = new InputRequireThisTryWithResources();
 
     void staticVariables() {
-        try (r1) { } // ok
+        try (r1) { }
         catch (Exception e) { }
-        try (r1.r2) { } // ok
+        try (r1.r2) { }
         catch (Exception e) { }
-        try (r1.r2.r4.r2.r4.r2) { } // ok
+        try (r1.r2.r4.r2.r4.r2) { }
         catch (Exception e) { }
     }
 
     void nestedTryWithResources() {
-        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8")) { // ok
-            try (BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) { // ok
+        try (InputStreamReader fldStreamReader = new InputStreamReader(null, "utf-8")) {
+            try (BufferedReader fldBufferedReader = new BufferedReader(fldStreamReader)) {
                 try (Scanner fldScanner = new Scanner(
-                        fldBufferedReader.toString() + fldStreamReader.toString())) { } // ok
+                        fldBufferedReader.toString() + fldStreamReader.toString())) { }
             }
             // violation below '.*variable 'fldBufferedReader' needs "this."'
             try (Scanner fldScanner = new Scanner(fldBufferedReader.toString()
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalse.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalse.java
index 02ef9b72cd1..2160b1e614e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalse.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingFalse.java
@@ -493,9 +493,9 @@ class Issue7306 {
 
     void someMethod() {
         List<String> test = new ArrayList<>();
-        test.forEach(this.add::add); // OK
-        test.forEach(test::add); // OK
-        test.forEach(Collections::singletonList); // OK
+        test.forEach(this.add::add);
+        test.forEach(test::add);
+        test.forEach(Collections::singletonList);
         test.forEach(add::add); // violation 'Reference to instance variable 'add' needs "this.".'
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingTrue2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingTrue2.java
index 1d566f80139..87e0d0fed0b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingTrue2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/requirethis/InputRequireThisValidateOnlyOverlappingTrue2.java
@@ -15,7 +15,7 @@ public class InputRequireThisValidateOnlyOverlappingTrue2 {
 
     public InputRequireThisValidateOnlyOverlappingTrue2(
             InputRequireThisValidateOnlyOverlappingTrue2 analyzer) {
-        this(analyzer.analyzer(), 0); // ok
+        this(analyzer.analyzer(), 0);
     }
 
     public InputRequireThisValidateOnlyOverlappingTrue2(
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/returncount/InputReturnCountLambda4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/returncount/InputReturnCountLambda4.java
index 466161773f6..16a4180c807 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/returncount/InputReturnCountLambda4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/returncount/InputReturnCountLambda4.java
@@ -15,7 +15,7 @@
 import java.util.function.Supplier;
 
 
-public class InputReturnCountLambda4 { // ok
+public class InputReturnCountLambda4 {
 
     Runnable fieldWithOneReturnInLambda = () -> {
         return;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/simplifybooleanexpression/InputSimplifyBooleanExpression.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/simplifybooleanexpression/InputSimplifyBooleanExpression.java
index 28e3386ae2c..17275bc8dd9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/simplifybooleanexpression/InputSimplifyBooleanExpression.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/simplifybooleanexpression/InputSimplifyBooleanExpression.java
@@ -94,21 +94,21 @@ void testTernaryExpressions() {
         int c = 13;
         boolean m = c > 1 ? true : false; // violation
         boolean e = (a == true) // violation
-                ? c > 1 : false; // ok
+                ? c > 1 : false;
         boolean h = false ? c > 13 : c < 21; // violation
-        boolean f = a == b ? false : c > 1; // ok
+        boolean f = a == b ? false : c > 1;
         boolean q = c > 1 ? (c < 15
-                ? false : b) // ok
+                ? false : b)
                 : a != b;
         boolean v = c > 0 ? true :
                 c < 0 ? false : true; // violation
         boolean g = (c > 0 ? true : c < 0)
                 ? false : false; // violation
         Boolean value = null;
-        boolean temp = value != null ? value : false; // ok
+        boolean temp = value != null ? value : false;
         temp = true ? a() : b(); // violation
         int d = false ? 1 : 2; // violation
         temp = a() ? true : true; // violation
-        temp = value != null ? value : (false); // ok
+        temp = value != null ? value : (false);
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneMethodReference.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneMethodReference.java
index 41b651047cd..e1b43426d1e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneMethodReference.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneMethodReference.java
@@ -15,7 +15,7 @@ public interface CheckedSupplier<R, E extends Exception> {
         R get() throws E;
     }
 
-    public Object clone() { // ok
+    public Object clone() {
         CheckedSupplier<Object, CloneNotSupportedException> r = super::clone;
         CheckedSupplier<Object, CloneNotSupportedException> r1 = super::getClass;
         try {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneWithoutWarnings.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneWithoutWarnings.java
index f992ac8ffb9..89e8e04cf25 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneWithoutWarnings.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/InputSuperCloneWithoutWarnings.java
@@ -8,7 +8,7 @@
 
 public class InputSuperCloneWithoutWarnings {
     @Override
-    protected final Object clone() throws CloneNotSupportedException { // ok
+    protected final Object clone() throws CloneNotSupportedException {
         return new InputSuperCloneWithoutWarnings();
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIdentifier.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIdentifier.java
index b4993cded58..b205cb09b4a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIdentifier.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIdentifier.java
@@ -24,7 +24,7 @@ public static boolean is(Class<?> clazz) {
 
     public static boolean isOk(Class<?> clazz) {
         return true
-            && test(clazz); // ok
+            && test(clazz);
     }
 
     public int square(int a, int b){
@@ -33,8 +33,8 @@ public int square(int a, int b){
     }
 
     public int square1(int a, int b){
-    int square = a * b; // ok
-    return square;      // ok
+    int square = a * b;
+    return square;
     }
 
     public static boolean test(Class<?> clazz) {
@@ -48,7 +48,7 @@ public static boolean newTest(Class<?> clazz) {
 
     public static boolean newTest1(Class<?> clazz) {
         return true
-            && test(clazz); // ok
+            && test(clazz);
     }
 
     public static boolean newTest2(Class<?> clazz) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement.java
index a795ea51d42..fa3162c6a4c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement.java
@@ -18,7 +18,7 @@ public class InputUnnecessaryParenthesesIfStatement {
     void method(String sectionName) {
         if ("Content".equals(sectionName) || "Overview".equals(sectionName)
                 || (!"A".equals(sectionName) // violation 'Unnecessary paren.* around expression'
-                && !"AbstractClassName".equals(sectionName) // ok
+                && !"AbstractClassName".equals(sectionName)
         )) {
             System.out.println("sd");
         }
@@ -29,7 +29,7 @@ private void method() {
         x = 0;
         y = 0;
 
-        z = (x < y) ? x : y; // ok
+        z = (x < y) ? x : y;
 
         if ((x < y)           // violation 'Unnecessary parentheses around expression'
                 && (x > z)) { // violation 'Unnecessary parentheses around expression'
@@ -41,7 +41,7 @@ private void method() {
             return;
         }
 
-        if (!(x <= y)          // ok
+        if (!(x <= y)
                 || (x >= z)) { // violation 'Unnecessary parentheses around expression'
             return;
         }
@@ -59,7 +59,7 @@ private void method() {
         }
 
         if ((Integer.valueOf(x) instanceof Integer) // violation 'parentheses around expression'
-                || Integer.valueOf(y) instanceof Integer) { // ok
+                || Integer.valueOf(y) instanceof Integer) {
             return;
         }
         if (x == ((y<z) ? y : z) &&
@@ -72,7 +72,7 @@ private void method() {
                  || (z >= 3 && x <= 7)) { // violation 'Unnecessary parentheses around expression'
             return;
         }
-        if(x>= 0 && (x<=8 || y<=11) && y>=8) { // ok
+        if(x>= 0 && (x<=8 || y<=11) && y>=8) {
             return;
         }
         if((y>=11 && x<=5)            // violation 'Unnecessary parentheses around expression'
@@ -82,16 +82,16 @@ private void method() {
     }
     private void check() {
         String sectionName = "Some String";
-        if ("Some content".equals(sectionName) || "Some overview".equals(sectionName) // ok
+        if ("Some content".equals(sectionName) || "Some overview".equals(sectionName)
                 || (!"A".equals(sectionName) // violation 'Unnecessary paren.* around expression'
-                && !"AbstractClassName".equals(sectionName) // ok
+                && !"AbstractClassName".equals(sectionName)
         )) {
             return;
         }
 
-        if (sectionName instanceof String && "Other Overview".equals(sectionName) // ok
-                && (!"AbbreviationAsWordInName".equals(sectionName) // ok
-                || !"AbstractClassName".equals(sectionName) // ok
+        if (sectionName instanceof String && "Other Overview".equals(sectionName)
+                && (!"AbbreviationAsWordInName".equals(sectionName)
+                || !"AbstractClassName".equals(sectionName)
         )) {
             return;
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement2.java
index e76197f414e..5a5c1ad8269 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesIfStatement2.java
@@ -19,21 +19,21 @@ void testShortCircuitOrIfStatement() {
         boolean a = false;
         boolean x = false, y = true, z = false;
         boolean v = true, w = true, u = true;
-        boolean vy = x && y || (x || y || z) && v; // ok
-        if (a && !(v && w || (x || y) && z || u && x)) { // ok
+        boolean vy = x && y || (x || y || z) && v;
+        if (a && !(v && w || (x || y) && z || u && x)) {
         }
-        if (a && !(v && w || x || y && z || u && x)) { // ok
+        if (a && !(v && w || x || y && z || u && x)) {
         }
         if (v ||
                 (u || x || y)) { // violation 'Unnecessary parentheses around expression'
         }
-        if ((v || x) == // ok
+        if ((v || x) ==
                 (w || y)) {
         }
-        if ((v || x) & // ok
+        if ((v || x) &
                 (w || y)) {
         }
-        if (a && v || (w || z) && u || y) { // ok
+        if (a && v || (w || z) && u || y) {
         }
         if (a && x ||
                 (y || z) // violation 'Unnecessary parentheses around expression'
@@ -59,14 +59,14 @@ public void checkBooleanStatements() {
                         && (a // violation 'Unnecessary parentheses around expression'
                         && (b==c))) // violation 'Unnecessary parentheses around expression'
                 || (a // violation 'Unnecessary parentheses around expression'
-                || a!=(b<=c)) // ok
+                || a!=(b<=c))
                 || (a==(b!=d==(c==b) && a!=(b<=c)))) { // violation 'parentheses around expression'
                                                        // after '||'
             return;
         }
 
-        if (a==(b>=c && a==(c==d && d!=b)) // ok
-                && a==(c<=d)) { // ok
+        if (a==(b>=c && a==(c==d && d!=b))
+                && a==(c<=d)) {
             return;
         }
 
@@ -75,13 +75,13 @@ public void checkBooleanStatements() {
             return;
         }
 
-        if (a==(b==c) // ok
-                || a!=(b<=c)) { // ok
+        if (a==(b==c)
+                || a!=(b<=c)) {
             return;
         }
 
-        if ((b==0) == (c==d) // ok
-                && (Integer.valueOf(d) instanceof Integer) == true) { // ok
+        if ((b==0) == (c==d)
+                && (Integer.valueOf(d) instanceof Integer) == true) {
             return;
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator.java
index 0268e7d5701..e3f4ebbf065 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator.java
@@ -70,16 +70,16 @@ void method2() {
         }
         int x = 10, y = 38;
         if(x>= 0 != (x<=8 ^ y<=11) && y>=8) {
-            return; // ok
+            return;
         }
         if(x>= 0 != (x<=8 || y<=11) && y>=8) {
-            return; // ok
+            return;
         }
         if(x== 0 != (x<=8 ^ y<=11) && y==8) {
-            return; // ok
+            return;
         }
         boolean v = true, w = false;
-        if ((v & w) != // ok
+        if ((v & w) !=
             (w | v)) {
         }
         if(x>= 0 | (x<=8 | y<=11) | y>=8) {
@@ -89,22 +89,22 @@ void method2() {
 
     void method3() {
         int code1 = 9;
-        if ((code1 & 1) == 8) {}// ok
-        if ((code1 | 1) == 8) {} // ok
-        if ((code1 ^ 1) == 8) {} // ok
+        if ((code1 & 1) == 8) {}
+        if ((code1 | 1) == 8) {}
+        if ((code1 ^ 1) == 8) {}
 
-        if ((code1 & 1) != 8) {} // ok
-        if ((code1 | 1) != 8) {} // ok
-        if ((code1 ^ 1) != 8) {} // ok
+        if ((code1 & 1) != 8) {}
+        if ((code1 | 1) != 8) {}
+        if ((code1 ^ 1) != 8) {}
     }
     void method4() {
         int a = 2;
          if ((~a) < -27 // violation 'Unnecessary parentheses around expression'
-             && a-- < 30) { // ok
+             && a-- < 30) {
             return;
         }
         if ((~a) <= -27 // violation 'Unnecessary parentheses around expression'
-             && a-- < 30) { // ok
+             && a-- < 30) {
             return;
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator2.java
index 96537496c5c..4ababc9d755 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator2.java
@@ -19,40 +19,40 @@ void method() {
         boolean a = true;
         boolean b = false;
 
-        if ((b || a) & // ok
+        if ((b || a) &
                 (b || a)) {
         }
-        if ((b && a) & // ok
+        if ((b && a) &
                 (b && a)) {
         }
-        if ((b || a) | // ok
+        if ((b || a) |
                 (b && a)) {
         }
 
         int c = 1;
         int d = 12;
-        if(a || (c ^ d) >> 1 == 1 || b) { // ok
+        if(a || (c ^ d) >> 1 == 1 || b) {
         }
 
-        if ((b || a) & // ok
+        if ((b || a) &
                 (b || a)) {
         }
-        if ((b || a) | // ok
+        if ((b || a) |
                 (b || a)) {
         }
-        if ((b || a) ^ // ok
+        if ((b || a) ^
                 (b || a)) {
         }
-        if ((b && a) & // ok
+        if ((b && a) &
                 (b && a)) {
         }
-        if ((b && a) | // ok
+        if ((b && a) |
                 (b && a)) {
         }
-        if ((b && a) ^ // ok
+        if ((b && a) ^
                 (b && a)) {
         }
-        if ((b || a) & // ok
+        if ((b || a) &
                 (b && a)) {
         }
     }
@@ -83,10 +83,10 @@ void method3() {
                 | (!(x<z) & y>z))) { // violation 'Unnecessary parentheses around expression'
                 return;
         }
-        if(x>= 0 & (x<=8 | y<=11) & y>=8) { // ok
+        if(x>= 0 & (x<=8 | y<=11) & y>=8) {
             return;
         }
-        if(x>= 0 ^ (x<=8 | y<=11) ^ y>=8) { // ok
+        if(x>= 0 ^ (x<=8 | y<=11) ^ y>=8) {
             return;
         }
         if(x>= 0 || (x<=8 & y<=11) && y>=8) {
@@ -101,7 +101,7 @@ void method3() {
         if(x>= 0 || (x<=8 & y<=11) && y>=8) {
             return; // violation above 'Unnecessary parentheses around expression'
         }
-        if(x>= 0 & (x<=8 ^ y<=11) & y>=8) { // ok
+        if(x>= 0 & (x<=8 ^ y<=11) & y>=8) {
             return;
         }
         if(x>= 0 ^ (x<=8 ^ y<=11) ^ y>=8) {
@@ -111,9 +111,9 @@ void method3() {
             return; // violation above 'Unnecessary parentheses around expression'
         }
         if(x>= 0 != (x<=8 ^ y<=11) && y>=8) {
-            return; // ok
+            return;
         }
-        if(true || (4 | 4) >> 1 == 1 || false) { // ok
+        if(true || (4 | 4) >> 1 == 1 || false) {
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator3.java
index bff2aaa9ad9..318a44ee564 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/InputUnnecessaryParenthesesOperator3.java
@@ -17,26 +17,26 @@ public class InputUnnecessaryParenthesesOperator3 {
 
     public void closeBlock() {
         int code = 3;
-        if ((code & 2) > 21) {} // ok
-        if ((code | 2) > 21) {} // ok
-        if ((code ^ 2) > 21) {} // ok
+        if ((code & 2) > 21) {}
+        if ((code | 2) > 21) {}
+        if ((code ^ 2) > 21) {}
 
-        if ((code & 2) < 21) {} // ok
-        if ((code | 1) < 8) {} // ok
-        if ((code ^ 2) < 21) {} // ok
+        if ((code & 2) < 21) {}
+        if ((code | 1) < 8) {}
+        if ((code ^ 2) < 21) {}
 
-        if ((code & 2) <= 21) {} // ok
-        if ((code | 1) <= 8) {} // ok
-        if ((code ^ 2) <= 21) {} // ok
+        if ((code & 2) <= 21) {}
+        if ((code | 1) <= 8) {}
+        if ((code ^ 2) <= 21) {}
 
-        if ((code & 2) >= 21) {} // ok
-        if ((code | 1) >= 8) {} // ok
-        if ((code ^ 2) >= 21) {} // ok
-        if ((code ^ 1) >= 21) {} // ok
+        if ((code & 2) >= 21) {}
+        if ((code | 1) >= 8) {}
+        if ((code ^ 2) >= 21) {}
+        if ((code ^ 1) >= 21) {}
 
         int x = 9, y = 8;
         if(x>= 0 != (x<=8 | y<=11) && y>=8) {
-            return; // ok
+            return;
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable.java
index d588269bee8..6800a7e9cb9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable.java
@@ -19,8 +19,8 @@ public class InputUnusedLocalVariable {
     String s;
 
     Obj obj = new Obj() {
-        int a = 12; // ok
-        int b = 12; // ok
+        int a = 12;
+        int b = 12;
     };
 
     private void sameName(int unusedParameter) {
@@ -38,19 +38,19 @@ private void sameName(int unusedParameter) {
     }
 
     public void testCallingMethods() {
-        int var = 21; // ok
+        int var = 21;
         sameName(var);
         var = sameName;
     }
 
     public static void testInLambdas(int q) {
-        int test = 21; // ok
-        int isInOuterScope = 32; // ok
+        int test = 21;
+        int isInOuterScope = 32;
         Predicate<Integer> foo = integer -> {
             int b; // violation
-            int a = integer; // ok
+            int a = integer;
             b = integer;
-            boolean ans = a > 12; // ok
+            boolean ans = a > 12;
             int c = 21; // violation
             c = -isInOuterScope;
             return ans;
@@ -69,7 +69,7 @@ public void testMultipleIdentifiers() {
 
     public void testChainedCalls() throws InterruptedException {
         Obj p; // violation
-        Obj q = null; // ok
+        Obj q = null;
         p = q.foo().p;
         if (s instanceof String) {
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable2.java
index 5a4778502bb..fa3bb024e91 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable2.java
@@ -60,18 +60,18 @@ public void method() {
     public Object testDifferentAssignments(Object obj) {
         int a = 12; // violation
         a = 13;
-        int b = 13; // ok
+        int b = 13;
         b /= 12;
-        int c = 1; // ok
+        int c = 1;
         c -= this.a;
-        int h = 1; // ok
+        int h = 1;
         h <<= 12;
         return null;
     }
 
     public void testDoWhileLoops(int s) {
         do {
-            int a = 12; // ok
+            int a = 12;
             do {
                 int b = 1; // violation
                 b = a;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable3.java
new file mode 100644
index 00000000000..a404b15ac66
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariable3.java
@@ -0,0 +1,25 @@
+/*
+UnusedLocalVariable
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariable3 {
+    class Parent {
+        protected int a = 0;
+        public Parent(Child d) {
+            a = 1;
+        }
+    }
+
+    class Child extends InputUnusedLocalVariable3.Parent {
+        protected int b = 0;
+        public Child(Child d) {
+            InputUnusedLocalVariable3.this.super(d);
+            int a = 0; // violation, unused variable 'a'
+            System.out.println(super.a);
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableAnonInnerClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableAnonInnerClasses.java
index b702d691cc9..c6602d5b88e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableAnonInnerClasses.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableAnonInnerClasses.java
@@ -13,7 +13,7 @@ public class InputUnusedLocalVariableAnonInnerClasses {
     public void testAnonymousInnerClass() {
         int a = 12; // violation
         int b = 12; // violation
-        int k = 14; // ok
+        int k = 14;
         Test obj = new Test() { // violation
             int a = 2;
 
@@ -33,7 +33,7 @@ private void testSameNameNested(int s) {
         obj2 = new Test() {
             int a = 1;
             int b = 1;
-            int c = 0; // ok
+            int c = 0;
 
             private void testSameName(int s) {
                 s = a + b + this.a + this.b + InputUnusedLocalVariableAnonInnerClasses.a
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableDepthOfClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableDepthOfClasses.java
index 0b717535d7b..84409f2c31b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableDepthOfClasses.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableDepthOfClasses.java
@@ -36,21 +36,21 @@ void method() {
 
     class r {
         class k {
-            int p = 12;
+            int s = 12;
         }
     }
 
-    static class p {
+    static class s {
         class r {
             class k {
                 int a = 13;
 
                 void method() {
                     int a = 1; // violation
-                    int p = 1;
+                    int s = 1;
                     r.k obj = new r().new k() {
                         void method() {
-                            a += p;
+                            a += s;
                         }
                     };
                     obj.getClass();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableEnum.java
index ada61d5f726..60fde25b5cb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableEnum.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableEnum.java
@@ -36,7 +36,7 @@ public class innerClass {
 
     public void testTryWithResources(int a) {
         try (BufferedReader br =
-                     new BufferedReader(new FileReader("someFile.txt"))) { // ok
+                     new BufferedReader(new FileReader("someFile.txt"))) {
             br.readLine();
         }
         catch (IOException e) {
@@ -68,10 +68,10 @@ public void testIncrementAndDecrementKinds() {
     }
 
     public void testBooleanExpressions() {
-        boolean b = false; // ok
+        boolean b = false;
         if (!b) {
         }
-        boolean b1 = true; // ok
+        boolean b1 = true;
         if (b1) {
         }
         boolean a; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableGenericAnonInnerClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableGenericAnonInnerClasses.java
index a3b55a7637a..e689bc2fe3f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableGenericAnonInnerClasses.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableGenericAnonInnerClasses.java
@@ -65,7 +65,7 @@ void foo() {
 
     void test() {
         int variable = 1; // violation
-        int mainVar = 2; // ok
+        int mainVar = 2;
         int anotherVar = 1; // violation
         testingGenerics<Integer>.nested obj
                 = new testingGenerics<Integer>().new nested() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableLambdaExpression.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableLambdaExpression.java
new file mode 100644
index 00000000000..475db92a543
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableLambdaExpression.java
@@ -0,0 +1,92 @@
+/*
+UnusedLocalVariable
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+import java.util.function.Supplier;
+
+public class InputUnusedLocalVariableLambdaExpression {
+    private final LambdaTest<String> myComponent = LambdaTest.lazy(() -> {
+        String foo = "";
+        String hoo = ""; // violation
+        new Runnable() {
+            String hoo = "";
+
+            @Override
+            public void run() {
+                String j = hoo; // violation
+                String ja = foo;
+                ja += "asd";
+            }
+        };
+        return "";
+    });
+
+    final LambdaTest<String> nestedLambdas = LambdaTest.lazy(() -> {
+        String foo = "";
+        String hoo = "";
+        String hoo2 = ""; // violation
+        String hoo3 = ""; // violation
+        final LambdaTest<String> myComponent = LambdaTest.lazy(() -> { // violation
+            final LambdaTest<String> myComponent3 = LambdaTest.lazy(() -> { // violation
+                new Runnable() {
+                    String hoo2 = "";
+
+                    @Override
+                    public void run() {
+                        String j = hoo; // violation
+                        String ja = foo;
+                        ja += hoo2;
+                    }
+                };
+                return "";
+            });
+            new Runnable() {
+                String hoo3 = "";
+
+                @Override
+                public void run() {
+                    String j = hoo3; // violation
+                    String ja = foo;
+                    ja += "asd";
+                }
+            };
+            return "";
+        });
+        new Runnable() {
+            String hoo2 = "";
+
+            @Override
+            public void run() {
+                String j = hoo2;
+                String ja = foo; // violation
+                j += hoo2;
+            }
+        };
+        return "";
+    });
+
+    final LambdaTest<String> nestedLambdas2 = LambdaTest.lazy(() -> {
+        String k = ""; // violation
+        final LambdaTest<String> nestedLambdas = LambdaTest.lazy(() -> {
+            new LambdaTest<String>() {
+                void foo() {
+                    String j = k;
+                    j += "asd";
+                }
+            };
+            return "";
+        });
+        return nestedLambdas.toString();
+    });
+}
+
+class LambdaTest<T> {
+    String k = "";
+    public static <T> LambdaTest<T> lazy(Supplier<T> supplier) {
+        return new LambdaTest<>();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableLocalClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableLocalClasses.java
new file mode 100644
index 00000000000..b3cc247c1eb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableLocalClasses.java
@@ -0,0 +1,26 @@
+/*
+UnusedLocalVariable
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableLocalClasses {
+
+    int a = 12;
+
+    void foo() {
+        int a = 12; // violation
+        int ab = 1; // violation
+
+        class asd {
+            InputUnusedLocalVariableLocalClasses a = new InputUnusedLocalVariableLocalClasses() {
+                void asd() {
+                    System.out.println(a);
+                }
+            };
+        }
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses2.java
index dad83216525..4e2e6c86c2b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses2.java
@@ -25,7 +25,7 @@ class C {
 
 class d {
     void testLocalClasses() {
-        int a = 12; // ok
+        int a = 12;
         int q = 13; // violation
         InputUnusedLocalVariableNestedClasses2.A.B.C obj = // violation
                 new InputUnusedLocalVariableNestedClasses2.A.B().new C() {
@@ -44,7 +44,7 @@ class C {
 
                 void method() {
                     int b = 12; // violation
-                    int a = 12; // ok
+                    int a = 12;
                     C obj = new C() {
                         void method() {
                             b += a;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses3.java
index 4b833ca551d..469f301d4c0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses3.java
@@ -11,7 +11,7 @@
 
 public class InputUnusedLocalVariableNestedClasses3 {
     void method() {
-        final OuterClass outerClass = new OuterClass(); // ok
+        final OuterClass outerClass = new OuterClass();
         final OuterClass.InnerClass innerClass = outerClass.new InnerClass();
         System.out.println(innerClass);
     }
@@ -31,7 +31,7 @@ public class Inner { }
 
 class Test {
     void m() {
-        @A Outer p1 = new @A Outer(); // ok
+        @A Outer p1 = new @A Outer();
         // violation below 'Unused local variable 'p2'.'
         @A Outer.@B Inner p2 = p1.new @B Inner();
     }
@@ -48,7 +48,7 @@ public <V> H006_ComplexConstructors(T t, V v) { }
 
     class Inner3 {
         Inner3(int x) {
-            H006_ComplexConstructors<Integer> instance = // ok
+            H006_ComplexConstructors<Integer> instance =
                     new <String>H006_ComplexConstructors<Integer>(0, "");
             // violation below 'Unused local variable 'o'.'
             Object o = instance.new Inner3(5).new <String>InnerInner3("hey");
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses4.java
new file mode 100644
index 00000000000..408f2d8a4ba
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses4.java
@@ -0,0 +1,23 @@
+/*
+UnusedLocalVariable
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableNestedClasses4 {
+  int a = 12;
+
+  void foo() {
+    int a = 12; // violation, unused variable 'a'
+    int ab = 12; // violation, unused variable 'ab'
+
+    class asd {
+      Test a = new Test() {
+        void asd() {
+          System.out.println(a);
+        }
+      };
+    }
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses5.java
new file mode 100644
index 00000000000..2986e1f0011
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses5.java
@@ -0,0 +1,32 @@
+/*
+UnusedLocalVariable
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableNestedClasses5 {
+  int a = 12;
+
+  void foo() {
+    int a = 12; // violation, unused variable 'a'
+    int ab = 12; // violation, unused variable 'ab'
+
+    class abc {
+      Test a = new Test() {
+        void abc() {
+          System.out.println(a);
+          int abc = 10; // violation, unused variable 'abc'
+
+          class def {
+            Test abc = new Test() {
+              void def() {
+                System.out.println(abc);
+              }
+            };
+          }
+        }
+      };
+    }
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses6.java
new file mode 100644
index 00000000000..13780dd9e89
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses6.java
@@ -0,0 +1,32 @@
+/*
+UnusedLocalVariable
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableNestedClasses6 {
+  int a = 12;
+
+  void foo() {
+    int a = 12; // violation, unused variable 'a'
+    int ab = 12; // violation, unused variable 'ab'
+
+    class abc {
+      Test a = new Test() {
+        void abc() {
+          System.out.println(a);
+          int abc = 10;
+
+          class def {
+            Test ab = new Test() {
+              void def() {
+                System.out.println(abc);
+              }
+            };
+          }
+        }
+      };
+    }
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses7.java
new file mode 100644
index 00000000000..bb0ce7db518
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableNestedClasses7.java
@@ -0,0 +1,36 @@
+/*
+UnusedLocalVariable
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableNestedClasses7 {
+  void foo() {
+    int a = 12; // violation, unused variable 'a'
+    int ab = 12; // violation, unused variable 'ab'
+
+    class Ghi {
+      void foo() {
+        int a = 12;
+        int ab = 12; // violation, unused variable 'ab'
+        System.out.println(a);
+      }
+    }
+
+    class Def {
+      void foo() {
+        int a = 12; // violation, unused variable 'a'
+        int ab = 12; // violation, unused variable 'ab'
+
+        class InnerDef {
+          void foo() {
+            int a = 12; // violation, unused variable 'a'
+            int ab = 12;
+            System.out.println(ab);
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchStatement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchStatement.java
new file mode 100644
index 00000000000..aad747bbb69
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchStatement.java
@@ -0,0 +1,101 @@
+/*
+UnusedLocalVariable
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableSwitchStatement {
+    public void testParameters0() {
+
+        int i = 0;
+        switch (i++) {
+            default:
+            case 0:
+                System.out.println("one: ");
+                break;
+            case 1:
+                System.out.println("two: " );
+                break;
+        }
+
+    }
+
+    public void testParameters01() {
+        int i = 0;
+        switch (++i) {
+            default:
+            case 0:
+                System.out.println("one: ");
+                break;
+            case 1:
+                System.out.println("two: " );
+                break;
+        }
+
+    }
+
+    public void testParameters() {
+        String[] tests = { "one", "two" };
+        int i = 0;
+        for (String test : tests) {
+            switch (i++) {
+                default:
+                case 0:
+                    System.out.println("one: " + test);
+                    break;
+                case 1:
+                    System.out.println("two: " + test);
+                    break;
+            }
+        }
+    }
+
+    public void testParameters2() {
+        String[] tests = { "one", "two" };
+        int i = 0;
+        for (String test : tests) {
+            switch (++i) {
+                default:
+                case 0:
+                    System.out.println("one: " + test);
+                    break;
+                case 1:
+                    System.out.println("two: " + test);
+                    break;
+            }
+        }
+    }
+
+    public void testParameters3() {
+        String[] tests = { "one", "two" };
+        int i = 0;
+        for (String test : tests) {
+            switch (--i) {
+                default:
+                case 0:
+                    System.out.println("one: " + test);
+                    break;
+                case 1:
+                    System.out.println("two: " + test);
+                    break;
+            }
+        }
+    }
+
+    public void testParameters4() {
+        String[] tests = { "one", "two" };
+        int i = 0;
+        for (String test : tests) {
+            switch (i--) {
+                default:
+                case 0:
+                    System.out.println("one: " + test);
+                    break;
+                case 1:
+                    System.out.println("two: " + test);
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchStatement2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchStatement2.java
new file mode 100644
index 00000000000..c6f84edefff
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableSwitchStatement2.java
@@ -0,0 +1,104 @@
+/*
+UnusedLocalVariable
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+public class InputUnusedLocalVariableSwitchStatement2 {
+    public void testParameters0() {
+
+        int i = 0;
+        switch (i+1) {
+            default:
+            case 0:
+                System.out.println("one: ");
+                break;
+            case 1:
+                System.out.println("two: " );
+                break;
+        }
+
+    }
+
+    public void testParameters01() {
+        int i = 0;
+        switch (1+i) {
+            default:
+            case 0:
+                System.out.println("one: ");
+                break;
+            case 1:
+                System.out.println("two: " );
+                break;
+        }
+
+    }
+
+    public void testParameters() {
+        String[] tests = { "one", "two" };
+        int i = 0;
+        for (String test : tests) {
+            switch (i+1) {
+                default:
+                case 0:
+                    System.out.println("one: " + test);
+                    break;
+                case 1:
+                    System.out.println("two: " + test);
+                    break;
+            }
+        }
+    }
+
+    public void testParameters2() {
+        String[] tests = { "one", "two" };
+        int i = 0;
+        i++;
+        int j = 0; // violation 'Unused local variable 'j''
+        for (String test : tests) {
+            switch (i) {
+                default:
+                case 0:
+                    j++;
+                    System.out.println("one: " + test);
+                    break;
+                case 1:
+                    System.out.println("two: " + test);
+                    break;
+            }
+        }
+    }
+
+    public void testParameters4() {
+        int i = 2;
+        int j = 1;
+        switch (j) {
+            case 1:
+                System.out.println("j is 1");
+                break;
+            case 2:
+                System.out.println("j is 2");
+                System.out.println("i is: " + i);
+                break;
+            default:
+                System.out.println("j is something else");
+        }
+    }
+
+    public void testParameters5() {
+        int i = 2;
+        int j = 1;
+        switch (++j) {
+            case 1:
+                System.out.println("j is 1");
+                break;
+            case 2:
+                System.out.println("j is 2");
+                System.out.println("i is: " + ++i);
+                break;
+            default:
+                System.out.println("j is something else");
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableTernaryAndExpressions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableTernaryAndExpressions.java
index 538d8c02c90..9ca5e15950d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableTernaryAndExpressions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/InputUnusedLocalVariableTernaryAndExpressions.java
@@ -7,12 +7,12 @@
 
 public class InputUnusedLocalVariableTernaryAndExpressions {
     void m1() {
-        int time = new Integer(2); // ok
+        int time = new Integer(2);
         assert(time < new Integer(3));
     }
 
     Object m2() {
-        Object x = getY(); // ok
+        Object x = getY();
         String z = null;
         return z == null ? x : new Object();
     }
@@ -22,7 +22,7 @@ String getY() {
     }
 
     int m3() {
-        boolean b = m2().equals(new Object()); // ok
+        boolean b = m2().equals(new Object());
         return b ? 1 : new Integer(3);
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCloseToBlock.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCloseToBlock.java
new file mode 100644
index 00000000000..ad94eccafa0
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceCloseToBlock.java
@@ -0,0 +1,59 @@
+/*
+VariableDeclarationUsageDistance
+allowedDistance = 1
+ignoreVariablePattern = (default)
+validateBetweenScopes = false
+ignoreFinal = false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.variabledeclarationusagedistance;
+
+public class InputVariableDeclarationUsageDistanceCloseToBlock {
+    void method() {
+        int a = 3; // violation 'Distance between .* declaration and its first usage is 13.'
+        int b = 2; // violation 'Distance between .* declaration and its first usage is 13.'
+
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+
+        for (int i = 0; i < 10; i++) {
+            a = a + b;
+        }
+    }
+
+     void method2() {
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+        run();
+
+        int a = 3;
+        int b = 2;
+
+        for (int i = 0; i < 10; i++) {
+            a = a + b;  // distance = 1
+        }
+    }
+
+    public void run() {};
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceDefault.java
index 0166b51a10e..ba4b63ccd07 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceDefault.java
@@ -513,7 +513,7 @@ public void testIssue32_10() {
     public int testIssue32_11(String toDir)
             throws Exception
     {
-        int count = 0;
+        int count = 0;  // violation 'Distance .* is 4.'
         String[] files = {};
 
         System.identityHashCode("Data archival started");
@@ -852,7 +852,7 @@ public static void append(String line)
 
 class New6 {
     void a() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -864,7 +864,7 @@ void a() {
     }
 
     void b() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -876,7 +876,7 @@ void b() {
     }
 
     void c() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -888,7 +888,7 @@ void c() {
     }
 
     void d() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -900,7 +900,7 @@ void d() {
     }
 
     void f() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -910,7 +910,7 @@ void f() {
     }
 
     void h() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -942,7 +942,7 @@ void i() {
     }
 
     void k() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -998,7 +998,7 @@ void m() {
     }
 
     void test() {
-        int a = 0;
+        int a = 0; // violation 'Distance .* is 4.'
 
         System.lineSeparator();
         System.lineSeparator();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceLabels.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceLabels.java
index a915335d3e3..7e7cf4e0fa1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceLabels.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceLabels.java
@@ -12,7 +12,7 @@
 
 public class InputVariableDeclarationUsageDistanceLabels {
     public void method() {
-        boolean eol = false;
+        boolean eol = false; // violation 'Distance .* is 5.'
 
         nothing();
         nothing();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceScopes.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceScopes.java
index 4ea082b4693..f869cba6d7a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceScopes.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/variabledeclarationusagedistance/InputVariableDeclarationUsageDistanceScopes.java
@@ -269,8 +269,8 @@ public Object readObject(String in) throws Exception {
     }
 
     public int[] getSelectedIndices() {
-        int[] sel = new int[5];
-        String model = "";
+        int[] sel = new int[5]; // violation 'Distance .* is 2.'
+        String model = ""; // violation 'Distance between .* declaration and its first usage is 2.'
         int a = 0;
         a++;
         for (int index = 0; index < 5; ++index) {
@@ -513,7 +513,7 @@ public void testIssue32_10() {
     public int testIssue32_11(String toDir)
             throws Exception
     {
-        int count = 0;
+        int count = 0; // violation 'Distance .* is 4.'
         String[] files = {}; // violation 'Distance .* is 2.'
 
         System.identityHashCode("Data archival started");
@@ -852,7 +852,7 @@ public static void append(String line)
 
 class New4 {
     void a() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -864,7 +864,7 @@ void a() {
     }
 
     void b() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -876,7 +876,7 @@ void b() {
     }
 
     void c() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -888,7 +888,7 @@ void c() {
     }
 
     void d() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -900,7 +900,7 @@ void d() {
     }
 
     void f() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -910,7 +910,7 @@ void f() {
     }
 
     void h() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -921,7 +921,7 @@ void h() {
     }
 
     void i() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 2.'
         switch (Math.max(1, 2)) {
         case 1:
             System.lineSeparator();
@@ -942,7 +942,7 @@ void i() {
     }
 
     void k() {
-        int a = 1;
+        int a = 1; // violation 'Distance .* is 5.'
         System.lineSeparator();
         System.lineSeparator();
         System.lineSeparator();
@@ -998,7 +998,7 @@ void m() {
     }
 
     void test() {
-        int a = 0;
+        int a = 0; // violation 'Distance between .* declaration and its first usage is 4.'
 
         System.lineSeparator();
         System.lineSeparator();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens.java
index 370ee7897c7..60137e37811 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.descendanttoken;
 
-public class InputDescendantTokenIllegalTokens // ok
+public class InputDescendantTokenIllegalTokens
 {
     public void methodWithPreviouslyIllegalTokens()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens5.java
index a44fd3edeb0..0ce09ab1d29 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens5.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.descendanttoken;
 
-public class InputDescendantTokenIllegalTokens5 // ok
+public class InputDescendantTokenIllegalTokens5
 {
     public void methodWithPreviouslyIllegalTokens()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens6.java
index 20239e09334..956062394c0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens6.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenIllegalTokens6.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.descendanttoken;
 
-public class InputDescendantTokenIllegalTokens6 // ok
+public class InputDescendantTokenIllegalTokens6
 {
     public void methodWithPreviouslyIllegalTokens()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenReturnFromFinally2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenReturnFromFinally2.java
index e17cee9164b..bf42e5f0905 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenReturnFromFinally2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenReturnFromFinally2.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.descendanttoken;
 
-public class InputDescendantTokenReturnFromFinally2 { // ok
+public class InputDescendantTokenReturnFromFinally2 {
     public void foo() {
         try {
             System.currentTimeMillis();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenTestLimitedToken.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenTestLimitedToken.java
index f5c1c158396..c7bccaef902 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenTestLimitedToken.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/descendanttoken/InputDescendantTokenTestLimitedToken.java
@@ -8,7 +8,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.descendanttoken;
 
-// ok
 public class InputDescendantTokenTestLimitedToken {
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionMultipleAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionMultipleAnnotations.java
index 0c4eeb9f19f..468d0c27041 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionMultipleAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/InputDesignForExtensionMultipleAnnotations.java
@@ -13,7 +13,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class InputDesignForExtensionMultipleAnnotations { // ok
+public class InputDesignForExtensionMultipleAnnotations {
 
     @Ignore
     @Deprecated
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java
index be93730aa27..996bc492ad0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java
@@ -132,7 +132,7 @@ private SomeClass() {}
     }
 }
 
-class TestAnonymousInnerClasses { // ok
+class TestAnonymousInnerClasses {
     public static final TestAnonymousInnerClasses ONE = new TestAnonymousInnerClasses() {
         @Override
         public int value() {
@@ -168,17 +168,17 @@ public static void main(String[] args) {
     }
 }
 
-interface TestNewKeywordInsideInterface { // ok
+interface TestNewKeywordInsideInterface {
     ArrayList<String> foo = new ArrayList<>();
 }
 
 // abstract classes cannot be final
-abstract class TestPrivateCtorInAbstractClasses { // ok
+abstract class TestPrivateCtorInAbstractClasses {
     private TestPrivateCtorInAbstractClasses() {
     }
 }
 
-class TestAnonymousInnerClassInsideNestedClass { // ok
+class TestAnonymousInnerClassInsideNestedClass {
     private TestAnonymousInnerClassInsideNestedClass() { }
 
     static class NestedClass { // violation
@@ -189,7 +189,7 @@ static class NestedClass { // violation
 
         private NestedClass() {}
     }
-    static class NestedClass2 { // ok
+    static class NestedClass2 {
 
         private NestedClass2() {}
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnnotation.java
index 2af8408cc54..cec51c0dfdc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnnotation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnnotation.java
@@ -8,7 +8,7 @@
 
 public @interface InputFinalClassAnnotation {
 
-    final class FinalClass { // ok
+    final class FinalClass {
         private FinalClass() {}
     }
 
@@ -16,7 +16,7 @@ class DerivedClass extends SuperClass { // violation
         private DerivedClass() {}
     }
 
-    class SuperClass { // ok
+    class SuperClass {
         private SuperClass() {}
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnonymousInnerClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnonymousInnerClass.java
index 4770c0f5706..196db91808d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnonymousInnerClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnonymousInnerClass.java
@@ -19,7 +19,7 @@ static class j {
         };
 
         class a {
-            class b { // ok
+            class b {
                 private b() {
                 }
             }
@@ -27,14 +27,14 @@ private b() {
         class m { // violation
             private m() {
             }
-            class q { // ok
+            class q {
                 private q() {
                 }
             }
         }
     }
 
-    class m { // ok
+    class m {
         private m() {
         }
         class q { // violation
@@ -45,7 +45,7 @@ private q() {
         };
     }
 
-    class jasper { // ok
+    class jasper {
         private jasper() {
         }
         class a {
@@ -58,7 +58,7 @@ private b() {
         }
     }
 
-    class g { // ok
+    class g {
         private g() {
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassEnum.java
index 2055dbc270b..9022232de94 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassEnum.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassEnum.java
@@ -28,7 +28,7 @@ public String getInitial() {
         return initial;
     }
 
-    static final class FinalClass { // ok
+    static final class FinalClass {
         private FinalClass() {}
     }
 
@@ -36,7 +36,7 @@ static class DerivedClass extends SuperClass { // violation
         private DerivedClass() {}
     }
 
-    static class SuperClass { // ok
+    static class SuperClass {
         private SuperClass() {}
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInnerAndNestedClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInnerAndNestedClass.java
index a5c7f34fe59..9631732a19a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInnerAndNestedClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInnerAndNestedClass.java
@@ -8,7 +8,7 @@
 
 public class InputFinalClassInnerAndNestedClass {
 
-    private class SuperClass { // ok
+    private class SuperClass {
         private SuperClass() {
         }
     }
@@ -22,7 +22,7 @@ private SameName() {
     }
 
     static class Test {
-        static class SameName { // ok
+        static class SameName {
             private SameName() {
             }
             class Test3 {
@@ -31,7 +31,7 @@ class Test3 {
     }
 
     class TestInnerClass {
-        class SameName { // ok
+        class SameName {
             class Test3 {
                 class Test4 extends SameName {
                 }
@@ -57,7 +57,7 @@ enum foo {
     VALUE_1, VALUE_2;
 
     class A {
-        class B { // ok
+        class B {
             private B() {
             }
         }
@@ -75,7 +75,7 @@ private B() {
 }
 
 class foo2 {
-    class c { // ok
+    class c {
         private c() {
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInterface.java
index a434be80b82..d16e8c3ab0e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInterface.java
@@ -8,7 +8,7 @@
 
 public interface InputFinalClassInterface {
 
-    final class FinalClass { // ok
+    final class FinalClass {
         private FinalClass() {}
     }
 
@@ -16,7 +16,7 @@ class DerivedClass extends SuperClass { // violation
         private DerivedClass() {}
     }
 
-    class SuperClass { // ok
+    class SuperClass {
         private SuperClass() {}
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInEnumWithAnonInnerClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInEnumWithAnonInnerClass.java
index e47303c393a..9fb249e8fca 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInEnumWithAnonInnerClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInEnumWithAnonInnerClass.java
@@ -7,7 +7,7 @@
 
 public enum InputFinalClassNestedInEnumWithAnonInnerClass {
     A;
-    class n { // ok
+    class n {
         private n() {
         }
         class j { // violation
@@ -20,7 +20,7 @@ enum k {
         B;
         j obj = new j() {
         };
-        class j { // ok
+        class j {
             private j() {
             }
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInInterfaceWithAnonInnerClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInInterfaceWithAnonInnerClass.java
index dd28c2ff60a..d05544243c7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInInterfaceWithAnonInnerClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedInInterfaceWithAnonInnerClass.java
@@ -6,7 +6,7 @@
 package com.puppycrawl.tools.checkstyle.checks.design.finalclass;
 
 public interface InputFinalClassNestedInInterfaceWithAnonInnerClass {
-    class a { // ok
+    class a {
         private a() {
         }
     }
@@ -15,7 +15,7 @@ private a() {
     };
 
     interface foo {
-        class m { // ok
+        class m {
             private m() {
             }
         }
@@ -33,7 +33,7 @@ private m() {
     }
 
     @interface annotatedInterface {
-        class b { // ok
+        class b {
             private b() {
             }
         }
@@ -41,7 +41,7 @@ private b() {
         b obj = new b () {
         };
 
-        class c { // ok
+        class c {
             private c() {
             }
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor.java
index d996f20bb57..f99674ddec1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor.java
@@ -60,7 +60,7 @@ class Nothing2 {
     private class Some1 {
         public Some1() {}
     }
-    private class Some3 { // ok
+    private class Some3 {
         protected Some3() {}
     }
 }
@@ -74,7 +74,7 @@ private final class PaperSetter {
 
     }
 
-    private final class Paper { // ok
+    private final class Paper {
         void method() {
         }
 
@@ -84,7 +84,7 @@ void method() {
 }
 
 class Tree2 {
-    private final class Node { // ok
+    private final class Node {
         int data;
         Node next;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor2.java
index 4bb8bc3dce7..6a02b053225 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassPrivateCtor2.java
@@ -8,11 +8,11 @@
 
 public class InputFinalClassPrivateCtor2 {
 
-    private static class c { // ok
+    private static class c {
        private c(){}
     }
 
-    class x extends c {} // ok
+    class x extends c {}
 
     private class a {
     }
@@ -68,7 +68,7 @@ protected None(int i) {}
     }
 }
 
-class a { // ok
+class a {
     private class Class {
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructor.java
index 0550d28bfc4..9fcbc8c50c0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructor.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructor.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
 
-public class InputHideUtilityClassConstructor { // ok
+public class InputHideUtilityClassConstructor {
 
     private static int field;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstract.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstract.java
index fe3b1976632..b07437b7ddb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstract.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstract.java
@@ -6,6 +6,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
 
-public abstract class InputHideUtilityClassConstructorAbstract { // ok
+public abstract class InputHideUtilityClassConstructorAbstract {
     public static void method() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstractSerializable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstractSerializable.java
index 43126af6bc3..9c144797d08 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstractSerializable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstractSerializable.java
@@ -8,7 +8,7 @@
 
 import java.io.Serializable;
 /*input file*/
-public abstract class InputHideUtilityClassConstructorAbstractSerializable // ok
+public abstract class InputHideUtilityClassConstructorAbstractSerializable
         implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorDesignForExtension.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorDesignForExtension.java
index 43de74234c6..8a4c0a51e92 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorDesignForExtension.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorDesignForExtension.java
@@ -10,7 +10,7 @@
  * Test case for the "design for inheritance" check.
  * @author Lars Kühne
  **/
-public abstract class InputHideUtilityClassConstructorDesignForExtension // ok
+public abstract class InputHideUtilityClassConstructorDesignForExtension
 {
     // some methods that are OK
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorNonUtilityClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorNonUtilityClass.java
index 17aa429f529..a435ece5ecd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorNonUtilityClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorNonUtilityClass.java
@@ -12,7 +12,7 @@
 /**
  * Not a util class because it's not directly derived from java.lang.Object.
  */
-public class InputHideUtilityClassConstructorNonUtilityClass extends JPanel // ok
+public class InputHideUtilityClassConstructorNonUtilityClass extends JPanel
 {
     /** HideUtilityClassConstructorCheck should not report this */
     public InputHideUtilityClassConstructorNonUtilityClass()
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPrivate.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPrivate.java
index a34b33b777f..376f2ff20e6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPrivate.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPrivate.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
 
-public class InputHideUtilityClassConstructorPrivate { // ok
+public class InputHideUtilityClassConstructorPrivate {
     private InputHideUtilityClassConstructorPrivate() {}
 
     private static int value = 0;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorRegression.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorRegression.java
index b159be19722..130df4f49be 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorRegression.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorRegression.java
@@ -11,7 +11,7 @@
  *
  * @author lkuehne
  */
-public class InputHideUtilityClassConstructorRegression // ok
+public class InputHideUtilityClassConstructorRegression
 {
     public long constructionTime = System.currentTimeMillis();
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializable.java
index 622f9e3d680..87aa949c3a5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializable.java
@@ -8,7 +8,7 @@
 
 import java.io.Serializable;
 /*input file*/
-public class InputHideUtilityClassConstructorSerializable implements Serializable { // ok
+public class InputHideUtilityClassConstructorSerializable implements Serializable {
     private static final long serialVersionUID = 1L;
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializableInnerStatic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializableInnerStatic.java
index cf8177625a5..5cb9985a950 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializableInnerStatic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializableInnerStatic.java
@@ -8,7 +8,7 @@
 
 import java.io.Serializable;
 
-public class InputHideUtilityClassConstructorSerializableInnerStatic // ok
+public class InputHideUtilityClassConstructorSerializableInnerStatic
         implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass.java
index 2848289083f..9cbc23b90d5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.innertypelast;
 
-public enum InputInnerTypeLastClassRootClass { // ok
+public enum InputInnerTypeLastClassRootClass {
 
     ALWAYS(Bits.YES), NEVER(Bits.NO);
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass2.java
index a457da43aeb..b48c3087eb9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/InputInnerTypeLastClassRootClass2.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.innertypelast;
 
-public class InputInnerTypeLastClassRootClass2 // ok
+public class InputInnerTypeLastClassRootClass2
 {
     private int mFoo = 0;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/InputMutableExceptionClassExtendsGenericClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/InputMutableExceptionClassExtendsGenericClass.java
index 2e32662f701..1c6176a5804 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/InputMutableExceptionClassExtendsGenericClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/InputMutableExceptionClassExtendsGenericClass.java
@@ -13,7 +13,7 @@
 /**
  * Convenience class for holding an {@link Exception} in a thread-safe way  // NPE is not expected
  */
-public class InputMutableExceptionClassExtendsGenericClass // ok
+public class InputMutableExceptionClassExtendsGenericClass
         extends AtomicReference<Exception> {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClass.java
index 2ab5dc4cc3a..deed1bf9cb1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClass.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.onetoplevelclass;
 
-public class InputOneTopLevelClass // ok
+public class InputOneTopLevelClass
 {
     static final int FOO2 = 3;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassAnnotation.java
index e3a6f680eb7..3091e978f41 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassAnnotation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassAnnotation.java
@@ -6,6 +6,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.onetoplevelclass;
 
-@interface InputOneTopLevelClassAnnotation { // ok
+@interface InputOneTopLevelClassAnnotation {
    String author();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEnum.java
index 6b2401d91ba..94afea64746 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEnum.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassEnum.java
@@ -6,6 +6,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.onetoplevelclass;
 
-public enum InputOneTopLevelClassEnum { // ok
+public enum InputOneTopLevelClassEnum {
     VALUE1, VALUE2;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassInterface.java
index 0dbe99b8902..70200fb6238 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/onetoplevelclass/InputOneTopLevelClassInterface.java
@@ -6,6 +6,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.onetoplevelclass;
 
-public interface InputOneTopLevelClassInterface { // ok
+public interface InputOneTopLevelClassInterface {
     int foo();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount.java
deleted file mode 100644
index 95103f2fc24..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-ThrowsCount
-max = (default)4
-ignorePrivateMethods = (default)true
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
-
-import java.awt.AWTException;
-import java.io.EOFException;
-import java.io.FileNotFoundException;
-import java.sql.SQLException;
-
-public class InputThrowsCount {
-    void method1() throws Exception
-    {
-    }
-
-    void method2() throws java.awt.AWTException
-    {
-    }
-
-    void method3() throws Exception, AWTException, SQLException, // violation
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method4() throws Exception, java.awt.AWTException, java.sql.SQLException, // violation
-            java.io.FileNotFoundException, java.io.EOFException
-    {
-    }
-
-    void method5() throws Exception, AWTException, Throwable, SQLException, // violation
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method6() {
-    }
-
-    private void method7() throws Exception, AWTException, SQLException,
-            FileNotFoundException, EOFException {
-    }
-}
-
-class SubClass extends InputThrowsCount {
-    @Override
-    void method1() {
-    }
-
-    @Deprecated
-    @Override
-    void method4() throws Exception, java.awt.AWTException {
-    }
-
-    @Override
-    void method5() throws Exception, AWTException, Throwable {
-    }
-
-    @SuppressWarnings("deprecation")
-    final void method2(Object ...objects) throws Exception, // violation
-            AWTException, SQLException, FileNotFoundException, EOFException{
-    }
-
-    @java.lang.Override
-    void method3() throws Exception {
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount2.java
deleted file mode 100644
index daa9d1e35e4..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount2.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-ThrowsCount
-max = 5
-ignorePrivateMethods = (default)true
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
-
-import java.awt.AWTException;
-import java.io.EOFException;
-import java.io.FileNotFoundException;
-import java.sql.SQLException;
-
-public class InputThrowsCount2 {
-    void method1() throws Exception
-    {
-    }
-
-    void method2() throws AWTException
-    {
-    }
-
-    void method3() throws Exception, AWTException, SQLException,
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method4() throws Exception, AWTException, SQLException,
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method5() throws Exception, AWTException, Throwable, SQLException, // violation
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method6() {
-    }
-
-    private void method7() throws Exception, AWTException, SQLException,
-            FileNotFoundException, EOFException {
-    }
-}
-
-class SubClass2 extends InputThrowsCount2 {
-    @Override
-    void method1() {
-    }
-
-    @Deprecated
-    @Override
-    void method4() throws Exception, AWTException {
-    }
-
-    @Override
-    void method5() throws Exception, AWTException, Throwable {
-    }
-
-    @SuppressWarnings("deprecation")
-    final void method2(Object ...objects) throws Exception, AWTException, SQLException,
-            FileNotFoundException, EOFException{
-    }
-
-    @Override
-    void method3() throws Exception {
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount3.java
deleted file mode 100644
index 5b2e6c4c5a8..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount3.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-ThrowsCount
-max = (default)4
-ignorePrivateMethods = false
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
-
-import java.awt.AWTException;
-import java.io.EOFException;
-import java.io.FileNotFoundException;
-import java.sql.SQLException;
-
-public class InputThrowsCount3 {
-    void method1() throws Exception
-    {
-    }
-
-    void method2() throws AWTException
-    {
-    }
-
-    void method3() throws Exception, AWTException, SQLException, // violation
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method4() throws Exception, AWTException, SQLException, // violation
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method5() throws Exception, AWTException, Throwable, SQLException, // violation
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method6() {
-    }
-
-    private void method7() throws Exception, AWTException, SQLException, // violation
-            FileNotFoundException, EOFException {
-    }
-}
-
-class SubClass3 extends InputThrowsCount3 {
-    @Override
-    void method1() {
-    }
-
-    @Deprecated
-    @Override
-    void method4() throws Exception, AWTException {
-    }
-
-    @Override
-    void method5() throws Exception, AWTException, Throwable {
-    }
-
-    @SuppressWarnings("deprecation")
-    final void method2(Object ...objects) throws Exception, // violation
-            AWTException, SQLException, FileNotFoundException, EOFException{
-    }
-
-    @Override
-    void method3() throws Exception {
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount4.java
deleted file mode 100644
index 056abc4ad70..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCount4.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-ThrowsCount
-max = 0
-ignorePrivateMethods = false
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
-
-import java.awt.AWTException;
-import java.io.EOFException;
-import java.io.FileNotFoundException;
-import java.sql.SQLException;
-
-public class InputThrowsCount4 {
-    void method1() throws Exception // violation 'Throws count is 1 (max allowed is 0)'
-    {
-    }
-
-    void method2() throws java.awt.AWTException // violation 'Throws count is 1 (max allowed is 0)'
-    {
-    }
-
-    void method3() throws Exception, AWTException, SQLException,
-            // violation above 'Throws count is 5 (max allowed is 0)'
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method4() throws Exception, java.awt.AWTException, java.sql.SQLException,
-            // violation above 'Throws count is 5 (max allowed is 0)'
-            java.io.FileNotFoundException, java.io.EOFException
-    {
-    }
-
-    void method5() throws Exception, AWTException, Throwable, SQLException,
-            // violation above 'Throws count is 6 (max allowed is 0)'
-            FileNotFoundException, EOFException
-    {
-    }
-
-    void method6() {
-    }
-
-    private void method7() throws Exception, AWTException, SQLException,
-            // violation above 'Throws count is 5 (max allowed is 0)'
-            FileNotFoundException, EOFException {
-    }
-}
-
-class SubClass4 extends InputThrowsCount {
-    @Override
-    void method1() {
-    }
-
-    @Deprecated
-    @Override
-    void method4() throws Exception, java.awt.AWTException {
-    }
-
-    @Override
-    void method5() throws Exception, AWTException, Throwable {
-    }
-
-    @SuppressWarnings("deprecation")
-    final void method2(Object ...objects) throws Exception,
-            // violation above 'Throws count is 5 (max allowed is 0)'
-            AWTException, SQLException, FileNotFoundException, EOFException{
-    }
-
-    @java.lang.Override
-    void method3() throws Exception {
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountCustomMaxCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountCustomMaxCount.java
new file mode 100644
index 00000000000..eea879cb774
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountCustomMaxCount.java
@@ -0,0 +1,70 @@
+/*
+ThrowsCount
+max = 5
+ignorePrivateMethods = (default)true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
+
+import java.awt.AWTException;
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.sql.SQLException;
+
+public class InputThrowsCountCustomMaxCount {
+    void method1() throws Exception
+    {
+    }
+
+    void method2() throws AWTException
+    {
+    }
+
+    void method3() throws Exception, AWTException, SQLException,
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method4() throws Exception, AWTException, SQLException,
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method5() throws Exception, AWTException, Throwable, SQLException, // violation
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method6() {
+    }
+
+    private void method7() throws Exception, AWTException, SQLException,
+            FileNotFoundException, EOFException {
+    }
+}
+
+class SubClass2 extends InputThrowsCountCustomMaxCount {
+    @Override
+    void method1() {
+    }
+
+    @Deprecated
+    @Override
+    void method4() throws Exception, AWTException {
+    }
+
+    @Override
+    void method5() throws Exception, AWTException, Throwable {
+    }
+
+    @SuppressWarnings("deprecation")
+    final void method2(Object ...objects) throws Exception, AWTException, SQLException,
+            FileNotFoundException, EOFException{
+    }
+
+    @Override
+    void method3() throws Exception {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountDefault.java
new file mode 100644
index 00000000000..a6fff1f179f
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountDefault.java
@@ -0,0 +1,70 @@
+/*
+ThrowsCount
+max = (default)4
+ignorePrivateMethods = (default)true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
+
+import java.awt.AWTException;
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.sql.SQLException;
+
+public class InputThrowsCountDefault {
+    void method1() throws Exception
+    {
+    }
+
+    void method2() throws java.awt.AWTException
+    {
+    }
+
+    void method3() throws Exception, AWTException, SQLException, // violation
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method4() throws Exception, java.awt.AWTException, java.sql.SQLException, // violation
+            java.io.FileNotFoundException, java.io.EOFException
+    {
+    }
+
+    void method5() throws Exception, AWTException, Throwable, SQLException, // violation
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method6() {
+    }
+
+    private void method7() throws Exception, AWTException, SQLException,
+            FileNotFoundException, EOFException {
+    }
+}
+
+class SubClass extends InputThrowsCountDefault {
+    @Override
+    void method1() {
+    }
+
+    @Deprecated
+    @Override
+    void method4() throws Exception, java.awt.AWTException {
+    }
+
+    @Override
+    void method5() throws Exception, AWTException, Throwable {
+    }
+
+    @SuppressWarnings("deprecation")
+    final void method2(Object ...objects) throws Exception, // violation
+            AWTException, SQLException, FileNotFoundException, EOFException{
+    }
+
+    @java.lang.Override
+    void method3() throws Exception {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountMaxAllowZero.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountMaxAllowZero.java
new file mode 100644
index 00000000000..c7f42fc20a3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountMaxAllowZero.java
@@ -0,0 +1,75 @@
+/*
+ThrowsCount
+max = 0
+ignorePrivateMethods = false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
+
+import java.awt.AWTException;
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.sql.SQLException;
+
+public class InputThrowsCountMaxAllowZero {
+    void method1() throws Exception // violation 'Throws count is 1 (max allowed is 0)'
+    {
+    }
+
+    void method2() throws java.awt.AWTException // violation 'Throws count is 1 (max allowed is 0)'
+    {
+    }
+
+    void method3() throws Exception, AWTException, SQLException,
+            // violation above 'Throws count is 5 (max allowed is 0)'
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method4() throws Exception, java.awt.AWTException, java.sql.SQLException,
+            // violation above 'Throws count is 5 (max allowed is 0)'
+            java.io.FileNotFoundException, java.io.EOFException
+    {
+    }
+
+    void method5() throws Exception, AWTException, Throwable, SQLException,
+            // violation above 'Throws count is 6 (max allowed is 0)'
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method6() {
+    }
+
+    private void method7() throws Exception, AWTException, SQLException,
+            // violation above 'Throws count is 5 (max allowed is 0)'
+            FileNotFoundException, EOFException {
+    }
+}
+
+class SubClass4 extends InputThrowsCountMaxAllowZero {
+    @Override
+    void method1() {
+    }
+
+    @Deprecated
+    @Override
+    void method4() throws Exception, java.awt.AWTException {
+    }
+
+    @Override
+    void method5() throws Exception, AWTException, Throwable {
+    }
+
+    @SuppressWarnings("deprecation")
+    final void method2(Object ...objects) throws Exception,
+            // violation above 'Throws count is 5 (max allowed is 0)'
+            AWTException, SQLException, FileNotFoundException, EOFException{
+    }
+
+    @java.lang.Override
+    void method3() throws Exception {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountNotIgnorePrivateMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountNotIgnorePrivateMethods.java
new file mode 100644
index 00000000000..437e2304ecc
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/throwscount/InputThrowsCountNotIgnorePrivateMethods.java
@@ -0,0 +1,70 @@
+/*
+ThrowsCount
+max = (default)4
+ignorePrivateMethods = false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.throwscount;
+
+import java.awt.AWTException;
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.sql.SQLException;
+
+public class InputThrowsCountNotIgnorePrivateMethods {
+    void method1() throws Exception
+    {
+    }
+
+    void method2() throws AWTException
+    {
+    }
+
+    void method3() throws Exception, AWTException, SQLException, // violation
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method4() throws Exception, AWTException, SQLException, // violation
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method5() throws Exception, AWTException, Throwable, SQLException, // violation
+            FileNotFoundException, EOFException
+    {
+    }
+
+    void method6() {
+    }
+
+    private void method7() throws Exception, AWTException, SQLException, // violation
+            FileNotFoundException, EOFException {
+    }
+}
+
+class SubClass3 extends InputThrowsCountNotIgnorePrivateMethods {
+    @Override
+    void method1() {
+    }
+
+    @Deprecated
+    @Override
+    void method4() throws Exception, AWTException {
+    }
+
+    @Override
+    void method5() throws Exception, AWTException, Throwable {
+    }
+
+    @SuppressWarnings("deprecation")
+    final void method2(Object ...objects) throws Exception, // violation
+            AWTException, SQLException, FileNotFoundException, EOFException{
+    }
+
+    @Override
+    void method3() throws Exception {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGregorianCalendar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGregorianCalendar.java
index c868c7499e3..aac57eec462 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGregorianCalendar.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGregorianCalendar.java
@@ -4,7 +4,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
-public class InputVisibilityModifierGregorianCalendar // ok
+public class InputVisibilityModifierGregorianCalendar
 {
     class SubCalendar {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport.java
index cca67e69171..63056da1a3b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport.java
@@ -16,7 +16,7 @@
 
 import java.util.Arrays;
 
-public final class InputVisibilityModifierImmutableStarImport // ok
+public final class InputVisibilityModifierImmutableStarImport
 {
     public final Arrays f = null; // If Arrays is specified as immutable class,
                                   // no matter of canonical name
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport2.java
index 2af846581a7..c83735d1f6e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport2.java
@@ -18,5 +18,5 @@
 //config.immutableClassName=com.google.google.common.ImmutableSet
 public final class InputVisibilityModifierImmutableStarImport2
 {
-    public final ImmutableSet<String> set = null; // ok
+    public final ImmutableSet<String> set = null;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierIsStarImport.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierIsStarImport.java
index 725fb79e549..a7872bc5bfd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierIsStarImport.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierIsStarImport.java
@@ -6,5 +6,5 @@
 
 import java.util.*;
 
-public class InputVisibilityModifierIsStarImport { // ok
+public class InputVisibilityModifierIsStarImport {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierLocalAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierLocalAnnotations.java
index 5d8a652ecdc..ea466e8cf9a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierLocalAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierLocalAnnotations.java
@@ -4,7 +4,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
-public class InputVisibilityModifierLocalAnnotations // ok
+public class InputVisibilityModifierLocalAnnotations
 {
     public @interface Rule {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersPublicImmutable3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersPublicImmutable3.java
index 0956933f909..d3d1f7a1a3a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersPublicImmutable3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersPublicImmutable3.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 import java.util.List;
 
-public class InputVisibilityModifiersPublicImmutable3 { // ok
+public class InputVisibilityModifiersPublicImmutable3 {
     public final int someIntValue;
     public final ImmutableSet<String> includes;
     public final String notes;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/inputs/InetSocketAddress.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/inputs/InetSocketAddress.java
index 8732cf1dab9..7b599d0834c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/inputs/InetSocketAddress.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/inputs/InetSocketAddress.java
@@ -5,7 +5,7 @@
 package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier.inputs;
 // ATTENTION: we need name of this class to be without "Input" prefix to as we
 // need the same name as defined at VisibilityModifierCheck.DEFAULT_IMMUTABLE_TYPES
-public class InetSocketAddress // ok
+public class InetSocketAddress
 {
     public class Arrays {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/InputFinalParametersReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/InputFinalParametersReceiver.java
index 6f82a8ca04e..ae9c9f7c508 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/InputFinalParametersReceiver.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/InputFinalParametersReceiver.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.finalparameters;
 
-public class InputFinalParametersReceiver { // ok
+public class InputFinalParametersReceiver {
     public void foo4(InputFinalParametersReceiver this) {}
 
     private class Inner {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderBlankLines.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderBlankLines.java
index 64cc2ee6860..be828258190 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderBlankLines.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderBlankLines.java
@@ -1,5 +1,5 @@
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.blank-lines.header b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.blank-lines.header
index 5c3872c34d1..421afa41623 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.blank-lines.header
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.blank-lines.header
@@ -1,5 +1,5 @@
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.header b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.header
index 1b9a24e52b2..dad13d7dcb0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.header
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava.header
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava2.header b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava2.header
index 0638c926e12..19286f210a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava2.header
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderjava2.header
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //testvdfvcheckstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowClass.java
index e50d90560b7..a416cddd06e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowClass.java
@@ -9,8 +9,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*; // ok as all class star imports allowed
-
 import java.io.*; // ok as all class star imports allowed
 import java.lang.*; // ok as all class star imports allowed
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowStaticMember.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowStaticMember.java
index 97f61200c23..6b40e744b4b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowStaticMember.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportAllowStaticMember.java
@@ -9,8 +9,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*; // violation
-
 import java.io.*; // violation
 import java.lang.*; // violation
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportDefault.java
index bd386ee9ce7..b64ad2b84f9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportDefault.java
@@ -9,8 +9,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*; // violation
-
 import java.io.*; // violation
 import java.lang.*; // violation
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportExcludes.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportExcludes.java
index 08d3891d4f2..994f3131c7e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportExcludes.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/InputAvoidStarImportExcludes.java
@@ -9,8 +9,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*; // violation
-
 import java.io.*; // ok as excluded in checks
 import java.lang.*; // ok as excluded in checks
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java
index c78293c1682..137dd1dc6c6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java
@@ -7,8 +7,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*;
-
 import java.io.*;
 import java.lang.*;
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault2.java
index 6cf228e8c0e..a57c038995c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault2.java
@@ -7,8 +7,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*;
-
 import java.io.*;
 import java.lang.*;
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault3.java
index b201a49e64d..5ee1dbed46c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault3.java
@@ -7,8 +7,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*;
-
 import java.io.*;
 import java.lang.*;
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault4.java
index 21022f6075f..9b274fcc16b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault4.java
@@ -9,8 +9,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*;
-
 import java.io.*;
 import java.lang.*;
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault5.java
index f8267fa9a5b..189559a4bf5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault5.java
@@ -8,8 +8,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*;
-
 import java.io.*;
 import java.lang.*;
 import java.sql.Connection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportNestedClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportNestedClass.java
index 70082cea9a1..4e6e573dbc9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportNestedClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportNestedClass.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
 
-public class InputAvoidStaticImportNestedClass{ // ok
+public class InputAvoidStaticImportNestedClass{
     public static Integer zero=0;
 
     public static class InnerClass {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault.java
index 125b38178f8..e9faca1bedc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault.java
@@ -29,8 +29,6 @@
 import java.io.InputStream; // violation 'wrong order..* expecting group .* on this line'
 import java.io.Reader; // violation 'wrong order..* expecting group .* on this line'
 
-import com.puppycrawl.tools.checkstyle.*;
-
 import com.google.common.collect.*;
 import org.junit.*;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault2.java
index 813ec44868e..1e39f1e51d3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault2.java
@@ -22,8 +22,8 @@
 import java.util.concurrent.AbstractExecutorService; // violation 'Wrong lexicographical order for.*. Should be before .*'
 import java.util.concurrent.*; // violation 'Wrong lexicographical order for.*. Should be before .*'
 
-import com.puppycrawl.tools.checkstyle.checks.*;
-import com.puppycrawl.tools.checkstyle.*; // violation 'Wrong lexicographical order for.*. Should be before .*'
+import com.google.errorprone.annotations.concurrent.*;
+import com.google.errorprone.annotations.*; // violation 'Wrong lexicographical order for.*. Should be before .*'
 
 import com.google.common.base.*; // 2 violations
 import org.junit.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault3.java
index 76d582f2d99..918aea13373 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault3.java
@@ -29,7 +29,7 @@
 import java.io.InputStream; // violation 'Wrong lexicographical order for.*. Should be before .*'
 import java.io.Reader; // violation 'Wrong lexicographical order for.*. Should be before .*'
 
-import com.puppycrawl.tools.checkstyle.*;
+import com.google.errorprone.annotations.*;
 
 import com.google.common.collect.*; // 2 violations
 import org.junit.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault5.java
index 04f8c6f8d2f..54d83facbf6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault5.java
@@ -29,10 +29,8 @@
 import java.io.InputStream;
 import java.io.Reader;
 
-import com.puppycrawl.tools.checkstyle.*;
-
 import com.google.common.collect.*;
 import org.junit.*;
 
-public class InputCustomImportOrderDefault5 { // ok
+public class InputCustomImportOrderDefault5 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault6.java
index da38ffc51a3..c3f52ba2d13 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault6.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault6.java
@@ -34,5 +34,5 @@
 import com.google.common.collect.*;
 import org.junit.*;
 
-public class InputCustomImportOrderDefault6 { // ok
+public class InputCustomImportOrderDefault6 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault7.java
index 6f3e4c0b8a6..1bd6bbd080c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault7.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault7.java
@@ -29,10 +29,8 @@
 import java.io.InputStream;
 import java.io.Reader;
 
-import com.puppycrawl.tools.checkstyle.*;
-
 import com.google.common.collect.*;
 import org.junit.*;
 
-public class InputCustomImportOrderDefault7 { // ok
+public class InputCustomImportOrderDefault7 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault8.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault8.java
index 77862e84357..d4dfc5ab73e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault8.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault8.java
@@ -29,10 +29,8 @@
 import java.io.InputStream;
 import java.io.Reader;
 
-import com.puppycrawl.tools.checkstyle.*;
-
 import com.google.common.collect.*;
 import org.junit.*;
 
-public class InputCustomImportOrderDefault8 { // ok
+public class InputCustomImportOrderDefault8 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault9.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault9.java
index d4c9609f78c..1cbb205b9e6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault9.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderDefault9.java
@@ -29,7 +29,7 @@
 import java.io.InputStream;
 import java.io.Reader;
 
-import com.puppycrawl.tools.checkstyle.*; // violation 'Extra separation in import group before .*'
+import java.io.*; // violation 'Extra separation in import group before .*'
 
 import com.google.common.collect.*; // violation 'Extra separation in import group before .*'
 import org.junit.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderImportsContainingJava.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderImportsContainingJava.java
index 1ba64aa5fe4..7329fe9a4a6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderImportsContainingJava.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderImportsContainingJava.java
@@ -14,6 +14,6 @@
 
 import java.io.File;
 import javax.lang.model.SourceVersion;
-import com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck; // violation '.* should be separated from previous import group by one line'
+import com.google.errorprone.annotations.*; // violation '.* should be separated from previous import group by one line'
 
 public class InputCustomImportOrderImportsContainingJava {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderListRules.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderListRules.java
new file mode 100644
index 00000000000..a5df939c27a
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderListRules.java
@@ -0,0 +1,38 @@
+/*
+CustomImportOrder
+customImportOrderRules = STATIC, STANDARD_JAVA_PACKAGE, THIRD_PARTY_PACKAGE
+standardPackageRegExp = (default)^(java|javax)\.
+thirdPartyPackageRegExp = com.|org.
+specialImportsRegExp = (default)^$
+separateLineBetweenGroups = (default)true
+sortImportsInGroupAlphabetically = true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.customimportorder;
+
+import static java.io.File.createTempFile;
+import static java.awt.Button.ABORT; // violation 'Wrong lexicographical order for\s.*. Should be before .*'
+import static java.awt.print.Paper.*; // violation 'Wrong lexicographical order for\s.*. Should be before .*'
+import static javax.swing.WindowConstants.*;
+
+import java.awt.Button;
+import java.awt.Frame;
+import java.awt.Dialog; // violation 'Wrong lexicographical order for.*. Should be before .*'
+import java.awt.color.ColorSpace;
+import java.awt.event.ActionEvent;
+import javax.swing.JComponent;
+import javax.swing.JTable;
+import java.io.File; // violation 'Wrong lexicographical order for.*. Should be before .*'
+import java.io.IOException; // violation 'Wrong lexicographical order for.*. Should be before .*'
+import java.io.InputStream; // violation 'Wrong lexicographical order for.*. Should be before .*'
+import java.io.Reader; // violation 'Wrong lexicographical order for.*. Should be before .*'
+
+import com.google.errorprone.annotations.*;
+
+import com.google.common.collect.*; // 2 violations
+import org.junit.*;
+
+public class InputCustomImportOrderListRules {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderListRulesWhitespace.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderListRulesWhitespace.java
new file mode 100644
index 00000000000..bb59bbecbbf
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderListRulesWhitespace.java
@@ -0,0 +1,16 @@
+/*
+CustomImportOrder
+customImportOrderRules =
+standardPackageRegExp = (default)^(java|javax)\.
+thirdPartyPackageRegExp = com.|org.
+specialImportsRegExp = (default)^$
+separateLineBetweenGroups = (default)true
+sortImportsInGroupAlphabetically = true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.customimportorder;
+
+public class InputCustomImportOrderListRulesWhitespace {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderNoValid.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderNoValid.java
index 795298f31cd..8f8b9547c16 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderNoValid.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderNoValid.java
@@ -16,5 +16,5 @@
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
-public class InputCustomImportOrderNoValid { // ok
+public class InputCustomImportOrderNoValid {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSingleLineList.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSingleLineList.java
new file mode 100644
index 00000000000..a8be657fdc6
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSingleLineList.java
@@ -0,0 +1,28 @@
+/*
+CustomImportOrder
+customImportOrderRules = STATIC, STANDARD_JAVA_PACKAGE, THIRD_PARTY_PACKAGE,\
+                         SPECIAL_IMPORTS, SAME_PACKAGE(3)
+standardPackageRegExp = (default)^(java|javax)\\.
+thirdPartyPackageRegExp = ^com\\.google\\..+
+specialImportsRegExp = ^org\\..+
+separateLineBetweenGroups = (default)true
+sortImportsInGroupAlphabetically = (default)false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.customimportorder; import static java.awt.Button.ABORT; import java.util.Map; import java.util.Map.Entry; // violation '.*Map' should be separated from previous import group by one line'
+import com.google.common.annotations.Beta; import com.google.common.collect.HashMultimap; // violation '.*Beta' should be separated from previous import group by one line'
+
+import org.junit.rules.*;
+import org.junit.runner.*;
+import org.junit.validator.*;
+
+
+import com.puppycrawl.tools.checkstyle.*; // violation '.* should be separated from previous import group by one line'
+
+
+
+import picocli.*; // violation '.* should be separated from previous import group by one line'
+
+class InputCustomImportOrderSingleLineList {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSpecialImportsRegExp.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSpecialImportsRegExp.java
index 06850248ba6..af169089176 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSpecialImportsRegExp.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrderSpecialImportsRegExp.java
@@ -14,5 +14,5 @@
 
 import org.junit.Test;
 
-public class InputCustomImportOrderSpecialImportsRegExp { // ok
+public class InputCustomImportOrderSpecialImportsRegExp {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches.java
index c8a480785e6..70e89179997 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches.java
@@ -15,5 +15,5 @@
 
 import org.junit.Test;
 
-public class InputCustomImportOrder_MultiplePatternMatches { // ok
+public class InputCustomImportOrder_MultiplePatternMatches {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches2.java
index ccbc8854a6d..a863902b0af 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches2.java
@@ -15,5 +15,5 @@
 
 import org.junit.Test;
 
-public class InputCustomImportOrder_MultiplePatternMatches2 { // ok
+public class InputCustomImportOrder_MultiplePatternMatches2 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches3.java
index 44e8fa74cce..9940e86ce0d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_MultiplePatternMatches3.java
@@ -15,5 +15,5 @@
 
 import org.junit.Test;
 
-public class InputCustomImportOrder_MultiplePatternMatches3 { // ok
+public class InputCustomImportOrder_MultiplePatternMatches3 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoImports.java
index e17e3aef018..fee5eb8be26 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoImports.java
@@ -14,5 +14,5 @@
 package com.puppycrawl.tools.checkstyle.checks.imports.customimportorder;
 
 
-public class InputCustomImportOrder_NoImports { // ok
+public class InputCustomImportOrder_NoImports {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoSeparator.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoSeparator.java
index 47f9590e72f..473e687c984 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoSeparator.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/InputCustomImportOrder_NoSeparator.java
@@ -16,8 +16,8 @@
 import static java.io.File.createTempFile; // violation 'Wrong lexicographical order for.*. Should be before .*'
 import java.util.*;
 import java.util.StringTokenizer;
-import com.puppycrawl.tools.checkstyle.checks.*;
-import com.puppycrawl.tools.checkstyle.*; // violation 'Wrong lexicographical order for.*. Should be before .*'
+import java.util.concurrent.locks.AbstractOwnableSynchronizer.*;
+import java.util.concurrent.locks.*; // violation 'Wrong lexicographical order for.*. Should be before .*'
 import org.apache.commons.beanutils.*;
 
 public class InputCustomImportOrder_NoSeparator {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault1.java
index 4c1faad4496..be238855a0a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault1.java
@@ -9,36 +9,34 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.illegalimport.*; // ok
-
 import java.io.*; // violation
-import java.lang.*; // ok
-import java.sql.Connection; // ok
-import java.util.List; // ok
-import java.util.List; // ok
-import java.lang.ArithmeticException; // ok
-import org.junit.jupiter.api.*; // ok
-import java.util.Enumeration; // ok
-import java.util.Arrays; // ok
-
-import javax.swing.JToolBar; // ok
-import javax.swing.JToggleButton; // ok
-import javax.swing.ScrollPaneLayout; // ok
-import javax.swing.BorderFactory; // ok
+import java.lang.*;
+import java.sql.Connection;
+import java.util.List;
+import java.util.List;
+import java.lang.ArithmeticException;
+import org.junit.jupiter.api.*;
+import java.util.Enumeration;
+import java.util.Arrays;
+
+import javax.swing.JToolBar;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.BorderFactory;
 import static java.io.File.listRoots; // violation
 
-import static javax.swing.WindowConstants.*; // ok
-import static javax.swing.WindowConstants.*; // ok
+import static javax.swing.WindowConstants.*;
+import static javax.swing.WindowConstants.*;
 import static java.io.File.createTempFile; // violation
-import org.junit.jupiter.api.*; // ok
-
-import java.awt.Component; // ok
-import java.awt.Graphics2D; // ok
-import java.awt.HeadlessException; // ok
-import java.awt.Label; // ok
-import java.util.Date; // ok
-import java.util.Calendar; // ok
-import java.util.BitSet; // ok
+import org.junit.jupiter.api.*;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.HeadlessException;
+import java.awt.Label;
+import java.util.Date;
+import java.util.Calendar;
+import java.util.BitSet;
 
 /*
  * Config:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault2.java
index a49b6320de2..8502c21c465 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault2.java
@@ -9,36 +9,34 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.illegalimport.*; // ok
-
-import java.io.*; // ok
-import java.lang.*; // ok
-import java.sql.Connection; // ok
-import java.util.List; // ok
-import java.util.List; // ok
-import java.lang.ArithmeticException; // ok
-import org.junit.jupiter.api.*; // ok
-import java.util.Enumeration; // ok
-import java.util.Arrays; // ok
-
-import javax.swing.JToolBar; // ok
-import javax.swing.JToggleButton; // ok
-import javax.swing.ScrollPaneLayout; // ok
-import javax.swing.BorderFactory; // ok
-import static java.io.File.listRoots; // ok
-
-import static javax.swing.WindowConstants.*; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static java.io.File.createTempFile; // ok
-import org.junit.jupiter.api.*; // ok
-
-import java.awt.Component; // ok
-import java.awt.Graphics2D; // ok
-import java.awt.HeadlessException; // ok
-import java.awt.Label; // ok
-import java.util.Date; // ok
-import java.util.Calendar; // ok
-import java.util.BitSet; // ok
+import java.io.*;
+import java.lang.*;
+import java.sql.Connection;
+import java.util.List;
+import java.util.List;
+import java.lang.ArithmeticException;
+import org.junit.jupiter.api.*;
+import java.util.Enumeration;
+import java.util.Arrays;
+
+import javax.swing.JToolBar;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.BorderFactory;
+import static java.io.File.listRoots;
+
+import static javax.swing.WindowConstants.*;
+import static javax.swing.WindowConstants.*;
+import static java.io.File.createTempFile;
+import org.junit.jupiter.api.*;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.HeadlessException;
+import java.awt.Label;
+import java.util.Date;
+import java.util.Calendar;
+import java.util.BitSet;
 
 class InputIllegalImportDefault2
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault3.java
index 2728ddf8c27..b19e777e99d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault3.java
@@ -9,36 +9,34 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.illegalimport.*; // ok
-
-import java.io.*; // ok
-import java.lang.*; // ok
+import java.io.*;
+import java.lang.*;
 import java.sql.Connection; // violation
-import java.util.List; // ok
-import java.util.List; // ok
-import java.lang.ArithmeticException; // ok
+import java.util.List;
+import java.util.List;
+import java.lang.ArithmeticException;
 import org.junit.jupiter.api.*; // violation
-import java.util.Enumeration; // ok
-import java.util.Arrays; // ok
-
-import javax.swing.JToolBar; // ok
-import javax.swing.JToggleButton; // ok
-import javax.swing.ScrollPaneLayout; // ok
-import javax.swing.BorderFactory; // ok
-import static java.io.File.listRoots; // ok
-
-import static javax.swing.WindowConstants.*; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static java.io.File.createTempFile; // ok
+import java.util.Enumeration;
+import java.util.Arrays;
+
+import javax.swing.JToolBar;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.BorderFactory;
+import static java.io.File.listRoots;
+
+import static javax.swing.WindowConstants.*;
+import static javax.swing.WindowConstants.*;
+import static java.io.File.createTempFile;
 import org.junit.jupiter.api.*; // violation
 
-import java.awt.Component; // ok
-import java.awt.Graphics2D; // ok
-import java.awt.HeadlessException; // ok
-import java.awt.Label; // ok
-import java.util.Date; // ok
-import java.util.Calendar; // ok
-import java.util.BitSet; // ok
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.HeadlessException;
+import java.awt.Label;
+import java.util.Date;
+import java.util.Calendar;
+import java.util.BitSet;
 
 class InputIllegalImportDefault3
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault4.java
index 6d2e92377d3..9f6a911f976 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault4.java
@@ -9,36 +9,34 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.illegalimport.*; // ok
-
 import java.io.*; // violation
-import java.lang.*; // ok
-import java.sql.Connection; // ok
-import java.util.List; // ok
-import java.util.List; // ok
-import java.lang.ArithmeticException; // ok
+import java.lang.*;
+import java.sql.Connection;
+import java.util.List;
+import java.util.List;
+import java.lang.ArithmeticException;
 import org.junit.jupiter.api.*; // violation
-import java.util.Enumeration; // ok
-import java.util.Arrays; // ok
-
-import javax.swing.JToolBar; // ok
-import javax.swing.JToggleButton; // ok
-import javax.swing.ScrollPaneLayout; // ok
-import javax.swing.BorderFactory; // ok
-import static java.io.File.listRoots; // ok
-
-import static javax.swing.WindowConstants.*; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static java.io.File.createTempFile; // ok
+import java.util.Enumeration;
+import java.util.Arrays;
+
+import javax.swing.JToolBar;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.BorderFactory;
+import static java.io.File.listRoots;
+
+import static javax.swing.WindowConstants.*;
+import static javax.swing.WindowConstants.*;
+import static java.io.File.createTempFile;
 import org.junit.jupiter.api.*; // violation
 
-import java.awt.Component; // ok
-import java.awt.Graphics2D; // ok
-import java.awt.HeadlessException; // ok
-import java.awt.Label; // ok
-import java.util.Date; // ok
-import java.util.Calendar; // ok
-import java.util.BitSet; // ok
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.HeadlessException;
+import java.awt.Label;
+import java.util.Date;
+import java.util.Calendar;
+import java.util.BitSet;
 
 class InputIllegalImportDefault4
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault5.java
index 74dd74ebe02..c0cc0b51f1a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault5.java
@@ -9,33 +9,31 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.illegalimport.*; // ok
-
-import java.io.*; // ok
-import java.lang.*; // ok
-import java.sql.Connection; // ok
+import java.io.*;
+import java.lang.*;
+import java.sql.Connection;
 import java.util.List; // violation
 import java.util.List; // violation
-import java.lang.ArithmeticException; // ok
-import org.junit.jupiter.api.*; // ok
+import java.lang.ArithmeticException;
+import org.junit.jupiter.api.*;
 import java.util.Enumeration; // violation
 import java.util.Arrays; // violation
 
-import javax.swing.JToolBar; // ok
-import javax.swing.JToggleButton; // ok
-import javax.swing.ScrollPaneLayout; // ok
-import javax.swing.BorderFactory; // ok
-import static java.io.File.listRoots; // ok
-
-import static javax.swing.WindowConstants.*; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static java.io.File.createTempFile; // ok
-import org.junit.jupiter.api.*; // ok
-
-import java.awt.Component; // ok
-import java.awt.Graphics2D; // ok
-import java.awt.HeadlessException; // ok
-import java.awt.Label; // ok
+import javax.swing.JToolBar;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.BorderFactory;
+import static java.io.File.listRoots;
+
+import static javax.swing.WindowConstants.*;
+import static javax.swing.WindowConstants.*;
+import static java.io.File.createTempFile;
+import org.junit.jupiter.api.*;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.HeadlessException;
+import java.awt.Label;
 import java.util.Date; // violation
 import java.util.Calendar; // violation
 import java.util.BitSet; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault6.java
index bd27c6af469..f4343d74e11 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault6.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault6.java
@@ -9,36 +9,34 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.illegalimport.*; // ok
-
-import java.io.*; // ok
-import java.lang.*; // ok
-import java.sql.Connection; // ok
+import java.io.*;
+import java.lang.*;
+import java.sql.Connection;
 import java.util.List; // violation
 import java.util.List; // violation
-import java.lang.ArithmeticException; // ok
-import org.junit.jupiter.api.*; // ok
-import java.util.Enumeration; // ok
+import java.lang.ArithmeticException;
+import org.junit.jupiter.api.*;
+import java.util.Enumeration;
 import java.util.Arrays; // violation
 
-import javax.swing.JToolBar; // ok
-import javax.swing.JToggleButton; // ok
-import javax.swing.ScrollPaneLayout; // ok
-import javax.swing.BorderFactory; // ok
-import static java.io.File.listRoots; // ok
-
-import static javax.swing.WindowConstants.*; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static java.io.File.createTempFile; // ok
-import org.junit.jupiter.api.*; // ok
-
-import java.awt.Component; // ok
-import java.awt.Graphics2D; // ok
-import java.awt.HeadlessException; // ok
-import java.awt.Label; // ok
-import java.util.Date; // ok
-import java.util.Calendar; // ok
-import java.util.BitSet; // ok
+import javax.swing.JToolBar;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.BorderFactory;
+import static java.io.File.listRoots;
+
+import static javax.swing.WindowConstants.*;
+import static javax.swing.WindowConstants.*;
+import static java.io.File.createTempFile;
+import org.junit.jupiter.api.*;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.HeadlessException;
+import java.awt.Label;
+import java.util.Date;
+import java.util.Calendar;
+import java.util.BitSet;
 
 class InputIllegalImportDefault6
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault7.java
index 219d13b5fc7..b729b6172ba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault7.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/illegalimport/InputIllegalImportDefault7.java
@@ -9,28 +9,26 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.illegalimport;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.illegalimport.*; // ok
-
-import java.io.*; // ok
-import java.lang.*; // ok
-import java.sql.Connection; // ok
+import java.io.*;
+import java.lang.*;
+import java.sql.Connection;
 import java.util.List; // violation
 import java.util.List; // violation
-import java.lang.ArithmeticException; // ok
-import org.junit.jupiter.api.*; // ok
+import java.lang.ArithmeticException;
+import org.junit.jupiter.api.*;
 import java.util.Enumeration; // violation
 import java.util.Arrays; // violation
 
-import javax.swing.JToolBar; // ok
-import javax.swing.JToggleButton; // ok
-import javax.swing.ScrollPaneLayout; // ok
-import javax.swing.BorderFactory; // ok
-import static java.io.File.listRoots; // ok
+import javax.swing.JToolBar;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.BorderFactory;
+import static java.io.File.listRoots;
 
-import static javax.swing.WindowConstants.*; // ok
-import static javax.swing.WindowConstants.*; // ok
-import static java.io.File.createTempFile; // ok
-import org.junit.jupiter.api.*; // ok
+import static javax.swing.WindowConstants.*;
+import static javax.swing.WindowConstants.*;
+import static java.io.File.createTempFile;
+import org.junit.jupiter.api.*;
 
 import java.awt.Component; // violation
 import java.awt.Graphics2D; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl11.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl11.java
index a45bbaa560e..d1907748b95 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl11.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl11.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol; // ok
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl18.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl18.java
index d43358d0d42..9d5cc077007 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl18.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl18.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol; // ok
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl20.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl20.java
index d32ac8304f7..6cf6afaef9a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl20.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl20.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol; // ok
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl23.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl23.java
index 21c3ed930c4..bbe34509901 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl23.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl23.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol; // ok
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl24.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl24.java
index 9562407ba57..58a6271994b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl24.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl24.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol; // ok
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl7.java
index 68fd1b24cfc..fbf6b1a910f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl7.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl7.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol; // ok
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl8.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl8.java
index 88ad40eb6b4..38132beb7dd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl8.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControl8.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol; // ok
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlBeginTree2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlBeginTree2.java
index aab64df7267..c7ad7670bf6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlBeginTree2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlBeginTree2.java
@@ -10,6 +10,5 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-// ok
 public class InputImportControlBeginTree2 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestException.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestException.java
new file mode 100644
index 00000000000..c61ff23d3f5
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestException.java
@@ -0,0 +1,11 @@
+/*
+ImportControl
+file = (file)InputImportControlTestException.xml
+path = (default).*
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
+
+public class InputImportControlTestException { }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestException.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestException.xml
new file mode 100644
index 00000000000..ec09bfa9d1c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestException.xml
@@ -0,0 +1,4 @@
+<import-control pkg=".*" strategyOnMismatch="allowed">
+  <disallow class="java.awt.Image"/>
+  <disallow class="java.io.File"/>
+</import-control>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile.java
new file mode 100644
index 00000000000..bc33a53dfb1
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile.java
@@ -0,0 +1,14 @@
+/*
+ImportControl
+file = (file)(resource)InputImportControlTestRegexpInFile.xml
+path = (default).*
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
+
+import java.awt.Image; // violation 'Disallowed import - java.awt.Image'
+
+public class InputImportControlTestRegexpInFile {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile.xml
new file mode 100644
index 00000000000..5c78da49f9c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile.xml
@@ -0,0 +1,14 @@
+<!DOCTYPE import-control PUBLIC
+    "-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+    "https://checkstyle.org/dtds/import_control_1_4.dtd">
+
+<import-control pkg="com.puppycrawl.tools.checkstyle.checks.imports">
+  <allow class="java.awt.Image"/>
+
+  <file name="InputImportControl.*" regex="true">
+    <disallow class="java.awt.Image"/>
+  </file>
+  <subpackage name="importcontrol">
+    <allow class="java.awt.Image"/>
+  </subpackage>
+</import-control>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile2.java
new file mode 100644
index 00000000000..c0f3be9cf3d
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile2.java
@@ -0,0 +1,12 @@
+/*
+ImportControl
+file = (file)(resource)InputImportControlTestRegexpInFile2.xml
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
+
+import java.awt.Image;
+
+public class InputImportControlTestRegexpInFile2 {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile2.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile2.xml
new file mode 100644
index 00000000000..f4d8c584e88
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlTestRegexpInFile2.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE import-control PUBLIC
+    "-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+    "https://checkstyle.org/dtds/import_control_1_4.dtd">
+
+<import-control pkg="com.puppycrawl.tools.checkstyle.checks.imports">
+  <allow class="java.awt.Image"/>
+
+  <file name=".*" >
+    <disallow class="java.awt.Image"/>
+  </file>
+</import-control>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlWithoutRegexAndWithStrategyOnMismatch.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlWithoutRegexAndWithStrategyOnMismatch.java
index 05e412ec7e5..4006801c89d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlWithoutRegexAndWithStrategyOnMismatch.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importcontrol/InputImportControlWithoutRegexAndWithStrategyOnMismatch.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importcontrol;
 
-import java.io.File; // ok
+import java.io.File;
 
 public class InputImportControlWithoutRegexAndWithStrategyOnMismatch {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBeginTree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBeginTree.java
index 6a3e71ca394..86b22634fda 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBeginTree.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBeginTree.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.io.IOException.*; // ok
+import static java.io.IOException.*;
 
 public class InputImportOrderBeginTree {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBug.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBug.java
index 046a1b8f1e5..99a551f36ea 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBug.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderBug.java
@@ -8,7 +8,7 @@
 
 import java.net.URL;
 
-public class InputImportOrderBug { // ok
+public class InputImportOrderBug {
    //same as a class name
    private static String URL = "This is a String object";
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderCaseInsensitive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderCaseInsensitive.java
index 844e517b7e4..88d25f5133d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderCaseInsensitive.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderCaseInsensitive.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.io.File; // ok
-import java.io.InputStream; // ok
-import java.io.IOException; // ok
-import java.io.Reader; // ok
-import static java.io.InputStream.*; // ok
-import static java.io.IOException.*; // ok
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.Reader;
+import static java.io.InputStream.*;
+import static java.io.IOException.*;
 
 public class InputImportOrderCaseInsensitive {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNoGapBetweenStaticImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNoGapBetweenStaticImports.java
index e1c9411307b..6ecaacda430 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNoGapBetweenStaticImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderNoGapBetweenStaticImports.java
@@ -16,10 +16,10 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.abs; // ok
-import static java.lang.Math.cos; // ok
-import static javax.xml.transform.TransformerFactory.newInstance; // ok
-import static org.junit.Assert.fail; // ok
+import static java.lang.Math.abs;
+import static java.lang.Math.cos;
+import static javax.xml.transform.TransformerFactory.newInstance;
+import static org.junit.Assert.fail;
 
 public class InputImportOrderNoGapBetweenStaticImports {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderRepetition.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderRepetition.java
index f15a69fe8c8..6338f334cd2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderRepetition.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderRepetition.java
@@ -16,13 +16,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.awt.Button; // ok
-import java.awt.Dialog; // ok
-import java.awt.event.ActionEvent; // ok
-import java.awt.event.ActionEvent; // ok
+import java.awt.Button;
+import java.awt.Dialog;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionEvent;
 
-import javax.swing.JComponent; // ok
-import javax.swing.JTable; // ok
+import javax.swing.JComponent;
+import javax.swing.JTable;
 
 public class InputImportOrderRepetition {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically1.java
index 371df9a6409..0739fa8b219 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically1.java
@@ -16,10 +16,10 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static org.junit.Assert.fail; // ok
-import static javax.xml.transform.TransformerFactory.newInstance; // ok
-import static java.lang.Math.cos; // ok
-import static java.lang.Math.abs; // ok
+import static org.junit.Assert.fail;
+import static javax.xml.transform.TransformerFactory.newInstance;
+import static java.lang.Math.cos;
+import static java.lang.Math.abs;
 
 public class InputImportOrderSortStaticImportsAlphabetically1 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically2.java
index 85527a2ae49..67daa208ce0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderSortStaticImportsAlphabetically2.java
@@ -16,7 +16,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static org.junit.Assert.fail; // ok
+import static org.junit.Assert.fail;
 import static javax.xml.transform.TransformerFactory.newInstance; // violation 'Wrong order for .* import.'
 import static java.lang.Math.cos; // violation 'Wrong order for 'java.lang.Math.cos' import.'
 import static java.lang.Math.abs; // violation 'Wrong order for 'java.lang.Math.abs' import.'
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder1.java
index 83e69bd2600..084f220b028 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder1.java
@@ -16,8 +16,8 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.abs; // ok
-import static org.antlr.v4.runtime.Recognizer.EOF; // ok
+import static java.lang.Math.abs;
+import static org.antlr.v4.runtime.Recognizer.EOF;
 
 import org.antlr.v4.runtime.*; // violation 'Extra separation in import group before 'org.antlr.v4.runtime.*''
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder2.java
index 2950deecef3..e502297653b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrder2.java
@@ -16,8 +16,8 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.abs; // ok
-import static org.antlr.v4.runtime.Recognizer.EOF; // ok
+import static java.lang.Math.abs;
+import static org.antlr.v4.runtime.Recognizer.EOF;
 
 import org.antlr.v4.runtime.*; // violation 'Extra separation in import group before 'org.antlr.v4.runtime.*''
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom1.java
index 97149fb9bd8..337715771bd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom1.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
 import java.util.Set; // violation 'Extra separation in import group before 'java.util.Set''
 
 import static java.lang.Math.PI; // violation 'Extra separation in import group before 'java.lang.Math.PI''
-import static org.antlr.v4.runtime.Recognizer.EOF; // ok
+import static org.antlr.v4.runtime.Recognizer.EOF;
 
 public class InputImportOrderStaticGroupOrderBottom1
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom2.java
index d88f1de4fcb..e941c44e877 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom2.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
 import java.util.Set; // violation 'Extra separation in import group before 'java.util.Set''
 
 import static java.lang.Math.PI; // violation 'Extra separation in import group before 'java.lang.Math.PI''
-import static org.antlr.v4.runtime.Recognizer.EOF; // ok
+import static org.antlr.v4.runtime.Recognizer.EOF;
 
 public class InputImportOrderStaticGroupOrderBottom2
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom3.java
index fcbc628348c..43b7a565578 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom3.java
@@ -16,7 +16,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
 import java.util.Set; // violation 'Extra separation in import group before 'java.util.Set''
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative1.java
index d1c4f3ca5e2..b8ed0027353 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative1.java
@@ -16,10 +16,10 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
-import static java.lang.Math.PI; // ok
-import static org.antlr.v4.runtime.Recognizer.EOF; // ok
+import static java.lang.Math.PI;
+import static org.antlr.v4.runtime.Recognizer.EOF;
 
 import java.util.Set; // violation 'Wrong order for 'java.util.Set' import.'
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative2.java
index ded6511200f..11319a4ddba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative2.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
 import static java.lang.Math.PI; // violation 'Wrong order for 'java.lang.Math.PI' import.'
-import static org.antlr.v4.runtime.Recognizer.EOF; // ok
+import static org.antlr.v4.runtime.Recognizer.EOF;
 
-import java.util.Set; // ok
+import java.util.Set;
 
 public class InputImportOrderStaticGroupOrderBottom_Negative2
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative3.java
index 2db2b822f60..1e03dc0f4d1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupOrderBottom_Negative3.java
@@ -16,14 +16,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
-import static java.lang.Math.PI; // ok
-import static org.antlr.v4.runtime.Recognizer.EOF; // ok
+import static java.lang.Math.PI;
+import static org.antlr.v4.runtime.Recognizer.EOF;
 
 import java.util.Set; // violation 'Wrong order for 'java.util.Set' import.'
 
-import static java.util.Set.*; // ok
+import static java.util.Set.*;
 
 public class InputImportOrderStaticGroupOrderBottom_Negative3
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupSeparated.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupSeparated.java
index 43559ca4d40..c6b8fb46d4d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupSeparated.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticGroupSeparated.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.abs; // ok
+import static java.lang.Math.abs;
 
 import static java.lang.Math.cos; // violation 'Extra separation in import group before 'java.lang.Math.cos''
 
 import static org.junit.Assert.assertEquals; // violation 'Extra separation in import group before 'org.junit.Assert.assertEquals''
-import static org.junit.Assert.fail; // ok
+import static org.junit.Assert.fail;
 
 public class InputImportOrderStaticGroupSeparated {
     void method() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder1.java
index 0c1163ea51e..3cd47c5c5ca 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder1.java
@@ -16,8 +16,8 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.*; // ok
-import static org.antlr.v4.runtime.CommonToken.*; // ok
+import static java.lang.Math.*;
+import static org.antlr.v4.runtime.CommonToken.*;
 
 import org.antlr.v4.runtime.*; // violation 'Extra separation in import group before 'org.antlr.v4.runtime.*''
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder2.java
index 23157861eea..9efdf179e43 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrder2.java
@@ -16,8 +16,8 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.*; // ok
-import static org.antlr.v4.runtime.CommonToken.*; // ok
+import static java.lang.Math.*;
+import static org.antlr.v4.runtime.CommonToken.*;
 
 import org.antlr.v4.runtime.*; // violation 'Extra separation in import group before 'org.antlr.v4.runtime.*''
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom1.java
index 43f2bc46fe1..91d1fd9e2d6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom1.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
 import java.util.Set; // violation 'Extra separation in import group before 'java.util.Set''
 
 import static java.lang.Math.*; // violation 'Extra separation in import group before 'java.lang.Math.*''
-import static org.antlr.v4.runtime.CommonToken.*; // ok
+import static org.antlr.v4.runtime.CommonToken.*;
 
 public class InputImportOrderStaticOnDemandGroupOrderBottom1
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom2.java
index a0a6d0ae6b9..f185b6f1e16 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom2.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
 import java.util.Set; // violation 'Extra separation in import group before 'java.util.Set''
 
 import static java.lang.Math.*; // violation 'Extra separation in import group before 'java.lang.Math.*''
-import static org.antlr.v4.runtime.CommonToken.*; // ok
+import static org.antlr.v4.runtime.CommonToken.*;
 
 public class InputImportOrderStaticOnDemandGroupOrderBottom2
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom3.java
index 4e616ae62d5..392e88ea24d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticOnDemandGroupOrderBottom3.java
@@ -16,7 +16,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import org.antlr.v4.runtime.*; // ok
+import org.antlr.v4.runtime.*;
 
 import java.util.Set; // violation 'Extra separation in import group before 'java.util.Set''
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition1.java
index 186b931b8e6..c677cf2bb6c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition1.java
@@ -16,13 +16,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.*; // ok
-import static org.antlr.v4.runtime.CommonToken.*; // ok
-import static org.antlr.v4.runtime.CommonToken.*;  // ok
+import static java.lang.Math.*;
+import static org.antlr.v4.runtime.CommonToken.*;
+import static org.antlr.v4.runtime.CommonToken.*;
 
-import java.util.Set; // ok
+import java.util.Set;
 
-import org.junit.Test; // ok
+import org.junit.Test;
 
 public class InputImportOrderStaticRepetition1 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition2.java
index 8a81409451d..3cbc2fa21fc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrderStaticRepetition2.java
@@ -16,13 +16,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.lang.Math.*; // ok
+import static java.lang.Math.*;
 import static org.antlr.v4.runtime.CommonToken.*; // violation '.* should be separated from previous imports.'
-import static org.antlr.v4.runtime.CommonToken.*;  // ok
+import static org.antlr.v4.runtime.CommonToken.*;
 
 import java.util.Set; // violation 'Wrong order for 'java.util.Set' import.'
 
-import org.junit.Test; // ok
+import org.junit.Test;
 
 public class InputImportOrderStaticRepetition2 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Above.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Above.java
index c44202cb09f..4f7c933f569 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Above.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Above.java
@@ -16,21 +16,21 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.awt.Button.ABORT; // ok
-import static javax.swing.WindowConstants.*; // ok
+import static java.awt.Button.ABORT;
+import static javax.swing.WindowConstants.*;
 import static java.awt.Button.ABORT; // violation 'Wrong order for 'java.awt.Button.ABORT' import.'
-import java.awt.Button; // ok
-import java.awt.Frame; // ok
+import java.awt.Button;
+import java.awt.Frame;
 import java.awt.Dialog; // violation 'Wrong order for 'java.awt.Dialog' import.'
-import java.awt.event.ActionEvent; // ok
-import javax.swing.JComponent; // ok
-import javax.swing.JTable; // ok
+import java.awt.event.ActionEvent;
+import javax.swing.JComponent;
+import javax.swing.JTable;
 
 import java.io.File; // 2 violations
 import static java.io.File.createTempFile; // violation 'Wrong order for 'java.io.File.createTempFile' import.'
-import java.io.IOException; // ok
-import java.io.InputStream; // ok
-import java.io.Reader; // ok
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
 
 public class InputImportOrder_Above {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Bottom.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Bottom.java
index 20151f60b53..020fab94233 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Bottom.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Bottom.java
@@ -16,23 +16,23 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.awt.Button; // ok
-import java.awt.Dialog; // ok
-import java.awt.Frame; // ok
-import java.awt.event.ActionEvent; // ok
+import java.awt.Button;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
 
 import java.io.IOException; // violation 'Extra separation in import group before 'java.io.IOException''
-import java.io.InputStream; // ok
+import java.io.InputStream;
 
 import javax.swing.JComponent; // violation 'Extra separation in import group before 'javax.swing.JComponent''
-import javax.swing.JTable; // ok
+import javax.swing.JTable;
 
 import static java.io.File.*; // violation 'Extra separation in import group before 'java.io.File.*''
 import java.io.File; // violation 'Wrong order for 'java.io.File' import.'
 
 import static java.io.File.createTempFile; // violation 'Extra separation in import group before 'java.io.File.createTempFile''
-import static java.awt.Button.ABORT; // ok
-import static javax.swing.WindowConstants.*; // ok
+import static java.awt.Button.ABORT;
+import static javax.swing.WindowConstants.*;
 
 import java.io.Reader; // 2 violations
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java
index 75a0e5684e4..5ef78172118 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_DotPackageName.java
@@ -16,12 +16,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.awt.Button; // ok
-import java.awt.Frame; // ok
+import java.awt.Button;
+import java.awt.Frame;
 import java.awt.Dialog; // violation 'Wrong order for 'java.awt.Dialog' import.'
-import java.awt.event.ActionEvent; // ok
+import java.awt.event.ActionEvent;
 import javax.swing.JComponent; // violation 'Wrong order for 'javax.swing.JComponent' import.'
-import javax.swing.JTable; // ok
+import javax.swing.JTable;
 
 public class InputImportOrder_DotPackageName {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java
index 56547a04389..5b1bddd7ae3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java
@@ -16,7 +16,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; // ok
+import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
 import static java.awt.Button.ABORT; // violation 'Wrong order for 'java.awt.Button.ABORT' import.'
 import java.awt.Dialog; // violation 'Wrong order for 'java.awt.Dialog' import.'
 import java.awt.Button; // violation 'Wrong order for 'java.awt.Button' import.'
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_InFlow.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_InFlow.java
index d3424764684..05d315d0488 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_InFlow.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_InFlow.java
@@ -16,23 +16,23 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.awt.Button; // ok
-import static java.awt.Button.ABORT; // ok
-import java.awt.Frame; // ok
+import java.awt.Button;
+import static java.awt.Button.ABORT;
+import java.awt.Frame;
 import java.awt.Dialog; // violation 'Wrong order for 'java.awt.Dialog' import.'
-import java.awt.event.ActionEvent; // ok
+import java.awt.event.ActionEvent;
 
 import javax.swing.JComponent; // violation 'Extra separation in import group before 'javax.swing.JComponent''
-import static javax.swing.WindowConstants.HIDE_ON_CLOSE; // ok
+import static javax.swing.WindowConstants.HIDE_ON_CLOSE;
 import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE; // violation 'Wrong order for .* import.'
 import static javax.swing.WindowConstants.*; // violation 'Wrong order for 'javax.swing.WindowConstants.*' import.'
 import javax.swing.JTable; // violation 'Wrong order for 'javax.swing.JTable' import.'
 
 import static java.io.File.createTempFile; // 2 violations
 import java.io.File; // violation 'Wrong order for 'java.io.File' import.'
-import java.io.IOException; // ok
-import java.io.InputStream; // ok
-import java.io.Reader; // ok
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
 
 public class InputImportOrder_InFlow {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_NoFailureForRedundantImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_NoFailureForRedundantImports.java
index f0112c4469d..a33f977e8c6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_NoFailureForRedundantImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_NoFailureForRedundantImports.java
@@ -16,5 +16,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-public class InputImportOrder_NoFailureForRedundantImports { // ok
+public class InputImportOrder_NoFailureForRedundantImports {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top1.java
index 696a3f88cdf..c63ffdcc999 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top1.java
@@ -16,24 +16,24 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.io.File.createTempFile; // ok
-import static java.awt.Button.ABORT; // ok
-import static javax.swing.WindowConstants.*; // ok
-
-import java.awt.Button; // ok
-import java.awt.Dialog; // ok
-import java.awt.Frame; // ok
-import java.awt.event.ActionEvent; // ok
+import static java.io.File.createTempFile;
+import static java.awt.Button.ABORT;
+import static javax.swing.WindowConstants.*;
+
+import java.awt.Button;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
 /***comment test***/
-import java.io.IOException; // ok
-import java.io.InputStream; // ok
+import java.io.IOException;
+import java.io.InputStream;
 
-import javax.swing.JComponent; // ok
-import javax.swing.JTable; // ok
+import javax.swing.JComponent;
+import javax.swing.JTable;
 
-import static java.io.File.*; // ok
-import java.io.File; // ok
-import java.io.Reader; // ok
+import static java.io.File.*;
+import java.io.File;
+import java.io.Reader;
 
 public class InputImportOrder_Top1 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top2.java
index 8f59b95e92c..f32e0b2f2e8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Top2.java
@@ -16,24 +16,24 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import static java.io.File.createTempFile; // ok
-import static java.awt.Button.ABORT; // ok
-import static javax.swing.WindowConstants.*; // ok
+import static java.io.File.createTempFile;
+import static java.awt.Button.ABORT;
+import static javax.swing.WindowConstants.*;
 
 import java.awt.Button; // violation 'Extra separation in import group before 'java.awt.Button''
-import java.awt.Dialog; // ok
-import java.awt.Frame; // ok
-import java.awt.event.ActionEvent; // ok
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
 /***comment test***/
 import java.io.IOException; // violation 'Extra separation in import group before 'java.io.IOException''
-import java.io.InputStream; // ok
+import java.io.InputStream;
 
 import javax.swing.JComponent; // violation 'Extra separation in import group before 'javax.swing.JComponent''
-import javax.swing.JTable; // ok
+import javax.swing.JTable;
 
 import static java.io.File.*; // 2 violations
-import java.io.File; // ok
-import java.io.Reader; // ok
+import java.io.File;
+import java.io.Reader;
 
 public class InputImportOrder_Top2 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Under.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Under.java
index f846122b99f..baaa06dbe84 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Under.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Under.java
@@ -16,21 +16,21 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.awt.Button; // ok
-import java.awt.Frame; // ok
+import java.awt.Button;
+import java.awt.Frame;
 import java.awt.Dialog; // violation 'Wrong order for 'java.awt.Dialog' import.'
-import java.awt.event.ActionEvent; // ok
-import javax.swing.JComponent; // ok
-import javax.swing.JTable; // ok
-import static java.awt.Button.ABORT; // ok
-import static javax.swing.WindowConstants.*; // ok
+import java.awt.event.ActionEvent;
+import javax.swing.JComponent;
+import javax.swing.JTable;
+import static java.awt.Button.ABORT;
+import static javax.swing.WindowConstants.*;
 import static java.awt.Button.ABORT; // violation 'Wrong order for 'java.awt.Button.ABORT' import.'
 
 import static java.io.File.createTempFile; // violation 'Extra separation in import group before 'java.io.File.createTempFile''
 import java.io.File; // violation 'Wrong order for 'java.io.File' import.'
-import java.io.IOException; // ok
-import java.io.InputStream; // ok
-import java.io.Reader; // ok
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
 
 public class InputImportOrder_Under {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Wildcard.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Wildcard.java
index 5e7af09addb..f9ad9b32195 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Wildcard.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_Wildcard.java
@@ -19,9 +19,8 @@
 // com.puppycrawl,*,java
 // the trailing javax.crypto.Cipher; should be flagged as a violation.
 
-import com.puppycrawl.tools.checkstyle.checks.imports.importorder.InputImportOrder_Above; // ok
-import javax.crypto.BadPaddingException; // ok
-import java.util.List; //comment test // ok
+import javax.crypto.BadPaddingException;
+import java.util.List; //comment test
 import javax.crypto.Cipher; // violation 'Wrong order for 'javax.crypto.Cipher' import.'
 
 public class InputImportOrder_Wildcard {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_WildcardUnspecified.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_WildcardUnspecified.java
index 8c9a1b83604..6dbbdec61d6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_WildcardUnspecified.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_WildcardUnspecified.java
@@ -16,11 +16,11 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
-import java.io.File; // ok
-import java.io.IOException; // ok
-import java.util.Iterator; // ok
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.importorder.InputImportOrderBug; // violation 'Extra separation in import group before .*'
+import javax.crypto.Cipher; // violation 'Extra separation in import group before .*'
 
 public class InputImportOrder_WildcardUnspecified {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportBug.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportBug.java
index 77455a27ede..d9a533e332f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportBug.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportBug.java
@@ -8,7 +8,7 @@
 
 import java.net.URL;
 
-public class InputRedundantImportBug { // ok
+public class InputRedundantImportBug {
    //same as a class name
    private static String URL = "This is a String object";
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportWithoutWarnings.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportWithoutWarnings.java
index 931967cd838..0268d4e65fc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportWithoutWarnings.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/InputRedundantImportWithoutWarnings.java
@@ -10,6 +10,6 @@
 
 import java.util.List;
 
-public class InputRedundantImportWithoutWarnings { // ok
+public class InputRedundantImportWithoutWarnings {
     private static final List<String> CONSTANTS = asList("a", "b");
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports.java
index 57f35d48d38..bf5c4310052 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports.java
@@ -7,9 +7,9 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*;
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports. //violation
-        InputUnusedImportsBug;
+import com.google.errorprone.annotations.*;
+import com.google.errorprone.annotations.concurrent.GuardedBy; //violation
+
 import java.io.*;
 import java.lang.*;
 import java.lang.String; // violation
@@ -38,14 +38,14 @@
 import java.util.Calendar;
 import java.util.BitSet;
 
-import com.puppycrawl.tools.checkstyle.Checker;
-import com.puppycrawl.tools.checkstyle.CheckerTest;
-import com.puppycrawl.tools.checkstyle.Definitions;
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImports15Extensions;
-import com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest;
-import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
-import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import com.puppycrawl.tools.checkstyle.DefaultLogger; // violation
+import com.google.errorprone.annotations.CheckReturnValue;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.errorprone.annotations.CompatibleWith;
+import com.google.errorprone.annotations.concurrent.LazyInit;
+import com.google.errorprone.annotations.DoNotCall;
+import com.google.errorprone.annotations.CompileTimeConstant;
+import com.google.errorprone.annotations.FormatString;
+import com.google.errorprone.annotations.ForOverride; // violation
 
 /**
  * Test case for imports
@@ -102,13 +102,14 @@ public void Label() {}
     public void render() {}
 
     /**
-     * First is a class with a method with arguments {@link Checker#method1(CheckerTest)}.
+     * First is a class with a method with arguments
+     * {@link CheckReturnValue#method1(CanIgnoreReturnValue)}.
      * Next is a class with typed method
-     * {@link BaseFileSetCheckTestSupport#method2(Definitions, InputUnusedImports15Extensions)}.
+     * {@link BaseFileSetCheckTestSupport#method2(CompatibleWith, LazyInit)}.
      *
-     * @param param1 with a link {@link ConfigurationLoaderTest}
-     * @throws PackageNamesLoader when broken
-     * @deprecated in 1 for removal in 2. Use {@link DefaultConfiguration}
+     * @param param1 with a link {@link DoNotCall}
+     * @throws CompileTimeConstant when broken
+     * @deprecated in 1 for removal in 2. Use {@link FormatString}
      */
     public void aMethodWithManyLinks() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports15Extensions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports15Extensions.java
index ca561ef5aa9..603adb842c5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports15Extensions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports15Extensions.java
@@ -7,7 +7,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
-@interface MyAnnotation1 { // ok
+@interface MyAnnotation1 {
     String name();
     int version();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports2.java
index 2b0f650badb..0565b54e0e5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports2.java
@@ -7,9 +7,9 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.*;
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports. //violation
-        InputUnusedImportsBug;
+import com.google.errorprone.annotations.*;
+import com.google.errorprone.annotations.concurrent.GuardedBy; //violation
+
 import java.io.*;
 import java.lang.*;
 import java.lang.String; // violation
@@ -38,14 +38,14 @@
 import java.util.Calendar; // violation
 import java.util.BitSet; // violation
 
-import com.puppycrawl.tools.checkstyle.Checker; // violation
-import com.puppycrawl.tools.checkstyle.CheckerTest; // violation
-import com.puppycrawl.tools.checkstyle.Definitions; // violation
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImports15Extensions; // violation
-import com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest; // violation
-import com.puppycrawl.tools.checkstyle.PackageNamesLoader; // violation
-import com.puppycrawl.tools.checkstyle.DefaultConfiguration; // violation
-import com.puppycrawl.tools.checkstyle.DefaultLogger; // violation
+import com.google.errorprone.annotations.CheckReturnValue; // violation
+import com.google.errorprone.annotations.CanIgnoreReturnValue; // violation
+import com.google.errorprone.annotations.CompatibleWith; // violation
+import com.google.errorprone.annotations.concurrent.LazyInit; // violation
+import com.google.errorprone.annotations.DoNotCall; // violation
+import com.google.errorprone.annotations.CompileTimeConstant; // violation
+import com.google.errorprone.annotations.FormatMethod; // violation
+import com.google.errorprone.annotations.FormatString; // violation
 
 /**
  * Test case for imports
@@ -102,13 +102,14 @@ public void Label() {}
     public void render() {}
 
     /**
-     * First is a class with a method with arguments {@link Checker#method1(CheckerTest)}.
+     * First is a class with a method with arguments
+     * {@link CheckReturnValue#method1(CanIgnoreReturnValue)}.
      * Next is a class with typed method
-     * {@link BaseFileSetCheckTestSupport#method2(Definitions, InputUnusedImports15Extensions)}.
+     * {@link BaseFileSetCheckTestSupport#method2(CompatibleWith, LazyInit)}.
      *
-     * @param param1 with a link {@link ConfigurationLoaderTest}
-     * @throws PackageNamesLoader when broken
-     * @deprecated in 1 for removal in 2. Use {@link DefaultConfiguration}
+     * @param param1 with a link {@link DoNotCall}
+     * @throws CompileTimeConstant when broken
+     * @deprecated in 1 for removal in 2. Use {@link FormatMethod}
      */
     public void aMethodWithManyLinks() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsArrayRef.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsArrayRef.java
index 51bed3cee27..375e5b7ede0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsArrayRef.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsArrayRef.java
@@ -7,7 +7,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
-import java.util.HashMap; // ok
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.ArrayList; // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsBug.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsBug.java
index 921ef6f7255..c84e387b8d2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsBug.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsBug.java
@@ -9,7 +9,7 @@
 
 import java.net.URL;
 
-public class InputUnusedImportsBug { // ok
+public class InputUnusedImportsBug {
    //same as a class name
    private static String URL = "This is a String object";
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromJavaLang.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromJavaLang.java
index 0a46b294680..0947ae59106 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromJavaLang.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromJavaLang.java
@@ -19,11 +19,11 @@
 import java.lang.Float; // violation
 import java.lang.Short; // violation
 
-import java.lang.annotation.Annotation; // OK
-import java.lang.reflect.Modifier; // OK
-import java.lang.reflect.Field; // OK
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Field;
 
-import java.lang.*; // OK
+import java.lang.*;
 
 public class InputUnusedImportsFromJavaLang {
     private static final String SOMETHING = "a string";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRef.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRef.java
new file mode 100644
index 00000000000..855c1c9cdb0
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRef.java
@@ -0,0 +1,91 @@
+/*
+UnusedImports
+processJavadoc = (default)true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
+
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Optional;
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Collections;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import static java.lang.String.format; // violation 'Unused import - java.lang.String.format.'
+import static java.util.Arrays.sort; // violation 'Unused import - java.util.Arrays.sort.'
+import static java.util.List.of; // violation 'Unused import - java.util.List.of.'
+import static java.util.Collections.emptyMap; // violation 'Unused import - java.util.Collections.emptyMap.'
+
+/**
+ * This {@link Collections::emptyMap} is NOT a valid link,
+ * and this check does not count this as a usage.
+ */
+public class InputUnusedImportsFromStaticMethodRef {
+    public static <T, R> Function<T, R> func(Function<T, R> f) { return f; }
+
+    InputUnusedImportsFromStaticMethodRef() {
+    }
+
+    void testMethodRef() {
+        Optional<String> test = Optional.empty();
+        test.map(String::format);
+    }
+
+    void testMethodRefWithClass() {
+        Optional<String> test = Optional.empty();
+        test.map(Objects::nonNull);
+    }
+
+    void testMethodRefAssignment() {
+        int[] array = { 10, 2, 19, 5, 17 };
+        Consumer<int[]> consumer = Arrays::sort;
+        consumer.accept(array);
+    }
+
+    void testConstructorMethodRefArgument() {
+        func(func(@CJ WeakReference::new));
+    }
+
+    void testConstructorMethodRefAssignment() {
+        ListGetter<String> listGetter = ArrayList::new;
+        listGetter.get();
+    }
+    void testMethodRefOnGenericTypeAssignment() {
+        Function<String, List<String>> fn = List::of;
+        List<String> list = fn.apply("test");
+    }
+
+    void testMethodRefOnGenericTypeArgument() {
+        Function<String, List<String>> fn = func(List::of);
+        List<String> list = fn.apply("test");
+    }
+
+    void testMethodRefImportedInJavadoc() {
+        Supplier<Map<String, String>> supplier = Collections::emptyMap;
+        Map<String, String> list = supplier.get();
+    }
+
+    void testMethodRefNotImported() {
+        Function<String, Integer> parseIntFunc = Integer::parseInt;
+        int number = parseIntFunc.apply("42");
+    }
+
+}
+
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CJ { }
+interface ListGetter<T> {
+    List<T> get();
+}
+
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefExtended.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefExtended.java
new file mode 100644
index 00000000000..20a6e6a23f9
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefExtended.java
@@ -0,0 +1,43 @@
+/*
+UnusedImports
+processJavadoc = (default)true
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
+
+import java.util.Optional;
+
+import java.util.function.Function;
+import java.util.List;
+import java.util.Arrays;
+import java.util.function.Predicate;
+
+import java.util.Objects; // violation 'Unused import - java.util.Objects.'
+import static java.util.Arrays.toString; // violation 'Unused import - java.util.Arrays.toString.'
+import static java.util.Arrays.asList; // violation 'Unused import - java.util.Arrays.asList.'
+import static java.lang.Integer.parseInt; // violation 'Unused import - java.lang.Integer.parseInt.'
+import static java.util.Collections.emptyList; // violation 'Unused import - java.util.Collections.emptyList.'
+
+public class InputUnusedImportsFromStaticMethodRefExtended {
+
+    private Function<int[], String> arrayToString = Arrays::toString;
+    Function<String, Integer> parseIntFunc = Integer::parseInt;
+    private final Predicate<List> isListEmpty = List::isEmpty;
+
+
+    InputUnusedImportsFromStaticMethodRefExtended() {
+    }
+
+    void testMethodRefWithQualifiedName()
+    {
+        Optional<String> test = Optional.empty();
+        test.map(java.util.Objects::nonNull);
+    }
+
+    void testMethodRefWithGenericType()
+    {
+        Function<String[],List<String>> listGetter = Arrays::<String>asList;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefInDocsOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefInDocsOnly.java
new file mode 100644
index 00000000000..97a779b20da
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefInDocsOnly.java
@@ -0,0 +1,41 @@
+/*
+UnusedImports
+processJavadoc = (default)true
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
+
+import java.util.Collections;
+import java.util.Arrays;
+import java.lang.Integer; // violation 'Unused import - java.lang.Integer'
+import static java.util.Collections.emptyEnumeration; // violation 'Unused import - java.util.Collections.emptyEnumeration.'
+import static java.util.Arrays.sort; // violation 'Unused import - java.util.Arrays.sort.'
+import static java.util.Collections.shuffle; // violation 'Unused import - java.util.Collections.shuffle.'
+
+public class InputUnusedImportsFromStaticMethodRefInDocsOnly {
+
+    /**
+     * This {@link Collections::emptyEnumeration} is not a valid link
+     * and this check does not count this as a usage.
+     * @see Collections#emptyEnumeration
+     * @throws IllegalAccessError::new
+     */
+    public static void m() {}
+
+    /**
+     * This {@link Collections#shuffle} is a valid link
+     * and the check counts this as a usage.
+     * @see Arrays#sort
+     * @throws IllegalAccessError::new
+     */
+    public static void n() {}
+
+    /**
+     * This  {@link Integer::parseInt} is not a valid link
+     * and this check does not count this as a usage.
+     * @throws IllegalAccessError::new
+     */
+    public static void l() {}
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefJavadocDisabled.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefJavadocDisabled.java
new file mode 100644
index 00000000000..0e2325e23b4
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsFromStaticMethodRefJavadocDisabled.java
@@ -0,0 +1,86 @@
+/*
+UnusedImports
+processJavadoc = false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
+
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Optional;
+import java.util.Objects;
+import java.util.List;
+import java.util.Map;
+import java.util.Collections;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.Arrays; // violation 'Unused import - java.util.Arrays.'
+import static java.lang.Integer.parseInt; // violation 'Unused import - java.lang.Integer.'
+import static java.lang.String.format; // violation 'Unused import - java.lang.String.format.'
+import static java.util.List.of; // violation 'Unused import - java.util.List.of.'
+import static java.util.Collections.emptyMap; // violation 'Unused import - java.util.Collections.emptyMap.'
+
+/**
+ * This {@link Arrays::sort} is NOT a valid link,
+ * same as the one below.
+ * Use {@link Integer::parseInt}.
+ */
+public class InputUnusedImportsFromStaticMethodRefJavadocDisabled {
+
+    public static <T, R> Function<T, R> func(Function<T, R> f) { return f; }
+
+    InputUnusedImportsFromStaticMethodRefJavadocDisabled() {
+    }
+
+    void testMethodRef()
+    {
+        Optional<String> test = Optional.empty();
+        test.map(String::format);
+    }
+
+    void testMethodRefWithClass()
+    {
+        Optional<String> test = Optional.empty();
+        test.map(Objects::nonNull);
+    }
+    void testConstructorMethodRefArgument()
+    {
+        func(func(@CJ2 WeakReference::new));
+    }
+
+    void testConstructorMethodRefAssignment()
+    {
+        ListGetter2<String> listGetter = ArrayList::new;
+        listGetter.get();
+    }
+    void testMethodRefOnGenericTypeAssignment()
+    {
+        Function<String, List<String>> fn = List::of;
+        List<String> list = fn.apply("test");
+    }
+
+    void testMethodRefOnGenericTypeArgument()
+    {
+        Function<String, List<String>> fn = func(List::of);
+        List<String> list = fn.apply("test");
+    }
+    void testMethodRefImportedInJavadoc()
+    {
+        Supplier<Map<String, String>> supplier = Collections::emptyMap;
+        Map<String, String> list = supplier.get();
+    }
+
+}
+
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CJ2 { }
+
+interface ListGetter2<T> {
+    List<T> get();
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsJavadocQualifiedName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsJavadocQualifiedName.java
index a28ded96027..4d104c3f779 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsJavadocQualifiedName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsJavadocQualifiedName.java
@@ -7,7 +7,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
-import java.util.Map; // ok
+import java.util.Map;
 import java.util.List; // violation
 
 /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsShadowed.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsShadowed.java
index 32f71c81bd3..52c4dbd205b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsShadowed.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsShadowed.java
@@ -7,18 +7,18 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
-import java.util.AbstractMap; // ok
-import java.util.List; // ok
+import java.util.AbstractMap;
+import java.util.List;
 import java.util.Map; // violation
 import java.util.Set; // violation
-import java.util.concurrent.Callable; // ok
+import java.util.concurrent.Callable;
 
 import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed; // violation
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Deprecated; // ok
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Foo; // ok
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Inner; // ok
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Nested; // ok
-import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Nested.List.Map.Entry; // ok
+import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Deprecated;
+import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Foo;
+import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Inner;
+import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Nested;
+import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsShadowed.Nested.List.Map.Entry;
 
 @Deprecated(foo = Foo.class, classes = {Inner.class})
 public class InputUnusedImportsShadowed
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithBlockMethodParameters.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithBlockMethodParameters.java
index 914207ddce4..ac837a926b5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithBlockMethodParameters.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithBlockMethodParameters.java
@@ -11,7 +11,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-public class InputUnusedImportsWithBlockMethodParameters { // ok
+public class InputUnusedImportsWithBlockMethodParameters {
 
 /**
  * @see ExecutorService#invokeAll(Collection, long, TimeUnit)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithNewlinesInsideTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithNewlinesInsideTags.java
index 9facfd18a59..fef6c8ed683 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithNewlinesInsideTags.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithNewlinesInsideTags.java
@@ -10,7 +10,7 @@
 import java.net.ResponseCache;
 import java.util.List;
 
-public class InputUnusedImportsWithNewlinesInsideTags { // ok
+public class InputUnusedImportsWithNewlinesInsideTags {
 
     /**
      * This javadoc demonstrates issue #2840.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithValueTag.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithValueTag.java
index c93f49ff6d4..604b53572e0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithValueTag.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithValueTag.java
@@ -9,7 +9,7 @@
 
 import java.util.Calendar;
 
-public class InputUnusedImportsWithValueTag { // ok
+public class InputUnusedImportsWithValueTag {
 
     /**
      * Method determines current month as for {@value Calendar#MONTH}.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithoutWarnings.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithoutWarnings.java
index 938189b1e5d..80f5ae006f8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithoutWarnings.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImportsWithoutWarnings.java
@@ -10,6 +10,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class InputUnusedImportsWithoutWarnings { // ok
+public class InputUnusedImportsWithoutWarnings {
     private static final List<String> CONSTANTS = Arrays.asList("a", "b");
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlock.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlock.java
deleted file mode 100644
index f273aaf7b19..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlock.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
-CommentsIndentation
-tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
-
-
-
-
-/**
- * Contains examples of using comments at the end of the block.
- */
-public class InputCommentsIndentationCommentIsAtTheEndOfBlock {
-
-    public void foo1() {
-        foo2();
-        // OOOO: missing functionality
-    }
-
-    public void foo2() {
-        foo3();
-                         // violation '.* incorrect .* level 25, expected is 8,.*same.*as line 24.'
-    }
-
-    public void foo3() {
-        foo2();
-        // refreshDisplay();
-    }
-
-    public void foo4() {
-        foooooooooooooooooooooooooooooooooooooooooo();
-        // ^-- some hint
-    }
-
-    public void foooooooooooooooooooooooooooooooooooooooooo() { }
-    // violation below '.* incorrect .* level 5, expected is 4, .* same .* as line 42.'
-     /////////////////////////////// (a single-line border to separate a group of methods)
-
-    public void foo7() {
-        int a = 0;
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 43.'
-    }
-
-    /////////////////////////////// (a single-line border to separate a group of methods)
-
-    public void foo8() {}
-
-    public class TestClass {
-        public void test() {
-            int a = 0;
-               // violation '.* incorrect .* level 15, expected is 12, .* same .* as line 53.'
-        }
-          // violation '.* incorrect .* level 10, expected is 8, .* same .* as line 52.'
-    }
-
-    public void foo9() {
-        this.foo1();
-             // violation '.* incorrect .* level 13, expected is 8, .* same .* as line 60.'
-    }
-
-    //    public void foo10() {
-    //
-    //    }
-
-    public void foo11() {
-        String
-            .valueOf(new Integer(0))
-            .trim()
-            .length();
-        // comment
-    }
-
-    public void foo12() {
-        String
-            .valueOf(new Integer(0))
-            .trim()
-            .length();
-                  // violation '.* incorrect .* level 18, expected is 8, .* same .* as line 77.'
-    }
-
-    public void foo13() {
-        String.valueOf(new Integer(0))
-                .trim()
-                .length();
-        // comment
-    }
-
-    public void foo14() {
-        String.valueOf(new Integer(0))
-            .trim()
-            .length();
-                               // violation '.* incorrect .* level 31, expected is 8,.*as line 92.'
-    }
-
-    public void foo15() {
-        String
-              .valueOf(new Integer(0));
-        // comment
-    }
-
-    public void foo16() {
-        String
-            .valueOf(new Integer(0));
-                     // violation '.* incorrect .* level 21, expected is 8,.* same .* as line 105.'
-    }
-
-    public void foo17() {
-        String
-            .valueOf(new Integer(0))
-            .trim()
-            // comment
-            .length();
-    }
-
-    public void foo18() {
-        String
-            .valueOf(new Integer(0))
-            .trim()
-                             // violation '.* incorrect .* level 29, expected is 12,.*as line 123.'
-            .length();
-    }
-
-    public void foo19() {
-        (new Thread(new Runnable() {
-            @Override
-            public void run() {
-
-            }
-        })).
-            run();
-        // comment
-    }
-
-    public void foo20() {
-        (new Thread(new Runnable() {
-            @Override
-            public void run() {
-
-            }
-        })).
-            run();
-                          // violation '.* incorrect .* level 26, expected is 8, .* as line 138.'
-    }
-
-    public void foo21() {
-        int[] array = new int[5];
-
-        java.util.List<String> expected = new java.util.ArrayList<>();
-        for (int i = 0; i < 5; i++) {
-        org.junit.Assert.assertEquals(expected.get(i), array[i]);
-        }
-        String s = String.format(java.util.Locale.ENGLISH, "The array element "
-               + "immediately following the end of the collection should be nulled",
-            array[1]);
-        // the above example was taken from hibernate-orm and was modified a bit
-    }
-
-    public void foo22() {
-        int[] array = new int[5];
-
-        java.util.List<String> expected = new java.util.ArrayList<>();
-        for (int i = 0; i < 5; i++) {
-            org.junit.Assert.assertEquals(expected.get(i), array[i]);
-        }
-        String s = String.format(java.util.Locale.ENGLISH, "The array element "
-                + "immediately following the end of the collection should be nulled",
-            array[1]);
-                                 // violation '.*incorrect.*level 33, expected is 8,.*as line 168.'
-    }
-
-    public void foo23() {
-        new Object();
-        // comment
-    }
-
-    public void foo24() {
-        new Object();
-                     // violation '.* incorrect .* level 21, expected is 8,.* same .* as line 180.'
-    }
-
-    public String foo25() {
-        return String.format(java.util.Locale.ENGLISH, "%d",
-            1);
-        // comment
-    }
-
-    public String foo26() {
-        return String.format(java.util.Locale.ENGLISH, "%d",
-            1);
-                                  // violation '.*incorrect.*level 34, expected is 8,.*as line 191.'
-    }
-
-    public void foo27() {
-        // comment
-        // block
-        foo17();
-
-        // OOOO
-    }
-
-    public String foo28() {
-        int a = 5;
-        return String.format(java.util.Locale.ENGLISH, "%d",
-            1);
-        // comment
-    }
-
-    public String foo29() {
-        int a = 5;
-        return String.format(java.util.Locale.ENGLISH, "%d",
-            1);
-                          // violation '.* incorrect .* level 26, expected is 8, .* as line 213.'
-    }
-
-    public void foo30() {
-        // comment
-        int a = 5;
-//        violation '.* incorrect .* level 0, expected is 8, .* same .* as line 220.'
-    }
-
-    public void foo31() {
-        String s = new String ("A"
-            + "B"
-            + "C");
-        // comment
-    }
-
-    public void foo32() {
-        String s = new String ("A"
-            + "B"
-            + "C");
-            // violation '.* incorrect .* level 12, expected is 8, .* same .* as line 232.'
-    }
-
-    public void foo33() {
-        // comment
-        this.foo22();
-//        violation '.* incorrect .* level 0, expected is 8, .* same .* as line 240.'
-    }
-
-    public void foo34() throws Exception {
-        throw new Exception("",
-            new Exception()
-            );
-        // comment
-    }
-
-    public void foo35() throws Exception {
-        throw new Exception("",
-            new Exception()
-        );
-            // violation '.* incorrect .* level 12, expected is 8, .* same .* as line 252.'
-    }
-
-    public void foo36() throws Exception {
-        throw new Exception("",
-            new Exception()
-        );
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 259.'
-    }
-
-    public void foo37() throws Exception {
-        throw new Exception("", new Exception());
-        // comment
-    }
-
-    public void foo38() throws Exception {
-        throw new Exception("", new Exception());
-              // violation '.* incorrect .* level 14, expected is 8, .* same .* as line 271.'
-    }
-
-    public void foo39() throws Exception {
-        throw new Exception("",
-            new Exception());
-         // violation '.* incorrect .* level 9, expected is 8, .* same .* as line 276.'
-    }
-
-    public void foo40() throws Exception {
-        int a = 88;
-        throw new Exception("", new Exception());
-         // violation '.* incorrect .* level 9, expected is 8, .* same .* as line 283.'
-    }
-
-    public void foo41() throws Exception {
-        int a = 88;
-        throw new Exception("", new Exception());
-        // comment
-    }
-
-    public void foo42() {
-        int a = 5;
-        if (a == 5) {
-            int b;
-            // comment
-        } else if (a ==6) {
-
-        }
-    }
-
-    public void foo43() {
-        try {
-            int a;
-            // comment
-        } catch (Exception e) {
-
-        }
-    }
-
-    public void foo44() {
-        int ar = 5;
-        // comment
-        ar = 6;
-        // comment
-    }
-
-    public void foo45() {
-        int ar = 5;
-        // comment
-        ar = 6;
-         // violation '.* incorrect .* level 9, expected is 8, .* same .* as line 322.'
-    }
-
-    public void foo46() {
-// comment
-// block
-// violation '.* incorrect .* level 0, expected is 4, .* same .* as line 330.'
-    }
-
-    public void foo47() {
-        int a = 5;
-        // comment
-        // block
-        // comment
-    }
-
-    public void foo48() {
-        int a = 5;
-// comment
-// block
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 340.'
-    }
-
-    public void foo49() {
-       // comment
-       // block
-       // ok
-    }
-
-    public void foo50() {
-        return;
-
-        // No NPE here!
-    }
-
-    public String foo51() {
-        return String
-            .valueOf("11"
-            );
-         // violation '.* incorrect .* level 9, expected is 8, .* same .* as line 359.'
-    }
-
-    public String foo52() {
-        return String
-            .valueOf("11"
-            );
-        // comment
-    }
-
-    void foo53() {
-        // comment
-        new Object()
-            .toString();
-        // comment
-    }
-
-    void foo54() {
-        /* comment */
-        new Object()
-            .toString();
-        // comment
-    }
-
-    void foo55() {
-        // violation below '.* incorrect .* level 12, expected is 8, .* same .* as line 389.'
-            /* violation */
-        new Object()
-            .toString();
-            // violation '.* incorrect .* level 12, expected is 8, .* same .* as line 389.'
-    }
-
-    void foo56() {
-        new Object().toString();
-        // comment
-    }
-
-    void foo57() {
-        new Object().toString();
-            // violation '.* incorrect .* level 12, expected is 8, .* same .* as line 400.'
-    }
-
-    void foo58() {
-        /*
-           comment
-           */
-        // violation '.* incorrect .* level 8, expected is 10, .* same .* as line 409.'
-          foo1();
-          // comment
-    }
-
-    void foo59() {
-        foo1();
-        /*
-         comment */
-        // comment
-    }
-
-
-    void foo61() {
-        foo1();
-        /*
-         * comment
-         */
-        /*
-         * comment
-         */
-    }
-
-    void foo62() {
-        if (true) {
-            String.CASE_INSENSITIVE_ORDER.equals("");
-          }
-        else {
-
-          }
-        /*
-         comment
-         */
-        /*
-         comment
-         */
-    }
-
-    void foo63() {
-        try {
-            String.CASE_INSENSITIVE_ORDER.equals("");
-          }
-        catch (Exception e){
-
-          }
-
-        /*
-         comment
-         */
-        /*
-         comment
-         */
-    }
-
-    void foo64()  {
-        foo1();
-
-//  violation '.* incorrect .* level 0, expected is 8, .* same .* as line 463.'
-    }
-
-    void foo65() {
-        int i = 1
-            + 1
-            + 1;
-        // comment
-        // comment
-    }
-
-    void foo66()  {
-        if (true) {
-            getClass();
-        }
-        // violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 477.'
-          /* violation */
-    }
-
-    void foo67()  {
-        try {
-            getClass();
-        } finally {
-            hashCode();
-        }
-        // violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 485.'
-          /* violation */
-    }
-
-    void foo68()  {
-        for (int i = 0; i < 0; i++) {
-            getClass();
-        }
-        // violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 495.'
-          /* violation */
-    }
-
-    void foo69()  {
-        while (true) {
-            getClass();
-        }
-        // violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 503.'
-          /* violation */
-    }
-
-    void foo70()  {
-        do {
-            getClass();
-        } while (true);
-        // violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 511.'
-          /* violation */
-    }
-
-    void foo71() {
-        switch("") {
-            case "!":
-                break;
-            default:
-                break;
-        }
-
-          // violation '.* incorrect .* level 10, expected is 8, .* same .* as line 519.'
-    }
-
-    void foo72() {
-        int u = 1;
-
-/* comment */
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 530.'
-    }
-
-    void foo73() {
-        class Foo { }
-
-/* comment */
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 537.'
-    }
-
-    interface Bar1 {
-        interface NestedBar { }
-
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 544.'
-    }
-
-    static class Bar2 {
-        enum Foo {
-            A;
-        }
-
-    // violation '.* incorrect .* level 4, expected is 8, .* same .* as line 550.'
-    }
-
-    static class Bar3 {
-        @interface Foo { }
-            // violation '.* incorrect .* level 12, expected is 8, .* same .* as line 558.'
-    }
-
-    void foo74() {
-        getClass(); // comment
-// comment
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 563.'
-    }
-
-    void foo75() {
-        getClass();
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 569.'
-        // comment
-    }
-
-    void InputCommentsIndentationCommentIsAtTheEndOfBlock(String s) {
-        assert(s == null ||
-                s != null);
-         // comment
-         //comment
-    }
-
-    int foo76() {
-        return 0;
-        /* test
-* test */
-//         violation '.* incorrect .* level 0, expected is 8, .* same .* as line 582.'
-    }
-
-    void foo77() {
-        try {
-        /* CHECKSTYLE:OFF */} catch(Exception e) {
-        }
-    }
-    void foo78() {
-        /* violation */
-        new Object()
-            .toString();
-            // violation '.* incorrect .* level 12, expected is 8, .* same .* as line 595.'
-    }
-    void foo79() {
-        /* violation */
-        /* violation */new Object().toString();
-        // ok
-    }
-
-    // We almost reached the end of the class here.
-}
-// The END of the class.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockFive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockFive.java
new file mode 100644
index 00000000000..7764bdbc6a3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockFive.java
@@ -0,0 +1,114 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+
+
+
+
+/**
+ * Contains examples of using comments at the end of the block.
+ */
+public class InputCommentsIndentationCommentIsAtTheEndOfBlockFive {
+
+    void foo61() {
+        new InputCommentsIndentationCommentIsAtTheEndOfBlockOne().foo1();
+
+        /*
+         * comment
+         */
+        /*
+         * comment
+         */
+    }
+    void foo62() {
+        if (true) {
+            String.CASE_INSENSITIVE_ORDER.equals("");
+        }
+        else {
+
+        }
+        /*
+         comment
+         */
+        /*
+         comment
+         */
+    }
+    void foo63() {
+        try {
+            String.CASE_INSENSITIVE_ORDER.equals("");
+        }
+        catch (Exception e){
+
+        }
+
+        /*
+         comment
+         */
+        /*
+         comment
+         */
+    }
+
+    void foo64()  {
+        new InputCommentsIndentationCommentIsAtTheEndOfBlockOne().foo1();
+
+//  violation '.* incorrect .* level 0, expected is 8, .* same .* as line 59.'
+    }
+
+    void foo65() {
+        int i = 1
+                + 1
+                + 1;
+        // comment
+        // comment
+    }
+
+    void foo66()  {
+        if (true) {
+            getClass();
+        }
+        //violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 73.'
+          /* violation */
+    }
+
+    void foo67()  {
+        try {
+            getClass();
+        } finally {
+            hashCode();
+        }
+        //violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 81.'
+          /* violation */
+    }
+
+    void foo68()  {
+        for (int i = 0; i < 0; i++) {
+            getClass();
+        }
+        //violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 91.'
+          /* violation */
+    }
+
+    void foo69()  {
+        while (true) {
+            getClass();
+        }
+        //violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 99.'
+          /* violation */
+    }
+
+    void foo70()  {
+        do {
+            getClass();
+        } while (true);
+        //violation below '.* incorrect .* level 10, expected is 8, .* same .* as line 107.'
+          /* violation */
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockFour.java
new file mode 100644
index 00000000000..4ac4933deef
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockFour.java
@@ -0,0 +1,119 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+
+
+
+
+/**
+ * Contains examples of using comments at the end of the block.
+ */
+public class InputCommentsIndentationCommentIsAtTheEndOfBlockFour {
+
+    public void foo45() {
+        int ar = 5;
+        // comment
+        ar = 6;
+         //violation '.* incorrect .* level 9, expected is 8, .* same .* as line 21.'
+    }
+
+    public void foo46() {
+// comment
+// block
+// violation '.* incorrect .* level 0, expected is 4, .* same .* as line 29.'
+    }
+
+    public void foo47() {
+        int a = 5;
+        // comment
+        // block
+        // comment
+    }
+    public void foo48() {
+        int a = 5;
+// comment
+// block
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 38.'
+    }
+
+    public void foo49() {
+        // comment
+        // block
+
+    }
+
+    public void foo50() {
+        return;
+
+        // No NPE here!
+    }
+
+    public String foo51() {
+        return String
+                .valueOf("11"
+                );
+         //violation '.* incorrect .* level 9, expected is 8, .* same .* as line 57.'
+    }
+
+    public String foo52() {
+        return String
+                .valueOf("11"
+                );
+        // comment
+    }
+
+    void foo53() {
+        // comment
+        new Object()
+                .toString();
+        // comment
+    }
+
+    void foo54() {
+        /* comment */
+        new Object()
+                .toString();
+        // comment
+    }
+
+    void foo55() {
+        //violation below '.* incorrect .* level 12, expected is 8, .* same .* as line 87.'
+            /* violation */
+        new Object()
+            .toString();
+            //violation '.* incorrect .* level 12, expected is 8, .* same .* as line 87.'
+    }
+
+    void foo56() {
+        new Object().toString();
+        // comment
+    }
+
+    void foo57() {
+        new Object().toString();
+            //violation '.* incorrect .* level 12, expected is 8, .* same .* as line 98.'
+    }
+
+    void foo58() {
+        /*
+           comment
+           */
+        //violation '.* incorrect .* level 8, expected is 10, .* same .* as line 109.'
+
+
+          new InputCommentsIndentationCommentIsAtTheEndOfBlockOne().foo1();
+          //comment
+    }
+
+    void foo59() {
+        new InputCommentsIndentationCommentIsAtTheEndOfBlockOne().foo1();
+        /*
+         comment */
+        // comment
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockOne.java
new file mode 100644
index 00000000000..0174e5e9cc3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockOne.java
@@ -0,0 +1,117 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+
+
+
+/**
+ * Contains examples of using comments at the end of the block.
+ */
+public class InputCommentsIndentationCommentIsAtTheEndOfBlockOne {
+
+    public void foo1() {
+        foo2();
+        // OOOO: missing functionality
+    }
+
+    public void foo2() {
+        foo3();
+                         //violation '.* incorrect .* level 25, expected is 8,.*same.*as line 24.'
+    }
+
+    public void foo3() {
+        foo2();
+        // refreshDisplay();
+    }
+
+    public void foo4() {
+        foooooooooooooooooooooooooooooooooooooooooo();
+        // ^-- some hint
+    }
+
+    public void foooooooooooooooooooooooooooooooooooooooooo() { }
+     // violation below '.* incorrect .* level 5, expected is 4, .* same .* as line 42.'
+     /////////////////////////////// (a single-line border to separate a group of methods)
+
+    public void foo7() {
+        int a = 0;
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 43.'
+    }
+
+    /////////////////////////////// (a single-line border to separate a group of methods)
+
+    public void foo8() {}
+
+    public class TestClass {
+        public void test() {
+            int a = 0;
+               //violation '.* incorrect .* level 15, expected is 12, .* same .* as line 53.'
+        }
+          //violation '.* incorrect .* level 10, expected is 8, .* same .* as line 52.'
+    }
+
+    public void foo9() {
+        this.foo1();
+             //violation '.* incorrect .* level 13, expected is 8, .* same .* as line 60.'
+    }
+
+    //    public void foo10() {
+    //
+    //    }
+
+    public void foo11() {
+        String
+                .valueOf(new Integer(0))
+                .trim()
+                .length();
+        // comment
+    }
+
+    public void foo12() {
+        String
+            .valueOf(new Integer(0))
+            .trim()
+            .length();
+                  //violation '.* incorrect .* level 18, expected is 8, .* same .* as line 77.'
+    }
+
+    public void foo13() {
+        String.valueOf(new Integer(0))
+                .trim()
+                .length();
+        // comment
+    }
+
+    public void foo14() {
+        String.valueOf(new Integer(0))
+                .trim()
+                .length();
+                               //violation '.* incorrect .* level 31, expected is 8,.*as line 92.'
+    }
+
+    public void foo15() {
+        String
+                .valueOf(new Integer(0));
+        // comment
+    }
+
+    public void foo16() {
+        String
+            .valueOf(new Integer(0));
+                     //violation '.* incorrect .* level 21, expected is 8,.* same .* as line 105.'
+    }
+
+    public void foo17() {
+        String
+                .valueOf(new Integer(0))
+                .trim()
+                // comment
+                .length();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockSix.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockSix.java
new file mode 100644
index 00000000000..91d50af0c40
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockSix.java
@@ -0,0 +1,103 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+
+
+
+
+/**
+ * Contains examples of using comments at the end of the block.
+ */
+public class InputCommentsIndentationCommentIsAtTheEndOfBlockSix {
+
+    void foo71() {
+        switch("") {
+            case "!":
+                break;
+            default:
+                break;
+        }
+
+          //violation '.* incorrect .* level 10, expected is 8, .* same .* as line 19.'
+    }
+
+    void foo72() {
+        int u = 1;
+
+        /* comment */
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 30.'
+    }
+    void foo73() {
+        class Foo { }
+
+        /* comment */
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 36.'
+    }
+
+    interface Bar1 {
+        interface NestedBar { }
+
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 43.'
+    }
+    static class Bar2 {
+        enum Foo {
+            A;
+        }
+
+    //violation '.* incorrect .* level 4, expected is 8, .* same .* as line 48.'
+    }
+    static class Bar3 {
+        @interface Foo { }
+            // violation '.* incorrect .* level 12, expected is 8, .* same .* as line 55.'
+    }
+
+    void foo74() {
+        getClass(); // comment
+// comment
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 60.'
+    }
+
+    void foo75() {
+        getClass();
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 66.'
+        // comment
+    }
+
+    void InputCommentsIndentationCommentIsAtTheEndOfBlock(String s) {
+        assert(s == null ||
+                s != null);
+        // comment
+        //comment
+    }
+
+    int foo76() {
+        return 0;
+        /* test
+         * test */
+//         violation '.* incorrect .* level 0, expected is 8, .* same .* as line 79.'
+    }
+
+    void foo77() {
+        try {
+            /* CHECKSTYLE:OFF */} catch(Exception e) {
+        }
+    }
+    void foo78() {
+        /* violation */
+        new Object()
+                .toString();
+            //violation '.* incorrect .* level 12, expected is 8, .* same .* as line 92.'
+    }
+    void foo79() {
+        /* violation */
+        /* violation */new Object().toString();
+
+    }
+
+    // We almost reached the end of the class here.
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockThree.java
new file mode 100644
index 00000000000..cd36e681aa3
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockThree.java
@@ -0,0 +1,119 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+
+
+
+
+/**
+ * Contains examples of using comments at the end of the block.
+ */
+public class InputCommentsIndentationCommentIsAtTheEndOfBlockThree {
+
+    public void foo30() {
+        // comment
+        int a = 5;
+//violation '.* incorrect .* level 0, expected is 8, .* same .* as line 20.'
+    }
+
+    public void foo31() {
+        String s = new String ("A"
+                + "B"
+                + "C");
+        // comment
+    }
+
+    public void foo32() {
+        String s = new String ("A"
+            + "B"
+            + "C");
+            //violation '.* incorrect .* level 12, expected is 8, .* same .* as line 32.'
+    }
+
+    public void foo33() {
+        // comment
+        new InputCommentsIndentationCommentIsAtTheEndOfBlockTwo().foo22();
+
+//        violation '.* incorrect .* level 0, expected is 8, .* same .* as line 40.'
+    }
+
+    public void foo34() throws Exception {
+        throw new Exception("",
+                new Exception()
+        );
+        // comment
+    }
+
+    public void foo35() throws Exception {
+        throw new Exception("",
+                new Exception()
+        );
+            //violation '.* incorrect .* level 12, expected is 8, .* same .* as line 53.'
+    }
+
+    public void foo36() throws Exception {
+        throw new Exception("",
+                new Exception()
+        );
+//      violation '.* incorrect .* level 0, expected is 8, .* same .* as line 60.'
+    }
+
+    public void foo37() throws Exception {
+        throw new Exception("", new Exception());
+        // comment
+    }
+
+    public void foo38() throws Exception {
+        throw new Exception("", new Exception());
+              //violation '.* incorrect .* level 14, expected is 8, .* same .* as line 72.'
+    }
+
+    public void foo39() throws Exception {
+        throw new Exception("",
+                new Exception());
+         //violation '.* incorrect .* level 9, expected is 8, .* same .* as line 77.'
+    }
+
+    public void foo40() throws Exception {
+        int a = 88;
+        throw new Exception("", new Exception());
+         //violation '.* incorrect .* level 9, expected is 8, .* same .* as line 84.'
+    }
+
+    public void foo41() throws Exception {
+        int a = 88;
+        throw new Exception("", new Exception());
+        // comment
+    }
+
+    public void foo42() {
+        int a = 5;
+        if (a == 5) {
+            int b;
+            // comment
+        } else if (a ==6) {
+
+        }
+    }
+    public void foo43() {
+        try {
+            int a;
+            // comment
+        } catch (Exception e) {
+
+        }
+    }
+
+    public void foo44() {
+        int ar = 5;
+        // comment
+        ar = 6;
+        // comment
+    }
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockTwo.java
new file mode 100644
index 00000000000..f57b6ac244a
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationCommentIsAtTheEndOfBlockTwo.java
@@ -0,0 +1,119 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+
+
+
+/**
+ * Contains examples of using comments at the end of the block.
+ */
+public class InputCommentsIndentationCommentIsAtTheEndOfBlockTwo {
+
+    public void foo18() {
+        String
+            .valueOf(new Integer(0))
+            .trim()
+                             //violation '.* incorrect .* level 29, expected is 12,.*as line 23.'
+            .length();
+    }
+
+    public void foo19() {
+        (new Thread(new Runnable() {
+            @Override
+            public void run() {
+
+            }
+        })).
+                run();
+        // comment
+    }
+
+    public void foo20() {
+        (new Thread(new Runnable() {
+            @Override
+            public void run() {
+
+            }
+        })).
+            run();
+                          //violation '.* incorrect .* level 26, expected is 8, .* as line 38.'
+    }
+
+    public void foo21() {
+        int[] array = new int[5];
+
+        java.util.List<String> expected = new java.util.ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            org.junit.Assert.assertEquals(expected.get(i), array[i]);
+        }
+        String s = String.format(java.util.Locale.ENGLISH, "The array element "
+                        + "immediately following the end of the collection should be nulled",
+                array[1]);
+        // the above example was taken from hibernate-orm and was modified a bit
+    }
+
+    public void foo22() {
+        int[] array = new int[5];
+
+        java.util.List<String> expected = new java.util.ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            org.junit.Assert.assertEquals(expected.get(i), array[i]);
+        }
+        String s = String.format(java.util.Locale.ENGLISH, "The array element "
+                        + "immediately following the end of the collection should be nulled",
+                array[1]);
+                                 //violation '.*incorrect.*level 33, expected is 8,.*as line 68.'
+    }
+
+    public void foo23() {
+        new Object();
+        // comment
+    }
+
+    public void foo24() {
+        new Object();
+                     //violation '.* incorrect .* level 21, expected is 8,.* same .* as line 80.'
+    }
+
+    public String foo25() {
+        return String.format(java.util.Locale.ENGLISH, "%d",
+                1);
+        // comment
+    }
+
+    public String foo26() {
+        return String.format(java.util.Locale.ENGLISH, "%d",
+                1);
+                                  //violation '.*incorrect.*level 34, expected is 8,.*as line 91.'
+    }
+
+    public void foo27() {
+        // comment
+        // block
+        new InputCommentsIndentationCommentIsAtTheEndOfBlockOne().foo17();
+
+        // OOOO
+    }
+
+    public String foo28() {
+        int a = 5;
+        return String.format(java.util.Locale.ENGLISH, "%d",
+                1);
+        // comment
+    }
+
+    public String foo29() {
+        int a = 5;
+        return String.format(java.util.Locale.ENGLISH, "%d",
+            1);
+                          //violation '.* incorrect .* level 26, expected is 8, .* as line 113.'
+    }
+
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructures.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructures.java
deleted file mode 100644
index dfe854b4e8f..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructures.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-CommentsIndentation
-tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
-
-public class InputCommentsIndentationInMultiblockStructures {
-    void foo() {
-        if (true) {
-            assert true;
-        // comment for else
-        } else {}
-
-        if (true) {
-            assert true;
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 18.'
-        }
-        else {}
-
-        if (true) {
-            assert true;
-                // violation '.* incorrect .* level 16, expected is 12, 8,.*same .* as line 24, 26.'
-        } else {}
-
-        if (true) {
-            assert true;
-// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 29, 31.'
-        } else {}
-
-        try {
-            assert true;
-        // comment for catch
-        } catch (Exception ex) {}
-
-        try {
-            assert true;
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 39.'
-        }
-        catch (Exception ex) {}
-
-        try {
-            assert true;
-// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 45, 47.'
-        } catch (Exception ex) {}
-
-        try {
-            assert true;
-                // violation '.* incorrect .* level 16, expected is 12, 8,.* same.* as line 50, 52.'
-        } catch (Exception ex) {}
-
-        try {
-            assert true;
-        // comment for finally
-        } finally {}
-
-        try {
-            assert true;
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 60.'
-        }
-        finally {}
-
-        try {
-            assert true;
-// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 66, 68.'
-        } finally {}
-
-        try {
-            assert true;
-                // violation '.* incorrect .* level 16, expected is 12, 8,.* same.* as line 71, 73.'
-        } finally {}
-
-        try {} catch (Exception ex) {
-            assert true;
-        // comment for finally
-        } finally {}
-
-        try {} catch (Exception ex) {
-            assert true;
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 81.'
-        }
-        finally {}
-
-        try {} catch (Exception ex) {
-            assert true;
-// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 87, 89.'
-        } finally {}
-
-        try {} catch (Exception ex) {
-            assert true;
-                // violation '.* incorrect .* level 16, expected is 12, 8,.*same.* as line 92, 94.'
-        } finally {}
-
-        try {} catch (ClassCastException ex) {
-            assert true;
-        // comment for catch
-        } catch (Exception ex) {}
-
-        try {} catch (ClassCastException ex) {
-            assert true;
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 102.'
-        }
-        catch (Exception ex) {}
-
-        try {} catch (ClassCastException ex) {
-            assert true;
-// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 108, 110.'
-        } catch (Exception ex) {}
-
-        try {} catch (ClassCastException ex) {
-            assert true;
-                // violation '.* incorrect .* level 16, expected is 12, 8,.*same.*as line 113, 115.'
-        } catch (Exception ex) {}
-
-        do {
-            assert true;
-        // comment for while
-        } while (false);
-
-        do {
-            assert true;
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 123.'
-        }
-        while (false);
-
-        do {
-            assert true;
-                // violation '.* incorrect .* level 16, expected is 12, 8,.*same.*as line 129, 131.'
-        } while (false);
-
-        do {
-            assert true;
-// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 134, 136.'
-        } while (false);
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructuresOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructuresOne.java
new file mode 100644
index 00000000000..3ae24d12d2a
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructuresOne.java
@@ -0,0 +1,118 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+public class InputCommentsIndentationInMultiblockStructuresOne {
+    void foo() {
+        if (true) {
+            assert true;
+        // comment for else
+        } else {}
+
+        if (true) {
+            assert true;
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 18.'
+        }
+        else {}
+
+        if (true) {
+            assert true;
+                // violation '.* incorrect .* level 16, expected is 12, 8,.*same .* as line 24, 26.'
+        } else {}
+
+        if (true) {
+            assert true;
+// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 29, 31.'
+        } else {}
+
+        try {
+            assert true;
+        // comment for catch
+        } catch (Exception ex) {}
+
+        try {
+            assert true;
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 39.'
+        }
+        catch (Exception ex) {}
+
+        try {
+            assert true;
+// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 45, 47.'
+        } catch (Exception ex) {}
+
+        try {
+            assert true;
+                // violation '.* incorrect .* level 16, expected is 12, 8,.* same.* as line 50, 52.'
+        } catch (Exception ex) {}
+
+        try {
+            assert true;
+        // comment for finally
+        } finally {}
+
+        try {
+            assert true;
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 60.'
+        }
+        finally {}
+
+        try {
+            assert true;
+// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 66, 68.'
+        } finally {}
+
+        try {
+            assert true;
+                // violation '.* incorrect .* level 16, expected is 12, 8,.* same.* as line 71, 73.'
+        } finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+        // comment for finally
+        } finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 81.'
+        }
+        finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 87, 89.'
+        } finally {}
+
+        try {} catch (Exception ex) {
+            assert true;
+                // violation '.* incorrect .* level 16, expected is 12, 8,.*same.* as line 92, 94.'
+        } finally {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+        // comment for catch
+        } catch (Exception ex) {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 102.'
+        }
+        catch (Exception ex) {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 108, 110.'
+        } catch (Exception ex) {}
+
+        try {} catch (ClassCastException ex) {
+            assert true;
+                // violation '.* incorrect .* level 16, expected is 12, 8,.*same.*as line 113, 115.'
+        } catch (Exception ex) {}
+
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructuresTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructuresTwo.java
new file mode 100644
index 00000000000..c4429c2db85
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInMultiblockStructuresTwo.java
@@ -0,0 +1,34 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+public class InputCommentsIndentationInMultiblockStructuresTwo {
+    void foo() {
+
+        do {
+            assert true;
+        // comment for while
+        } while (false);
+
+        do {
+            assert true;
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 19.'
+        }
+        while (false);
+
+        do {
+            assert true;
+                // violation '.* incorrect .* level 16, expected is 12, 8,.*same.*as line 25, 27.'
+        } while (false);
+
+        do {
+            assert true;
+// violation '.* incorrect .* level 0, expected is 12, 8, .* same .* as line 30, 32.'
+        } while (false);
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlock.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlock.java
deleted file mode 100644
index 907c3f8d612..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlock.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
-CommentsIndentation
-tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
-
-public class InputCommentsIndentationInSwitchBlock {
-
-    private static void fooSwitch() {
-        switch("") {
-            case "0": //some comment
-            case "1":
-                // my comment
-                foo1();
-                break;
-            case "2":
-                // my comment
-                //comment
-                foo1();
-                // comment
-                break;
-            case "3":
-                // violation below '.* incorrect .* level 12, expected is 16,.* same.* as line 28.'
-            /* violation */
-                foo1();
-                /* com */
-                break;
-            case "5":
-                foo1();
-                   // violation '.* incorrect .* level 19, expected is 16, 12, .* as line 32, 34.'
-            case "6":
-                int k = 7;
-                // fall through
-            case "7":
-                if (true) {}
-                   // violation '.* incorrect .* level 19, expected is 16, 12, .* as line 38, 40.'
-            case "8":
-                break;
-            case "9":
-                foo1();
-                // fall through
-            case "10": {
-                if (true) {}
-                // fall through
-            }
-            case "11": {
-            // fall through
-            }
-            case "28": {
-                // fall through
-            }
-            case "12": {
-      // violation '.* incorrect .* level 6, expected is 16, .* same .* as line 57.'
-                int i;
-            }
-            case "13": {
-                       // some comment in empty case block
-            }
-            case "14": {
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 64.'
-            }
-            case "15": {
-                foo1();
-                      // violation '.* incorrect .* level 22, expected is 16,.* same.* as line 66.'
-            }
-            case "16": {
-                int a;
-            }
-            // fall through
-            case "17": {
-                int a;
-            }
-              // violation '.* incorrect .* level 14, expected is 12, 16,.* same.* as line 73, 77.'
-                case "18": { System.lineSeparator();
-                }   // trailing comment
-            case "19":
-                // comment
-            case "20":
-            // comment
-            case "21":
-            default:
-                // comment
-                break;
-        }
-    }
-
-    private static void foo1() {
-        if (true) {
-            switch(1) {
-                case 0:
-
-                case 1:
-                        // violation '.* incorrect .* level 24, expected is 20,.*same.* as line 97.'
-                    int b = 10;
-                default:
-                 // comment
-            }
-
-        }
-    }
-
-    public void fooDotInCaseBlock() {
-        int i = 0;
-        String s = "";
-
-        switch (i) {
-            case -2:
-                // what
-                i++;
-                // no break here
-            case 0:
-                // what
-                s.indexOf("ignore");
-                // no break here
-            case -1:
-                 // what
-                 s.indexOf("no way");
-               // violation '.* incorrect.*level 15, expected is 17, 12,.*same.* as line 120, 122.'
-            case 1:
-            case 2:
-                i--;
-                // no break here
-            case 3: { }
-            // fall through
-
-
-        }
-
-        String breaks = ""
-        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 134.'
-            + "</table>"
-            // middle
-            + ""
-        // end
-        ;
-    }
-
-    public void foo2() {
-        int a = 1;
-        switch (a) {
-            case 1:
-            default:
-    // violation '.* incorrect .* level 4, expected is 8, .* same .* as line 147.'
-        }
-    }
-
-    public void foo3() {
-        int a = 1;
-        switch (a) {
-            case 1:
-            default:
-
-                // comment
-        }
-    }
-
-    public void foo4() {
-        int a = 1;
-        switch (a) {
-            case 1:
-                int b;
-                  // violation '.* incorrect .* level 18, expected is 16, 12, .* as line 164, 166.'
-            default:
-        }
-    }
-
-    public void foo5() {
-        int a = 1;
-        switch (a) {
-            case 1:
-                int b;
-            // comment
-            default:
-        }
-    }
-
-    public void foo6() {
-        int a = 1;
-        switch (a) {
-            case 1:
-                int b;
-                // comment
-            default:
-        }
-    }
-
-    public void foo7() {
-        int a = 2;
-        String s = "";
-        switch (a) {
-            // comment
-            // comment
-            // comment
-            case 1:
-            case 2:
-                // comment
-                // comment
-                foo1();
-                // comment
-            case 3:
-                // comment
-                // comment
-                // comment
-            case 4:
-    // violation '.* incorrect .* level 4, expected is 12, 12, .* same .* as line 207, 209.'
-            case 5:
-                s.toString().toString().toString();
-                      // violation '.*incorrect.* level 22, expected is 16, 12,.*as line 210, 214.'
-                    // violation '.* incorrect .* level 20, expected is 16, 12,.*as line 210, 214.'
-                 // violation '.* incorrect .* level 17, expected is 16, 12, .* as line 210, 214.'
-            default:
-        }
-    }
-
-    public void foo8() {
-        int a = 2;
-        String s = "";
-        switch (a) {
-            // comment
-            // comment
-            // comment
-            case 1:
-            case 2:
-                // comment
-                // comment
-                foo1();
-                // comment
-            case 3:
-                // comment
-                // comment
-                s.toString().toString().toString();
-                // comment
-            case 4:
-      // violation '.* incorrect .* level 6, expected is 12, 12, .* same .* as line 236, 238.'
-            default:
-        }
-    }
-
-    public void foo9() {
-        int a = 5;
-        switch (a) {
-            case 1:
-            case 2:
-                // comment
-        }
-    }
-
-    public void foo10() {
-        int a = 5;
-        switch (a) {
-            case 1:
-            default:
-                // comment
-        }
-    }
-
-    public void foo11() {
-        int a = 5;
-        switch (a) {
-            case 1:
-            case 2:
-                // comment
-        }
-    }
-
-    public void foo12() {
-        int a = 5;
-        switch (a) {
-            // comment
-            case 1:
-        }
-    }
-
-    public void foo13() {
-        int a = 5;
-        switch (a) {
-            case 1:
-                /* comment */
-            case 2:
-                hashCode();
-           /* // violation '.* incorrect .* level 11, expected is 16, 12, .* as line 283, 287.'
-            violation
-            */
-            case 3: // comment
-                hashCode();
-           // violation '.* incorrect .* level 11, expected is 16, 12,.* same .* as line 288, 290.'
-            case 4: // comment
-                if (true) {
-
-                }
-                else {
-
-                }
-                // comment
-            case 5:
-                String s = ""
-                    + 1
-                    + "123";
-                break;
-                // comment
-            case 6:
-                String q = ""
-                    + 1
-                    + "123";
-                // comment
-            case 7:
-                break;
-        }
-    }
-
-    public void foo14() {
-        int a = 1;
-        switch (a) {
-            case 1:
-            default:
-// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 320.'
-        }
-    }
-
-    public void foo15() {
-        int a = 1;
-        switch (a) {
-            case 1:
-            default:
-        // comment
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockFour.java
new file mode 100644
index 00000000000..e1c23b495c0
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockFour.java
@@ -0,0 +1,81 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+public class InputCommentsIndentationInSwitchBlockFour {
+
+    private static void foo1() {
+        if (true) {
+            switch(1) {
+                case 0:
+
+                case 1:
+                        // violation '.* incorrect .* level 24, expected is 20,.*same.* as line 19.'
+                    int b = 10;
+                default:
+                 // comment
+            }
+
+        }
+    }
+
+    public void foo13() {
+        int a = 5;
+        switch (a) {
+            case 1:
+                /* comment */
+            case 2:
+                hashCode();
+           /* // violation '.* incorrect .* level 11, expected is 16, 12, .* as line 33, 37.'
+            violation
+            */
+            case 3: // comment
+                hashCode();
+           // violation '.* incorrect .* level 11, expected is 16, 12,.* same .* as line 38, 40.'
+            case 4: // comment
+                if (true) {
+
+                }
+                else {
+
+                }
+                // comment
+            case 5:
+                String s = ""
+                    + 1
+                    + "123";
+                break;
+                // comment
+            case 6:
+                String q = ""
+                    + 1
+                    + "123";
+                // comment
+            case 7:
+                break;
+        }
+    }
+
+    public void foo14() {
+        int a = 1;
+        switch (a) {
+            case 1:
+            default:
+// violation '.* incorrect .* level 0, expected is 8, .* same .* as line 70.'
+        }
+    }
+
+    public void foo15() {
+        int a = 1;
+        switch (a) {
+            case 1:
+            default:
+        // comment
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockOne.java
new file mode 100644
index 00000000000..ac6e667e218
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockOne.java
@@ -0,0 +1,104 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+public class InputCommentsIndentationInSwitchBlockOne {
+
+    private static void fooSwitch() {
+        switch("") {
+            case "0": //some comment
+            case "1":
+                // my comment
+                foo1();
+                break;
+            case "2":
+                // my comment
+                //comment
+                foo1();
+                // comment
+                break;
+            case "3":
+                // violation below '.* incorrect .* level 12, expected is 16,.* same.* as line 28.'
+            /* violation */
+                foo1();
+                /* com */
+                break;
+            case "5":
+                foo1();
+                   // violation '.* incorrect .* level 19, expected is 16, 12, .* as line 32, 34.'
+            case "6":
+                int k = 7;
+                // fall through
+            case "7":
+                if (true) {}
+                   // violation '.* incorrect .* level 19, expected is 16, 12, .* as line 38, 40.'
+            case "8":
+                break;
+            case "9":
+                foo1();
+                // fall through
+            case "10": {
+                if (true) {}
+                // fall through
+            }
+            case "11": {
+            // fall through
+            }
+            case "28": {
+                // fall through
+            }
+            case "12": {
+      // violation '.* incorrect .* level 6, expected is 16, .* same .* as line 57.'
+                int i;
+            }
+            case "13": {
+                       // some comment in empty case block
+            }
+            case "14": {
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 64.'
+            }
+            case "15": {
+                foo1();
+                      // violation '.* incorrect .* level 22, expected is 16,.* same.* as line 66.'
+            }
+            case "16": {
+                int a;
+            }
+            // fall through
+            case "17": {
+                int a;
+            }
+              // violation '.* incorrect .* level 14, expected is 12, 16,.* same.* as line 73, 77.'
+                case "18": { System.lineSeparator();
+                }   // trailing comment
+            case "19":
+                // comment
+            case "20":
+            // comment
+            case "21":
+            default:
+                // comment
+                break;
+        }
+    }
+
+    private static void foo1() {
+        if (true) {
+            switch(1) {
+                case 0:
+
+                case 1:
+                        // violation '.* incorrect .* level 24, expected is 20,.*same.* as line 97.'
+                    int b = 10;
+                default:
+                 // comment
+            }
+
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockThree.java
new file mode 100644
index 00000000000..c90105b024b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockThree.java
@@ -0,0 +1,113 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+public class InputCommentsIndentationInSwitchBlockThree {
+
+    private static void foo1() {
+        if (true) {
+            switch(1) {
+                case 0:
+
+                case 1:
+                        // violation '.* incorrect .* level 24, expected is 20,.*same.* as line 19.'
+                    int b = 10;
+                default:
+                 // comment
+            }
+
+        }
+    }
+
+    public void foo7() {
+        int a = 2;
+        String s = "";
+        switch (a) {
+            // comment
+            // comment
+            // comment
+            case 1:
+            case 2:
+                // comment
+                // comment
+                foo1();
+                // comment
+            case 3:
+                // comment
+                // comment
+                // comment
+            case 4:
+    // violation '.* incorrect .* level 4, expected is 12, 12, .* same .* as line 44, 46.'
+            case 5:
+                s.toString().toString().toString();
+                      // violation '.*incorrect.* level 22, expected is 16, 12,.*as line 47, 51.'
+                    // violation '.* incorrect .* level 20, expected is 16, 12,.*as line 47, 51.'
+                 // violation '.* incorrect .* level 17, expected is 16, 12, .* as line 47, 51.'
+            default:
+        }
+    }
+
+    public void foo8() {
+        int a = 2;
+        String s = "";
+        switch (a) {
+            // comment
+            // comment
+            // comment
+            case 1:
+            case 2:
+                // comment
+                // comment
+                foo1();
+                // comment
+            case 3:
+                // comment
+                // comment
+                s.toString().toString().toString();
+                // comment
+            case 4:
+      // violation '.* incorrect .* level 6, expected is 12, 12, .* same .* as line 73, 75.'
+            default:
+        }
+    }
+
+    public void foo9() {
+        int a = 5;
+        switch (a) {
+            case 1:
+            case 2:
+                // comment
+        }
+    }
+
+    public void foo10() {
+        int a = 5;
+        switch (a) {
+            case 1:
+            default:
+                // comment
+        }
+    }
+
+    public void foo11() {
+        int a = 5;
+        switch (a) {
+            case 1:
+            case 2:
+                // comment
+        }
+    }
+
+    public void foo12() {
+        int a = 5;
+        switch (a) {
+            // comment
+            case 1:
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockTwo.java
new file mode 100644
index 00000000000..af8fa76f54c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationInSwitchBlockTwo.java
@@ -0,0 +1,111 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+public class InputCommentsIndentationInSwitchBlockTwo {
+
+    private static void foo1() {
+        if (true) {
+            switch(1) {
+                case 0:
+
+                case 1:
+                        // violation '.* incorrect .* level 24, expected is 20,.*same.* as line 19.'
+                    int b = 10;
+                default:
+                 // comment
+            }
+
+        }
+    }
+
+    public void fooDotInCaseBlock() {
+        int i = 0;
+        String s = "";
+
+        switch (i) {
+            case -2:
+                // what
+                i++;
+                // no break here
+            case 0:
+                // what
+                s.indexOf("ignore");
+                // no break here
+            case -1:
+                 // what
+                 s.indexOf("no way");
+               // violation '.* incorrect.*level 15, expected is 17, 12,.*same.* as line 42, 44.'
+            case 1:
+            case 2:
+                i--;
+                // no break here
+            case 3: { }
+            // fall through
+
+
+        }
+
+        String breaks = ""
+        // violation '.* incorrect .* level 8, expected is 12, .* same .* as line 56.'
+            + "</table>"
+            // middle
+            + ""
+        // end
+        ;
+    }
+
+    public void foo2() {
+        int a = 1;
+        switch (a) {
+            case 1:
+            default:
+    // violation '.* incorrect .* level 4, expected is 8, .* same .* as line 69.'
+        }
+    }
+
+    public void foo3() {
+        int a = 1;
+        switch (a) {
+            case 1:
+            default:
+
+                // comment
+        }
+    }
+
+    public void foo4() {
+        int a = 1;
+        switch (a) {
+            case 1:
+                int b;
+                  // violation '.* incorrect .* level 18, expected is 16, 12, .* as line 86, 88.'
+            default:
+        }
+    }
+
+    public void foo5() {
+        int a = 1;
+        switch (a) {
+            case 1:
+                int b;
+            // comment
+            default:
+        }
+    }
+
+    public void foo6() {
+        int a = 1;
+        switch (a) {
+            case 1:
+                int b;
+                // comment
+            default:
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationNoNpe.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationNoNpe.java
index 2c7de65b98e..73f1bd48042 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationNoNpe.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationNoNpe.java
@@ -17,7 +17,7 @@
  * Provides convenience methods such as {@link #isPublic} and {@link #isPackagePrivate}.
  *
  */
-class InputCommentsIndentationNoNpe { // ok
+class InputCommentsIndentationNoNpe {
 
 }
 /* The Check should not throw NPE here! */
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode.java
deleted file mode 100644
index 54b69bdd3ae..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-CommentsIndentation
-tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
-
-
-*/
-
-// comment
-package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
-
-import java.util.*;
-
-// some
-public class InputCommentsIndentationSurroundingCode
-{
-    private void foo1() {
-        if (true) {
-            // here initialize some variables
-            int k = 0; // trailing comment
-              // violation '.* incorrect .* level 14, expected is 12, .* same .* as line 21.'
-            int b = 10;
-            // sss
-        }
-    }
-
-    private void foo2() {
-        if (true) {
-            /* some */
-            int k = 0;
-            // violation below '.* incorrect .* level 16, expected is 12, .* same .* as line 32.'
-                /* some comment */
-            int b = 10;
-                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 35.'
-                 * */
-            double d; /* trailing comment */
-                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 39.'
-             *
-                */
-            boolean bb;
-            /***/
-            /* my comment*/
-            /*
-             *
-             *
-             *  some
-             */
-            /*
-             * comment
-             */
-            boolean x;
-        }
-    }
-
-    private void foo3() {
-        int a = 5, b = 3, v = 6;
-        if (a == b
-            && v == b || ( a ==1
-                           /// violation '.* incorrect .* level 27, expected is 36, .* as line 61.'
-                       /* // violation '.* incorrect .* level 23, expected is 36, .* as line 61.'
-                        * one fine day ... */
-                                    && b == 1)   ) {
-        }
-    }
-
-    private static void com() {
-        /* here's my weird trailing comment */ boolean b = true;
-    }
-
-    private static final String[][] mergeMatrix = {
-        // This example of trailing block comments was found in PMD sources.
-        /* TOP */{ "", },
-        /* ALWAYS */{ "", "", },
-       /* NEVER */{ "NEVER", "UNKNOWN", "NEVER", },
-       /* UNKNOWN */{ "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN" }, };
-
-    private void foo4() {
-        if (!Arrays.equals(new String[]{""}, new String[]{""})
-              /* wierd trailing comment */) {
-        }
-    }
-    /**
-     * some javadoc
-     */
-    private static void l() {
-    }
-
-    public void foid5() {
-        String s = "";
-        s.toString().toString().toString();
-        // comment
-    }
-
-    public void foo6() {
-              // comment
-              // ...
-              // block
-              // ...
-              // violation '.* incorrect .* level 14, expected is 8, .* same .* as line 99.'
-        String someStr = new String();
-    }
-
-    public void foo7() {
-             // comment
-             // ...
-             // block
-             // violation '.* incorrect .* level 13, expected is 8, .* same .* as line 108.'
-        // comment
-        String someStr = new String();
-    }
-
-    public void foo8() {
-        String s = new String(); // comment
-                                 // ...
-                                 // block
-                                 // ...
-                                 // violation '.* incorrect.*level 33, expected is 8,.*as line 117.'
-        String someStr = new String();
-    }
-
-
-    public String foo9(String s1, String s2, String s3) {
-        return "";
-    }
-
-    public void foo10()
-        throws Exception {
-
-        final String pattern = "^foo$";
-
-        final String[] expected = {
-            "7:13: " + foo9("", "", ""),
-            // comment
-        };
-    }
-
-    public void foo11() {
-        // violation below '.* incorrect .* level 12, expected is 8, .* same .* as line 139.'
-            /* empty */
-        hashCode();
-    }
-
-    public void foo12() {
-        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 145.'
-    /* empty */
-        hashCode();
-    }
-
-    public void foo13() {
-        hashCode();
-        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 149.'
-    /* empty */
-    }
-
-    public void foo14() {
-        hashCode();
-        /*
-
-        Test
-        */
-        // Test
-    }
-
-    public InputCommentsIndentationSurroundingCode() {
-    }
-
-    // Test
-} // The Check should not throw NPE here!
-// The Check should not throw NPE here!
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2.java
deleted file mode 100644
index 7c3eb624ae4..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-CommentsIndentation
-tokens = SINGLE_LINE_COMMENT
-
-
-*/
-
-// comment
-package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
-
-import java.util.Arrays;
-
-// some
-public class InputCommentsIndentationSurroundingCode2
-{
-    private void foo1() {
-        if (true) {
-            // here initialize some variables
-            int k = 0; // trailing comment
-              // violation '.* incorrect .* level 14, expected is 12, .* same .* as line 21.'
-            int b = 10;
-            // sss
-        }
-    }
-
-    private void foo2() {
-        if (true) {
-            /* some */
-            int k = 0;
-                /* violation */
-            int b = 10;
-                /* violation
-                 * */
-            double d; /* trailing comment */
-                /* violation
-             *
-                */
-            boolean bb;
-            /***/
-            /* my comment*/
-            /*
-             *
-             *
-             *  some
-             */
-            /*
-             * comment
-             */
-            boolean x;
-        }
-    }
-
-    private void foo3() {
-        int a = 5, b = 3, v = 6;
-        if (a == b
-            && v == b || ( a ==1
-                           /// violation '.* incorrect .* level 27, expected is 36, .* as line 60.'
-                       /* violation
-                        * one fine day ... */
-                                    && b == 1)   ) {
-        }
-    }
-
-    private static void com() {
-        /* here's my weird trailing comment */ boolean b = true;
-    }
-
-    private static final String[][] mergeMatrix = {
-        // This example of trailing block comments was found in PMD sources.
-        /* TOP */{ "", },
-        /* ALWAYS */{ "", "", },
-       /* NEVER */{ "NEVER", "UNKNOWN", "NEVER", },
-       /* UNKNOWN */{ "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN" }, };
-
-    private void foo4() {
-        if (!Arrays.equals(new String[]{""}, new String[]{""})
-              /* wierd trailing comment */) {
-        }
-    }
-    /**
-     * some javadoc
-     */
-    private static void l() {
-    }
-
-    public void foid5() {
-        String s = "";
-        s.toString().toString().toString();
-        // comment
-    }
-
-    public void foo6() {
-              // comment
-              // ...
-              // block
-              // ...
-              // violation '.* incorrect .* level 14, expected is 8, .* same .* as line 98.'
-        String someStr = new String();
-    }
-
-    public void foo7() {
-             // comment
-             // ...
-             // block
-             // violation '.* incorrect .* level 13, expected is 8, .* same .* as line 107.'
-        // comment
-        String someStr = new String();
-    }
-
-    public void foo8() {
-        String s = new String(); // comment
-                                 // ...
-                                 // block
-                                 // ...
-                                 // violation '.*incorrect.*level 33, expected is 8,.*as line 116.'
-        String someStr = new String();
-    }
-
-
-    public String foo9(String s1, String s2, String s3) {
-        return "";
-    }
-
-    public void foo10()
-        throws Exception {
-
-        final String pattern = "^foo$";
-
-        final String[] expected = {
-            "7:13: " + foo9("", "", ""),
-            // comment
-        };
-    }
-
-    public void foo11() {
-
-            /* empty */
-        hashCode();
-    }
-
-    public void foo12() {
-    /* empty */
-        hashCode();
-    }
-
-    public void foo13() {
-        hashCode();
-    /* empty */
-    }
-
-    public void foo14() {
-        hashCode();
-        /*
-
-        Test
-        */
-        // Test
-    }
-
-    public InputCommentsIndentationSurroundingCode2() {
-    }
-
-    // Test
-} // The Check should not throw NPE here!
-// The Check should not throw NPE here!
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2One.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2One.java
new file mode 100644
index 00000000000..614c936a62b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2One.java
@@ -0,0 +1,119 @@
+/*
+CommentsIndentation
+tokens = SINGLE_LINE_COMMENT
+
+
+*/
+
+// comment
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+import java.util.Arrays;
+
+// some
+public class InputCommentsIndentationSurroundingCode2One
+{
+    private void foo1() {
+        if (true) {
+            // here initialize some variables
+            int k = 0; // trailing comment
+              // violation '.* incorrect .* level 14, expected is 12, .* same .* as line 21.'
+            int b = 10;
+            // sss
+        }
+    }
+
+    private void foo2() {
+        if (true) {
+            /* some */
+            int k = 0;
+                /* violation */
+            int b = 10;
+                /* violation
+                 * */
+            double d; /* trailing comment */
+                /* violation
+             *
+                */
+            boolean bb;
+            /***/
+            /* my comment*/
+            /*
+             *
+             *
+             *  some
+             */
+            /*
+             * comment
+             */
+            boolean x;
+        }
+    }
+
+    private void foo3() {
+        int a = 5, b = 3, v = 6;
+        if (a == b
+            && v == b || ( a ==1
+                           /// violation '.* incorrect .* level 27, expected is 36, .* as line 60.'
+                       /* violation
+                        * one fine day ... */
+                                    && b == 1)   ) {
+        }
+    }
+
+    private static void com() {
+        /* here's my weird trailing comment */ boolean b = true;
+    }
+
+    private static final String[][] mergeMatrix = {
+        // This example of trailing block comments was found in PMD sources.
+        /* TOP */{ "", },
+        /* ALWAYS */{ "", "", },
+       /* NEVER */{ "NEVER", "UNKNOWN", "NEVER", },
+       /* UNKNOWN */{ "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN" }, };
+
+    private void foo4() {
+        if (!Arrays.equals(new String[]{""}, new String[]{""})
+              /* wierd trailing comment */) {
+        }
+    }
+    /**
+     * some javadoc
+     */
+    private static void l() {
+    }
+
+    public void foid5() {
+        String s = "";
+        s.toString().toString().toString();
+        // comment
+    }
+
+    public void foo6() {
+              // comment
+              // ...
+              // block
+              // ...
+              // violation '.* incorrect .* level 14, expected is 8, .* same .* as line 98.'
+        String someStr = new String();
+    }
+
+    public void foo7() {
+             // comment
+             // ...
+             // block
+             // violation '.* incorrect .* level 13, expected is 8, .* same .* as line 107.'
+        // comment
+        String someStr = new String();
+    }
+
+    public void foo8() {
+        String s = new String(); // comment
+                                 // ...
+                                 // block
+                                 // ...
+                                 // violation '.*incorrect.*level 33, expected is 8,.*as line 116.'
+        String someStr = new String();
+    }
+    // Test
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2Two.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2Two.java
new file mode 100644
index 00000000000..e49be86ffac
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode2Two.java
@@ -0,0 +1,53 @@
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+import java.util.Arrays;
+
+// some
+
+public class InputCommentsIndentationSurroundingCode2Two {
+
+
+    public String foo9(String s1, String s2, String s3) {
+        return "";
+    }
+
+    public void foo10()
+            throws Exception {
+
+        final String pattern = "^foo$";
+
+        final String[] expected = {
+                "7:13: " + foo9("", "", ""),
+                // comment
+        };
+    }
+
+    public void foo11() {
+
+        /* empty */
+        hashCode();
+    }
+
+    public void foo12() {
+        /* empty */
+        hashCode();
+    }
+
+    public void foo13() {
+        hashCode();
+        /* empty */
+    }
+
+    public void foo14() {
+        hashCode();
+        /*
+
+        Test
+        */
+        // Test
+    }
+
+    public InputCommentsIndentationSurroundingCode2Two() {
+    }
+}// The Check should not throw NPE here!
+// The Check should not throw NPE here!
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3.java
deleted file mode 100644
index 5003589110a..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-CommentsIndentation
-tokens = BLOCK_COMMENT_BEGIN
-
-
-*/
-
-// comment
-package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
-
-import java.util.Arrays;
-
-// some
-public class InputCommentsIndentationSurroundingCode3
-{
-    private void foo1() {
-        if (true) {
-            // here initialize some variables
-            int k = 0; // trailing comment
-            int b = 10;
-            // sss
-        }
-    }
-
-    private void foo2() {
-        if (true) {
-            /* some */
-            int k = 0;
-            // violation below '.* incorrect .* level 16, expected is 12, .* same .* as line 31.'
-                /* some comment */
-            int b = 10;
-                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 34.'
-                 * */
-            double d; /* trailing comment */
-                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 38.'
-             *
-                */
-            boolean bb;
-            /***/
-            /* my comment*/
-            /*
-             *
-             *
-             *  some
-             */
-            /*
-             * comment
-             */
-            boolean x;
-        }
-    }
-
-    private void foo3() {
-        int a = 5, b = 3, v = 6;
-        if (a == b
-            && v == b || ( a ==1
-                       /* // violation '.* incorrect .* level 23, expected is 36, .* as line 59.'
-                        * one fine day ... */
-                                    && b == 1)   ) {
-        }
-    }
-
-    private static void com() {
-        /* here's my weird trailing comment */ boolean b = true;
-    }
-
-    private static final String[][] mergeMatrix = {
-        // This example of trailing block comments was found in PMD sources.
-        /* TOP */{ "", },
-        /* ALWAYS */{ "", "", },
-       /* NEVER */{ "NEVER", "UNKNOWN", "NEVER", },
-       /* UNKNOWN */{ "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN" }, };
-
-    private void foo4() {
-        if (!Arrays.equals(new String[]{""}, new String[]{""})
-              /* wierd trailing comment */) {
-        }
-    }
-    /**
-     * some javadoc
-     */
-    private static void l() {
-    }
-
-    public void foid5() {
-        String s = "";
-        s.toString().toString().toString();
-        // comment
-    }
-
-    public void foo6() {
-              // comment
-              // ...
-              // block
-              // ...
-        String someStr = new String();
-    }
-
-    public void foo7() {
-             // comment
-             // ...
-             // block
-        // comment
-        String someStr = new String();
-    }
-
-    public void foo8() {
-        String s = new String(); // comment
-                                 // ...
-                                 // block
-                                 // ...
-        String someStr = new String();
-    }
-
-
-    public String foo9(String s1, String s2, String s3) {
-        return "";
-    }
-
-    public void foo10()
-        throws Exception {
-
-        final String pattern = "^foo$";
-
-        final String[] expected = {
-            "7:13: " + foo9("", "", ""),
-            // comment
-        };
-    }
-
-    public void foo11() {
-        // violation below '.* incorrect .* level 12, expected is 8, .* same .* as line 134.'
-            /* some comment */
-        hashCode();
-    }
-
-    public void foo12() {
-        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 140.'
-    /* some comment */
-        hashCode();
-    }
-
-    public void foo13() {
-        hashCode();
-        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 144.'
-    /* some comment */
-    }
-
-    public void foo14() {
-        hashCode();
-        /*
-
-        Test
-        */
-        // Test
-    }
-
-    public InputCommentsIndentationSurroundingCode3() {
-    }
-
-    // Test
-} // The Check should not throw NPE here!
-// The Check should not throw NPE here!
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3One.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3One.java
new file mode 100644
index 00000000000..9d9346ddceb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3One.java
@@ -0,0 +1,107 @@
+/*
+CommentsIndentation
+tokens = BLOCK_COMMENT_BEGIN
+
+
+*/
+
+// comment
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+import java.util.Arrays;
+
+// some
+public class InputCommentsIndentationSurroundingCode3One
+{
+    private void foo1() {
+        if (true) {
+            // here initialize some variables
+            int k = 0; // trailing comment
+            int b = 10;
+            // sss
+        }
+    }
+
+    private void foo2() {
+        if (true) {
+            /* some */
+            int k = 0;
+            // violation below '.* incorrect .* level 16, expected is 12, .* same .* as line 31.'
+                /* some comment */
+            int b = 10;
+                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 34.'
+                 * */
+            double d; /* trailing comment */
+                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 38.'
+             *
+                */
+            boolean bb;
+            /***/
+            /* my comment*/
+            /*
+             *
+             *
+             *  some
+             */
+            /*
+             * comment
+             */
+            boolean x;
+        }
+    }
+
+    private void foo3() {
+        int a = 5, b = 3, v = 6;
+        if (a == b
+            && v == b || ( a ==1
+                       /* // violation '.* incorrect .* level 23, expected is 36, .* as line 59.'
+                        * one fine day ... */
+                                    && b == 1)   ) {
+        }
+    }
+
+    private static void com() {
+        /* here's my weird trailing comment */ boolean b = true;
+    }
+
+    private static final String[][] mergeMatrix = {
+        // This example of trailing block comments was found in PMD sources.
+        /* TOP */{ "", },
+        /* ALWAYS */{ "", "", },
+       /* NEVER */{ "NEVER", "UNKNOWN", "NEVER", },
+       /* UNKNOWN */{ "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN" }, };
+
+    private void foo4() {
+        if (!Arrays.equals(new String[]{""}, new String[]{""})
+              /* wierd trailing comment */) {
+        }
+    }
+    /**
+     * some javadoc
+     */
+    private static void l() {
+    }
+
+    public void foid5() {
+        String s = "";
+        s.toString().toString().toString();
+        // comment
+    }
+
+    public void foo6() {
+              // comment
+              // ...
+              // block
+              // ...
+        String someStr = new String();
+    }
+
+    public void foo7() {
+             // comment
+             // ...
+             // block
+        // comment
+        String someStr = new String();
+    }
+    // Test
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3Two.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3Two.java
new file mode 100644
index 00000000000..0ec96dc6f8c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCode3Two.java
@@ -0,0 +1,68 @@
+/*
+CommentsIndentation
+tokens = BLOCK_COMMENT_BEGIN
+
+
+*/
+
+// comment
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+// some
+public class InputCommentsIndentationSurroundingCode3Two {
+
+    public void foo8() {
+        String s = new String(); // comment
+        // ...
+        // block
+        // ...
+        String someStr = new String();
+    }
+
+
+    public String foo9(String s1, String s2, String s3) {
+        return "";
+    }
+
+    public void foo10()
+            throws Exception {
+
+        final String pattern = "^foo$";
+
+        final String[] expected = {
+                "7:13: " + foo9("", "", ""),
+                // comment
+        };
+    }
+
+    public void foo11() {
+        // violation below '.* incorrect .* level 12, expected is 8, .* same .* as line 41.'
+            /* some comment */
+        hashCode();
+    }
+
+    public void foo12() {
+        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 47.'
+    /* some comment */
+        hashCode();
+    }
+
+    public void foo13() {
+        hashCode();
+        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 51.'
+    /* some comment */
+    }
+
+    public void foo14() {
+        hashCode();
+        /*
+
+        Test
+        */
+        // Test
+    }
+
+    public InputCommentsIndentationSurroundingCode3Two() {
+    }
+}// The Check should not throw NPE here!
+// The Check should not throw NPE here!
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCodeOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCodeOne.java
new file mode 100644
index 00000000000..ab044fe471b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCodeOne.java
@@ -0,0 +1,110 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+// comment
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+import java.util.*;
+
+// some
+public class InputCommentsIndentationSurroundingCodeOne
+{
+    private void foo1() {
+        if (true) {
+            // here initialize some variables
+            int k = 0; // trailing comment
+              // violation '.* incorrect .* level 14, expected is 12, .* same .* as line 21.'
+            int b = 10;
+            // sss
+        }
+    }
+
+    private void foo2() {
+        if (true) {
+            /* some */
+            int k = 0;
+            // violation below '.* incorrect .* level 16, expected is 12, .* same .* as line 32.'
+                /* some comment */
+            int b = 10;
+                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 35.'
+                 * */
+            double d; /* trailing comment */
+                /* // violation '.* incorrect .* level 16, expected is 12, .* same .* as line 39.'
+             *
+                */
+            boolean bb;
+            /***/
+            /* my comment*/
+            /*
+             *
+             *
+             *  some
+             */
+            /*
+             * comment
+             */
+            boolean x;
+        }
+    }
+
+    private void foo3() {
+        int a = 5, b = 3, v = 6;
+        if (a == b
+            && v == b || ( a ==1
+                           /// violation '.* incorrect .* level 27, expected is 36, .* as line 61.'
+                       /* // violation '.* incorrect .* level 23, expected is 36, .* as line 61.'
+                        * one fine day ... */
+                                    && b == 1)   ) {
+        }
+    }
+
+    private static void com() {
+        /* here's my weird trailing comment */ boolean b = true;
+    }
+
+    private static final String[][] mergeMatrix = {
+        // This example of trailing block comments was found in PMD sources.
+        /* TOP */{ "", },
+        /* ALWAYS */{ "", "", },
+       /* NEVER */{ "NEVER", "UNKNOWN", "NEVER", },
+       /* UNKNOWN */{ "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN" }, };
+
+    private void foo4() {
+        if (!Arrays.equals(new String[]{""}, new String[]{""})
+              /* wierd trailing comment */) {
+        }
+    }
+    /**
+     * some javadoc
+     */
+    private static void l() {
+    }
+
+    public void foid5() {
+        String s = "";
+        s.toString().toString().toString();
+        // comment
+    }
+
+    public void foo6() {
+              // comment
+              // ...
+              // block
+              // ...
+              // violation '.* incorrect .* level 14, expected is 8, .* same .* as line 99.'
+        String someStr = new String();
+    }
+
+    public void foo7() {
+             // comment
+             // ...
+             // block
+             // violation '.* incorrect .* level 13, expected is 8, .* same .* as line 108.'
+        // comment
+        String someStr = new String();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCodeTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCodeTwo.java
new file mode 100644
index 00000000000..1f7bdf600b4
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/commentsindentation/InputCommentsIndentationSurroundingCodeTwo.java
@@ -0,0 +1,72 @@
+/*
+CommentsIndentation
+tokens = (default)SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN
+
+
+*/
+
+// comment
+package com.puppycrawl.tools.checkstyle.checks.indentation.commentsindentation;
+
+// some
+
+public class InputCommentsIndentationSurroundingCodeTwo {
+
+    public void foo8() {
+        String s = new String(); // comment
+                                 // ...
+                                 // block
+                                 // ...
+                                 // violation '.* incorrect.*level 33, expected is 8,.*as line 21.'
+        String someStr = new String();
+    }
+
+
+    public String foo9(String s1, String s2, String s3) {
+        return "";
+    }
+
+    public void foo10()
+            throws Exception {
+
+        final String pattern = "^foo$";
+
+        final String[] expected = {
+                "7:13: " + foo9("", "", ""),
+                // comment
+        };
+    }
+
+    public void foo11() {
+        // violation below '.* incorrect .* level 12, expected is 8, .* same .* as line 43.'
+            /* empty */
+        hashCode();
+    }
+
+    public void foo12() {
+        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 49.'
+    /* empty */
+        hashCode();
+    }
+
+    public void foo13() {
+        hashCode();
+        // violation below '.* incorrect .* level 4, expected is 8, .* same .* as line 53.'
+    /* empty */
+    }
+
+    public void foo14() {
+        hashCode();
+        /*
+
+        Test
+        */
+        // Test
+    }
+
+    public InputCommentsIndentationSurroundingCodeTwo() {
+    }
+
+    // Test
+}// The Check should not throw NPE here!
+// The Check should not throw NPE here!
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationAnonymousClassInMethodCurlyOnNewLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationAnonymousClassInMethodCurlyOnNewLine.java
index 142be19d25f..101d67af877 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationAnonymousClassInMethodCurlyOnNewLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationAnonymousClassInMethodCurlyOnNewLine.java
@@ -1,7 +1,5 @@
 package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0
 
-import com.puppycrawl.tools.checkstyle.checks.indentation.AbstractExpressionHandler; //indent:0 exp:0
-
 import java.util.List; //indent:0 exp:0
 import java.util.Map; //indent:0 exp:0
 import java.util.function.Supplier; //indent:0 exp:0
@@ -22,53 +20,53 @@ public class InputIndentationAnonymousClassInMethodCurlyOnNewLine //indent:0 exp
 { //indent:0 exp:0
     private void aMethod() //indent:4 exp:4
     { //indent:4 exp:4
-        final Supplier<Map<String, List<AbstractExpressionHandler>>> sup1 = //indent:8 exp:8
-                new Supplier<Map<String, List<AbstractExpressionHandler>>>() { //indent:16 exp:>=16
+        final Supplier<Map<String, List<String>>> sup1 = //indent:8 exp:8
+                new Supplier<Map<String, List<String>>>() { //indent:16 exp:>=16
                     @Override //indent:20 exp:20
-                    public Map<String, List<AbstractExpressionHandler>> get() //indent:20 exp:20
+                    public Map<String, List<String>> get() //indent:20 exp:20
                     { //indent:20 exp:20
                         return null; //indent:24 exp:24
                     } //indent:20 exp:20
                 }; //indent:16 exp:16
-        final Supplier<Map<String, List<AbstractExpressionHandler>>> sup2 = //indent:8 exp:8
-                  new Supplier<Map<String, List<AbstractExpressionHandler>>>(){ //indent:18 exp:>=16
+        final Supplier<Map<String, List<String>>> sup2 = //indent:8 exp:8
+                  new Supplier<Map<String, List<String>>>(){ //indent:18 exp:>=16
                     @Override //indent:20 exp:20
-                    public Map<String, List<AbstractExpressionHandler>> get() //indent:20 exp:20
+                    public Map<String, List<String>> get() //indent:20 exp:20
                     { //indent:20 exp:20
                         return null; //indent:24 exp:24
                     } //indent:20 exp:20
                   }; //indent:18 exp:16,20,24 warn
-        final Supplier<Map<String, List<AbstractExpressionHandler>>> sup3 = //indent:8 exp:8
-              new Supplier<Map<String,List<AbstractExpressionHandler>>>(){ //indent:14 exp:>=16 warn
+        final Supplier<Map<String, List<String>>> sup3 = //indent:8 exp:8
+              new Supplier<Map<String,List<String>>>(){ //indent:14 exp:>=16 warn
                     @Override //indent:20 exp:20
-                    public Map<String, List<AbstractExpressionHandler>> get() //indent:20 exp:20
+                    public Map<String, List<String>> get() //indent:20 exp:20
                     { //indent:20 exp:20
                         return null; //indent:24 exp:24
                     } //indent:20 exp:20
               }; //indent:14 exp:16,20,24 warn
-        final Supplier<Map<String, List<AbstractExpressionHandler>>> sup4 = //indent:8 exp:8
-                new Supplier<Map<String, List<AbstractExpressionHandler>>>() //indent:16 exp:>=16
+        final Supplier<Map<String, List<String>>> sup4 = //indent:8 exp:8
+                new Supplier<Map<String, List<String>>>() //indent:16 exp:>=16
                 { //indent:16 exp:16
                     @Override //indent:20 exp:20
-                    public Map<String, List<AbstractExpressionHandler>> get() //indent:20 exp:20
+                    public Map<String, List<String>> get() //indent:20 exp:20
                     { //indent:20 exp:20
                         return null; //indent:24 exp:24
                     } //indent:20 exp:20
                 }; //indent:16 exp:16
-        final Supplier<Map<String, List<AbstractExpressionHandler>>> sup5 = //indent:8 exp:8
-                new Supplier<Map<String, List<AbstractExpressionHandler>>>() //indent:16 exp:>=16
+        final Supplier<Map<String, List<String>>> sup5 = //indent:8 exp:8
+                new Supplier<Map<String, List<String>>>() //indent:16 exp:>=16
                   { //indent:18 exp:16,20,24 warn
                       @Override //indent:22 exp:22
-                      public Map<String, List<AbstractExpressionHandler>> get() //indent:22 exp:22
+                      public Map<String, List<String>> get() //indent:22 exp:22
                       { //indent:22 exp:22
                           return null; //indent:26 exp:26
                       } //indent:22 exp:22
                   }; //indent:18 exp:16,20,24 warn
-        final Supplier<Map<String, List<AbstractExpressionHandler>>> sup6 = //indent:8 exp:8
-                new Supplier<Map<String, List<AbstractExpressionHandler>>>() //indent:16 exp:>=16
+        final Supplier<Map<String, List<String>>> sup6 = //indent:8 exp:8
+                new Supplier<Map<String, List<String>>>() //indent:16 exp:>=16
               { //indent:14 exp:16,20,24 warn
                   @Override //indent:18 exp:18
-                  public Map<String, List<AbstractExpressionHandler>> get() //indent:18 exp:18
+                  public Map<String, List<String>> get() //indent:18 exp:18
                   { //indent:18 exp:18
                       return null; //indent:22 exp:22
                   } //indent:18 exp:18
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java
index 3131f4f3a63..fa168bc41fa 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewHandler.java
@@ -20,4 +20,11 @@ public void test() { //indent:4 exp:4
         } catch (Exception e) { //indent:8 exp:8
         } //indent:8 exp:8
     } //indent:4 exp:4
+
+    int[][] array10b //indent:4 exp:4
+= new int[][] { //indent:0 exp:8 warn
+                  new int[] { 1, 2, 3}, //indent:18 exp:>=8
+                  new int[] { 1, 2, 3}, //indent:18 exp:>=8
+    }; //indent:4 exp:4
+
 } //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewWithForceStrictCondition.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewWithForceStrictCondition.java
index e180354376a..e27e3c66622 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewWithForceStrictCondition.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/indentation/InputIndentationNewWithForceStrictCondition.java
@@ -17,11 +17,71 @@
 import java.io.InputStreamReader; //indent:0 exp:0
 
 public class InputIndentationNewWithForceStrictCondition { //indent:0 exp:0
-    void test() throws IOException  { //indent:4 exp:4
+    private java.util.List < ? > [ //indent:4 exp:4
+           ] arrayOfLists; //indent:11 exp:12 warn
+    public Object[] //indent:4 exp:4
+            variable1; //indent:12 exp:12
+    int variable2 //indent:4 exp:4
+    []; //indent:4 exp:12 warn
+    int[] //indent:4 exp:4
+    		variable3; //indent:12 exp:12
+
+	void test() throws IOException  { //indent:4 exp:4
         BufferedReader bf =  //indent:8 exp:8
                 new BufferedReader(  //indent:16 exp:16
                 new InputStreamReader(System.in) {  //indent:16 exp:24 warn
                     int a = 0; //indent:20 exp:28,32,36 warn
                 }); //indent:16 exp:24,28,32 warn
+
+        String[] tmp1 = new String[42 //indent:8 exp:8
+                                   + bf.toString().length()]; //indent:35 exp:16 warn
+        String[] tmp2 = new String[42 //indent:8 exp:8
+                + bf.toString().length()]; //indent:16 exp:16
+        String[] tmp3 = new String[42 //indent:8 exp:8
+                                  ]; //indent:34 exp:16 warn
+        String[] tmp4 = new String[42 //indent:8 exp:8
+                ]; //indent:16 exp:16
+        String[] tmp5 = new String[ //indent:8 exp:8
+                                   42]; //indent:35 exp:16 warn
+        String[] tmp6 = new String[ //indent:8 exp:8
+                42]; //indent:16 exp:16
+        String[] tmp7 = new String[14 //indent:8 exp:8
+                                   + 14 //indent:35 exp:16 warn
+                                   + 14]; //indent:35 exp:16 warn
+        String[] tmp8 = new String[14 //indent:8 exp:8
+                + 14 //indent:16 exp:16
+                + 14]; //indent:16 exp:16
+        int[] tmp9 = fun2(1, 1, //indent:8 exp:8
+                    1); //indent:20 exp:16 warn
+        int[] tmp10 = fun2(2, 2, //indent:8 exp:8
+                2); //indent:16 exp:16
+        final int[] tmp11 = //indent:8 exp:8
+            fun2(3, 3, 3); //indent:12 exp:16 warn
+        final int[] tmp12 = //indent:8 exp:8
+                fun2(4, 4, 4); //indent:16 exp:16
+        int tmp13 = new String[42] //indent:8 exp:8
+                .length; //indent:16 exp:16
+    } //indent:4 exp:4
+
+    char[] bar(String a, String b) { //indent:4 exp:4
+        char[] array1 = a != null ? //indent:8 exp:8
+                a.toCharArray() : null; //indent:16 exp:16
+
+        char[] array2 = bar(b, //indent:8 exp:8
+                a); //indent:16 exp:16
+
+        return array1; //indent:8 exp:8
+    } //indent:4 exp:4
+
+    public void fun(String param1, //indent:4 exp:4
+    		String param2, //indent:12 exp:12
+          Object[] param3) { //indent:10 exp:12 warn
+    } //indent:4 exp:4
+
+    protected int[] arrayDeclarationWithGoodWrapping = new int[ //indent:4 exp:4
+               ] {1, 2}; //indent:15 exp:12 warn
+
+    public int[] fun2(int a, int b, int c) { //indent:4 exp:4
+        return new int[0]; //indent:8 exp:8
     } //indent:4 exp:4
 }  //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCache1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCache1.java
new file mode 100644
index 00000000000..91830e011a9
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCache1.java
@@ -0,0 +1,13 @@
+/*
+SummaryJavadoc
+violateExecutionOnNonTightHtml = (default)false
+forbiddenSummaryFragments = (default)^$
+period = (default).
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+// violation below 'First sentence of Javadoc is missing an ending period.'
+/**Javadoc*/
+class InputAbstractJavadocCache1{}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCache2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCache2.java
new file mode 100644
index 00000000000..29daacd0e78
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCache2.java
@@ -0,0 +1,13 @@
+/*
+SummaryJavadoc
+violateExecutionOnNonTightHtml = (default)false
+forbiddenSummaryFragments = (default)^$
+period = (default).
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**Javadoc.*/
+class InputAbstractJavadocCache2 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraph.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraph.java
deleted file mode 100644
index 616a3476f80..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraph.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck
-violateExecutionOnNonTightHtml = (default)false
-target = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, \
-         CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
-tagOrder = (default)@author, @deprecated, @exception, @param, @return, \
-           @see, @serial, @serialData, @serialField, @since, @throws, @version
-
-
-com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck
-violateExecutionOnNonTightHtml = (default)false
-allowNewlineParagraph = (default)true
-
-
-*/
-
-
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
-/**
- * Some Javadoc.
- *
- * <p>Some Javadoc.
- *
- */
-class InputAbstractJavadocCorrectParagraph {
-
-    /**
-     * Some Javadoc.
-     *
-     * <p>{@code function} will never be invoked with a null value.
-     *
-     * @since 8.0
-     */
-    public static final byte NUL = 0;
-
-    /**
-     * Some Javadoc.
-     *
-     * <p>Some Javadoc.
-     *
-     * <pre>
-     * class Foo {
-     *
-     *   void foo() {}
-     * }
-     * </pre>
-     *
-     * @see <a href="http://www.gwtproject.org/doc/latest/DevGuideOrganizingProjects.html#DevGuideModules">
-     *     Documentation about GWT emulated source</a>
-     */
-    boolean emulated() {return false;}
-
-    /**
-     * Some Javadoc.
-     *
-     *<pre>
-     * Test
-     * </pre>
-     *
-     * <pre>
-     * Test
-     * </pre>
-     */
-    boolean test() {return false;}
-
-    /**
-     * Some Javadoc.
-     *
-     * <p>Some Javadoc.
-     *
-     */
-     class InnerInputCorrectJavaDocParagraphCheck {
-
-        /**
-         * Some Javadoc.
-         *
-         * <p>Some Javadoc.
-         *
-         * <p>Some Javadoc.
-         *
-         * @since 8.0
-         */
-        public static final byte NUL = 0;
-
-        /**
-         * Some Javadoc.
-         *
-         * <p>Some Javadoc.
-         *
-         * @see <a href="http://www.gwtproject.org/doc/latest/DevGuideOrganizingProjects.html#DevGuideModules">
-         *     Documentation about GWT emulated source</a>
-         */
-        boolean emulated() {return false;}
-    }
-
-    InnerInputCorrectJavaDocParagraphCheck anon = new InnerInputCorrectJavaDocParagraphCheck() {
-
-        /**
-         * Some Javadoc.
-         *
-         * <p>Some Javadoc.
-         *
-         * <p>Some Javadoc.
-         *
-         * @since 8.0
-         */
-        public static final byte NUL = 0;
-
-        /**
-         * Some Javadoc with space at the end of first line.
-         *
-         * <p>Some Javadoc.
-         *
-         * <p>Some Javadoc.
-         *
-         * @see <a href="http://www.gwtproject.org/doc/latest/DevGuideOrganizingProjects.html#DevGuideModules">
-         *     Documentation about GWT emulated source</a>
-         */
-        boolean emulated() {return false;}
-    };
-}
-
-/*
- *  This comment has paragraph without '<p>' tag. // ok
- *
- *  It's fine, because this is plain comment.
- */
-class ClassWithPlainComment {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraphOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraphOne.java
new file mode 100644
index 00000000000..38384859641
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraphOne.java
@@ -0,0 +1,119 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck
+violateExecutionOnNonTightHtml = (default)false
+target = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, \
+         CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+tagOrder = (default)@author, @deprecated, @exception, @param, @return, \
+           @see, @serial, @serialData, @serialField, @since, @throws, @version
+
+com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck
+violateExecutionOnNonTightHtml = (default)false
+allowNewlineParagraph = (default)true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * Some Javadoc.
+ *
+ * <p>Some Javadoc.
+ *
+ */
+class InputAbstractJavadocCorrectParagraphOne {
+
+    /**
+     * Some Javadoc.
+     *
+     * <p>{@code function} will never be invoked with a null value.
+     *
+     * @since 8.0
+     */
+    public static final byte NUL = 0;
+
+    /**
+     * Some Javadoc.
+     *
+     * <p>Some Javadoc.
+     *
+     * <pre>
+     * class Foo {
+     *
+     *   void foo() {}
+     * }
+     * </pre>
+     *
+     * @see <a href="http://www.gwtproject.org/doc/latest/DevGuideOrganizingProjects.html#DevGuideModules">
+     *     Documentation about GWT emulated source</a>
+     */
+    boolean emulated() {return false;}
+
+    /**
+     * Some Javadoc.
+     *
+     *<pre>
+     * Test
+     * </pre>
+     *
+     * <pre>
+     * Test
+     * </pre>
+     */
+    boolean test() {return false;}
+
+    /**
+     * Some Javadoc.
+     *
+     * <p>Some Javadoc.
+     *
+     */
+     class InnerInputCorrectJavaDocParagraphCheck {
+
+        /**
+         * Some Javadoc.
+         *
+         * <p>Some Javadoc.
+         *
+         * <p>Some Javadoc.
+         *
+         * @since 8.0
+         */
+        public static final byte NUL = 0;
+
+        /**
+         * Some Javadoc.
+         *
+         * <p>Some Javadoc.
+         *
+         * @see <a href="http://www.gwtproject.org/doc/latest/DevGuideOrganizingProjects.html#DevGuideModules">
+         *     Documentation about GWT emulated source</a>
+         */
+        boolean emulated() {return false;}
+    }
+
+    InnerInputCorrectJavaDocParagraphCheck anon = new InnerInputCorrectJavaDocParagraphCheck() {
+
+        /**
+         * Some Javadoc.
+         *
+         * <p>Some Javadoc.
+         *
+         * <p>Some Javadoc.
+         *
+         * @since 8.0
+         */
+        public static final byte NUL = 0;
+
+        /**
+         * Some Javadoc with space at the end of first line.
+         *
+         * <p>Some Javadoc.
+         *
+         * <p>Some Javadoc.
+         *
+         * @see <a href="http://www.gwtproject.org/doc/latest/DevGuideOrganizingProjects.html#DevGuideModules">
+         *     Documentation about GWT emulated source</a>
+         */
+        boolean emulated() {return false;}
+    };
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraphTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraphTwo.java
new file mode 100644
index 00000000000..163b82fc154
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCorrectParagraphTwo.java
@@ -0,0 +1,33 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck
+violateExecutionOnNonTightHtml = (default)false
+target = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, \
+         CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+tagOrder = (default)@author, @deprecated, @exception, @param, @return, \
+           @see, @serial, @serialData, @serialField, @since, @throws, @version
+
+
+com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck
+violateExecutionOnNonTightHtml = (default)false
+allowNewlineParagraph = (default)true
+
+
+*/
+
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * Some Javadoc.
+ *
+ * <p>Some Javadoc.
+ *
+ */
+class InputAbstractJavadocCorrectParagraphTwo {}
+
+/*
+ *  This comment has paragraph without '<p>' tag.
+ *
+ *  It's fine, because this is plain comment.
+ */
+class ClassWithPlainComment {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCustomTag.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCustomTag.java
index ae99840d8ca..3dcdebdd8a7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCustomTag.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocCustomTag.java
@@ -1,8 +1,9 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 public class InputAbstractJavadocCustomTag {
     /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference.java
index d839d09a77c..bdad89e058b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference.java
@@ -1,13 +1,14 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /**
  * @see javax.swing.tree.DefaultTreeCellRenderer.getTreeCellRendererComponent()
  */
-// violation above 'Javadoc comment at column 78 has parse error.
-// Details: mismatched input '(' expecting <EOF> while parsing JAVADOC'
+// violation 2 lines above 'Javadoc comment at column 78 has parse error.'
+// Details: mismatched input '(' expecting <EOF> while parsing JAVADOC
 class InputAbstractJavadocInvalidAtSeeReference {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference2.java
index 63e6435b33b..98b5ff04360 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocInvalidAtSeeReference2.java
@@ -1,13 +1,14 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /**
  * @see javax.swing.tree.DefaultTreeCellRenderer.getTreeCellRendererComponent()
  */
-// violation above 'Javadoc comment at column 78 has parse error.
-// Details: mismatched input '(' expecting <EOF> while parsing JAVADOC'
+// violation 2 lines above 'Javadoc comment at column 78 has parse error.'
+// Details: mismatched input '(' expecting <EOF> while parsing JAVADOC
 class InputAbstractJavadocInvalidAtSeeReference2 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocJavadocTagsWithoutArgs.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocJavadocTagsWithoutArgs.java
index bab3c1c1cf4..25278a44e1b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocJavadocTagsWithoutArgs.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocJavadocTagsWithoutArgs.java
@@ -1,18 +1,20 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 import java.io.Serializable;
 
-/*
- * Config: TempCheck
- */
-
 /**@author*/ // ok
 public class InputAbstractJavadocJavadocTagsWithoutArgs implements Serializable{
+
     /**@serial*/ // ok
     private static final long serialVersionUID = 7556448691029650757L;
 
-    /**@see*/ // violation 'Javadoc comment at column 4 has parse error. Details: no viable
-    // alternative at input '<EOF> while parsing JAVADOC_TAG'
+    /**@see*/ // violation 'Javadoc comment at column 4 has parse error.'
+    // Details: no viable alternative at input '<EOF>' while parsing JAVADOC_TAG
     private static int field2;
 
     /**@since*/ // ok
@@ -24,14 +26,14 @@ public class InputAbstractJavadocJavadocTagsWithoutArgs implements Serializable{
     /**serialField*/ // ok
     private static Object field5;
 
-    /**@exception*/ // violation 'Javadoc comment at column 10 has parse error. Details: no
-    // viable alternative at input '<EOF> while parsing JAVADOC_TAG'
+    /**@exception*/ // violation 'Javadoc comment at column 10 has parse error.'
+    // Details: no viable alternative at input '<EOF>' while parsing JAVADOC_TAG
     public static void method1() {
 
     }
 
-    /**@throws*/ // violation 'Javadoc comment at column 7 has parse error. Details: no viable
-    // alternative at input '<EOF> while parsing JAVADOC_TAG'
+    /**@throws*/ // violation 'Javadoc comment at column 7 has parse error.'
+    // Details: no viable alternative at input '<EOF>' while parsing JAVADOC_TAG
     public static void method2() {
 
     }
@@ -41,8 +43,8 @@ public static int method3() {
         return -1;
     }
 
-    /**@param*/ // violation 'Javadoc comment at column 6 has parse error. Details: no viable
-    // alternative at input '<EOF> while parsing JAVADOC_TAG'
+    /**@param*/ // violation 'Javadoc comment at column 6 has parse error.'
+    // Details: no viable alternative at input '<EOF>' while parsing JAVADOC_TAG
     public static void method4(int a) {
 
     }
@@ -65,8 +67,9 @@ private void readObject(java.io.ObjectInputStream inputStream) {
     /**
      * {@link}
      */
-    // violation above 'Javadoc comment at column 13 has parse error. Details: mismatched
-    // input '}' expecting {LEADING_ASTERISK, WS, NEWLINE}" while parsing JAVADOC_INLINE_TAG'
+    // violation 2 lines above 'Javadoc comment at column 13 has parse error.'
+    // Details: mismatched input '}' expecting {LEADING_ASTERISK, WS, NEWLINE}
+    // while parsing JAVADOC_INLINE_TAG
     public void method7() {
 
     }
@@ -74,8 +77,8 @@ public void method7() {
     /**
      * {@linkplain }
      */
-    // violation above 'Javadoc comment at column 19 has parse error. Details: no viable
-    // alternative at input '<}> while parsing REFERENCE'
+    // violation 2 lines above 'Javadoc comment at column 19 has parse error.'
+    // Details: no viable alternative at input '}' while parsing REFERENCE
     public void method8() {
 
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveToken.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveToken.java
deleted file mode 100644
index ac1ff38e574..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveToken.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/*
- * Config: JavadocVisitLeaveCheck
- */
-
-/////////////
-// CLASSES //
-/////////////
-
-/**Javadoc*/ // ok
-class/**nope*/ InputAbstractJavadocLeaveToken/**nope*/{
-    /**Javadoc*/ // ok
-    protected/**nope*/ class/**nope*/ B/**nope*/{/**nope*/}
-
-    /**Javadoc*/ // ok
-    private/**nope*/ static/**nope*/ class/**nope*/ C/**nope*/{/**nope*/}
-
-    /**Javadoc*/ // ok
-    @Component/**nope*/ class/**nope*/ D/**nope*/{/**nope*/}
-
-    /**Javadoc*/ // ok
-    @Component/**nope*/ private/**nope*/ class/**nope*/ E/**nope*/{/**nope*/}
-
-    /**Javadoc*/ // ok
-    private/**nope*/ @Component/**nope*/ class/**nope*/ F/**nope*/{/**nope*/}
-}
-
-//////////////////
-// CONSTRUCTORS //
-//////////////////
-
-/**Javadoc*/ // ok
-class/**nope*/ AA1/**nope*/{
-    /**Javadoc*/ // ok
-    AA1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-/**Javadoc*/ // ok
-class/**nope*/ BB1/**nope*/{
-    /**Javadoc*/ // ok
-    private/**nope1*/ BB1/**nope2*/(/**nope3*/)/**nope4*/{/**nope5*/}/**nope6*/
-}
-
-class/**nope*/ DD1/**nope*/{
-    /**Javadoc*/ // ok
-    @Component/**nope*/ DD1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class/**nope*/ EE1/**nope*/{
-    /**Javadoc*/ // ok
-    @Component/**nope*/ private/**nope*/ EE1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class/**nope*/ FF1/**nope*/{
-    /**Javadoc*/ // ok
-    private/**nope*/ @Component/**nope*/ FF1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-/////////////
-// METHODS //
-/////////////
-
-class AAA1 {
-    /**Javadoc*/ // ok
-    void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class BBB1 {
-    /**Javadoc*/ // ok
-    private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class CCC1 {
-    /**Javadoc*/ // ok
-    static/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class DDD1 {
-    /**Javadoc*/ // ok
-    @Component/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class EEE1 {
-    /**Javadoc*/ // ok
-    @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class FFF1 {
-    /**Javadoc*/ // ok
-    static/**nope*/ @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class GGG1 {
-    /**Javadoc*/ // ok
-    void/**nope*/ a/**nope*/(@Component/**nope*/int/**nope*/ a/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class HHH1 {
-    /**Javadoc*/ // ok
-    java.lang.String/**nope*/ a/**nope*/()/**nope*/{/**nope*/return null;/**nope*/}/**nope*/
-}
-
-////////////////
-// INTERFACES //
-////////////////
-
-/**Javadoc*/ // ok
-interface/**nope*/ AAAA1/**nope*/ {}
-
-/**Javadoc*/ // ok
-abstract/**nope*/ interface/**nope*/ BBBB1/**nope*/ {/**nope*/}
-
-/**Javadoc*/ // ok
-@Component/**nope*/ interface/**nope*/ CCCC1/**nope*/ {/**nope*/}
-
-/**Javadoc*/ // ok
-@Component/**nope*/ abstract/**nope*/ interface/**nope*/ DDDD1/**nope*/ {/**nope*/}
-
-/**Javadoc*/ // ok
-abstract/**nope*/ @Component/**nope*/ interface/**nope*/ EEEE1/**nope*/ {/**nope*/}
-
-///////////
-// ENUMS //
-///////////
-
-/**Javadoc*/ // ok
-enum/**nope*/ AAAAA1/**nope*/ {}
-
-class ASD1 {
-    /**Javadoc*/ // ok
-    private/**nope*/ enum/**nope*/ BBBBB1/**nope*/ {/**nope*/}
-
-    /**Javadoc*/ // ok
-    @Component/**nope*/ enum/**nope*/ CCCCC1/**nope*/ {/**nope*/}
-
-    /**Javadoc*/ // ok
-    @Component/**nope*/ private/**nope*/ enum/**nope*/ DDDDD1/**nope*/ {/**nope*/}
-
-    /**Javadoc*/ // ok
-    private/**nope*/ @Component/**nope*/ enum/**nope*/ EEEEE1/**nope*/ {/**nope*/}
-}
-
-////////////
-// FIELDS //
-////////////
-
-class AAAAAA1 {
-    /**Javadoc*/ // ok
-    int/**nope*/ a/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ int/**nope*/ b/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=1;
-    /**Javadoc*/ // ok
-    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=1;
-}
-
-class BBBBBB1 {
-    /**Javadoc*/ // ok
-    int/**nope*/ a/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ int/**nope*/ b/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=/**nope*/1/**nope*/;
-}
-
-
-class CCCCCC1 {
-    /**Javadoc*/ // ok
-    Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-class DDDDDD1 {
-    /**Javadoc*/ // ok
-    @Component/**nope*/ Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    @Component/**nope*/ private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    @Component/**nope*/ private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    @Component/**nope*/ private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-class EEEEEE1 {
-    /**Javadoc*/ // ok
-    private/**nope*/ @Component/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ @Component/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ // ok
-    private/**nope*/ @Component/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-/////////////////
-// ENUM CONSTS //
-/////////////////
-
-enum AAAAAAA1 {
-    /**Javadoc*/ // ok
-    ONE/**nope*/,
-    /**Javadoc*/ // ok
-    TWO/**nope*/
-}
-
-enum BBBBBBB1 {
-    /**Javadoc*/ // ok
-    ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
-    /**Javadoc*/ // ok
-    TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
-    BBBBBBB1(int i){}
-}
-
-enum CCCCCCC1 {
-    /**Javadoc*/ // ok
-    @Component/**nope*/ ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
-    /**Javadoc*/ // ok
-    @Component/**nope*/ TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
-    CCCCCCC1(int i){}
-}
-
-/**Javadoc*/ // ok
-@Retention(/**nope*/RetentionPolicy/**nope*/./**nope*/RUNTIME/**nope4*/)/**nope*/
-@Target(/**nope*/{/**nope*/ElementType/**nope*/./**nope*/CONSTRUCTOR/**nope*/, /**nope*/ElementType/**nope*/./**nope*/FIELD/**nope*/
-    , /**nope*/ElementType/**nope*/./**nope*/LOCAL_VARIABLE/**nope*/, /**nope*/ElementType/**nope*/./**nope*/METHOD
-    , /**nope*/ElementType/**nope*/./**nope*/PARAMETER/**nope*/, /**nope*/ElementType/**nope*/./**nope*/TYPE/**nope*/}/**nope*/)/**nope*/
-@interface/**nope*/ Component/**nope*/ {/**nope*/
-}
-
-/**Javadoc*/ // ok
-@interface/**nope*/ MyAnnotation1/**nope*/ {
-    /**Javadoc*/ // ok
-    @Component/**nope*/abstract/**nope*/String/**nope*/val1()/**nope*/default/**nope*/"";
-    /**Javadoc*/ // ok
-    abstract/**nope*/String/**nope*/val2()/**nope*/;
-    /**Javadoc*/ // ok
-    java.lang.String/**nope*/val3()/**nope*/;
-    /**nope*/
-}
-
-class MyTemp2 {
-    /**Javadoc*/ // ok //noise
-    private @interface/**nope*/ MyAnnotation3/**nope*/ {/**nope*/
-    }
-}
-
-/**nope*/
-/*noise*/
-/**nope*/
-/**Javadoc*/ // ok
-//noise
-@Component
-/*noise*/
-interface MultipleJavadoc1 {
-    /**nope*/
-    /*noise*/
-    /**nope*/
-    /**Javadoc*/ // ok
-    /* noise */
-    public /**nope*/ int method();
-    /**nope*/
-    /*noise*/
-    /**nope*/
-    /**Javadoc*/ // ok
-    // noise
-    @Deprecated
-    // noise
-    /**nope*/
-    public /**nope*/ void method2();
-}
-
-/**nope*/
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenOne.java
new file mode 100644
index 00000000000..c24bc80231b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenOne.java
@@ -0,0 +1,108 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocVisitLeaveCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/////////////
+// CLASSES //
+/////////////
+
+/**Javadoc*/
+class/**nope*/ InputAbstractJavadocLeaveTokenOne/**nope*/{
+    /**Javadoc*/
+    protected/**nope*/ class/**nope*/ B/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ class/**nope*/ C/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ class/**nope*/ D/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ class/**nope*/ E/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ class/**nope*/ F/**nope*/{/**nope*/}
+}
+
+//////////////////
+// CONSTRUCTORS //
+//////////////////
+
+/**Javadoc*/
+class/**nope*/ AA1/**nope*/{
+    /**Javadoc*/
+    AA1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+/**Javadoc*/
+class/**nope*/ BB1/**nope*/{
+    /**Javadoc*/
+    private/**nope1*/ BB1/**nope2*/(/**nope3*/)/**nope4*/{/**nope5*/}/**nope6*/
+}
+
+class/**nope*/ DD1/**nope*/{
+    /**Javadoc*/
+    @Component/**nope*/ DD1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class/**nope*/ EE1/**nope*/{
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ EE1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class/**nope*/ FF1/**nope*/{
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ FF1/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+/////////////
+// METHODS //
+/////////////
+
+class AAA1 {
+    /**Javadoc*/
+    void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class BBB1 {
+    /**Javadoc*/
+    private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class CCC1 {
+    /**Javadoc*/
+    static/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class DDD1 {
+    /**Javadoc*/
+    @Component/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class EEE1 {
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class FFF1 {
+    /**Javadoc*/
+    static/**nope*/ @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class GGG1 {
+    /**Javadoc*/
+    void/**nope*/ a/**nope*/(@Component/**nope*/int/**nope*/ a/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class HHH1 {
+    /**Javadoc*/
+    java.lang.String/**nope*/ a/**nope*/()/**nope*/{/**nope*/return null;/**nope*/}/**nope*/
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenThree.java
new file mode 100644
index 00000000000..53363058759
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenThree.java
@@ -0,0 +1,91 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocVisitLeaveCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/////////////////
+// ENUM CONSTS //
+/////////////////
+
+class InputAbstractJavadocLeaveTokenThree {
+    enum AAAAAAA1 {
+        /**Javadoc*/
+        ONE/**nope*/,
+        /**Javadoc*/
+        TWO/**nope*/
+    }
+
+    enum BBBBBBB1 {
+        /**Javadoc*/
+        ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
+        /**Javadoc*/
+        TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
+        BBBBBBB1(int i){}
+    }
+
+    enum CCCCCCC1 {
+        /**Javadoc*/
+        @Component/**nope*/ ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
+        /**Javadoc*/
+        @Component/**nope*/ TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
+        CCCCCCC1(int i){}
+    }
+}
+/**Javadoc*/
+@Retention(/**nope*/RetentionPolicy/**nope*/./**nope*/RUNTIME/**nope4*/)/**nope*/
+@Target(/**nope*/{/**nope*/ElementType/**nope*/./**nope*/CONSTRUCTOR/**nope*/, /**nope*/ElementType/**nope*/./**nope*/FIELD/**nope*/
+    , /**nope*/ElementType/**nope*/./**nope*/LOCAL_VARIABLE/**nope*/, /**nope*/ElementType/**nope*/./**nope*/METHOD
+    , /**nope*/ElementType/**nope*/./**nope*/PARAMETER/**nope*/, /**nope*/ElementType/**nope*/./**nope*/TYPE/**nope*/}/**nope*/)/**nope*/
+@interface/**nope*/ Component/**nope*/ {/**nope*/
+}
+
+/**Javadoc*/
+@interface/**nope*/ MyAnnotation1/**nope*/ {
+    /**Javadoc*/
+    @Component/**nope*/abstract/**nope*/String/**nope*/val1()/**nope*/default/**nope*/"";
+    /**Javadoc*/
+    abstract/**nope*/String/**nope*/val2()/**nope*/;
+    /**Javadoc*/
+    java.lang.String/**nope*/val3()/**nope*/;
+    /**nope*/
+}
+
+class MyTemp2 {
+    /**Javadoc*///noise
+    private @interface/**nope*/ MyAnnotation3/**nope*/ {/**nope*/
+    }
+}
+
+/**nope*/
+/*noise*/
+/**nope*/
+/**Javadoc*/
+//noise
+@Component
+/*noise*/
+interface MultipleJavadoc1 {
+    /**nope*/
+    /*noise*/
+    /**nope*/
+    /**Javadoc*/
+    /* noise */
+    public /**nope*/ int method();
+    /**nope*/
+    /*noise*/
+    /**nope*/
+    /**Javadoc*/
+    // noise
+    @Deprecated
+    // noise
+    /**nope*/
+    public /**nope*/ void method2();
+}
+
+/**nope*/
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenTwo.java
new file mode 100644
index 00000000000..e1b13066bbb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocLeaveTokenTwo.java
@@ -0,0 +1,112 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocVisitLeaveCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+///////////
+// ENUMS //
+///////////
+
+class InputAbstractJavadocLeaveTokenTwo{
+    /**Javadoc*/
+    enum/**nope*/ AAAAA1/**nope*/ {}
+    }
+
+class ASD1 {
+    /**Javadoc*/
+    private/**nope*/ enum/**nope*/ BBBBB1/**nope*/ {/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ enum/**nope*/ CCCCC1/**nope*/ {/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ enum/**nope*/ DDDDD1/**nope*/ {/**nope*/}
+
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ enum/**nope*/ EEEEE1/**nope*/ {/**nope*/}
+}
+
+////////////////
+// INTERFACES //
+////////////////
+
+/**Javadoc*/
+interface/**nope*/ AAAA1/**nope*/ {}
+
+/**Javadoc*/
+abstract/**nope*/ interface/**nope*/ BBBB1/**nope*/ {/**nope*/}
+
+/**Javadoc*/
+@Component/**nope*/ interface/**nope*/ CCCC1/**nope*/ {/**nope*/}
+
+/**Javadoc*/
+@Component/**nope*/ abstract/**nope*/ interface/**nope*/ DDDD1/**nope*/ {/**nope*/}
+
+/**Javadoc*/
+abstract/**nope*/ @Component/**nope*/ interface/**nope*/ EEEE1/**nope*/ {/**nope*/}
+
+
+////////////
+// FIELDS //
+////////////
+
+class AAAAAA1 {
+    /**Javadoc*/
+    int/**nope*/ a/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ int/**nope*/ b/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=1;
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=1;
+}
+
+class BBBBBB1 {
+    /**Javadoc*/
+    int/**nope*/ a/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ int/**nope*/ b/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=/**nope*/1/**nope*/;
+}
+
+
+class CCCCCC1 {
+    /**Javadoc*/
+    Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
+
+class DDDDDD1 {
+    /**Javadoc*/
+    @Component/**nope*/ Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
+
+class EEEEEE1 {
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags.java
index 17e8060c096..b80935ccfb2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags.java
@@ -1,12 +1,13 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 import java.io.ObjectStreamField;
 import java.io.Serializable;
 
-/*
- * Config: TempCheck
- */
-
 /**
  * @author author-name <link rel="author license" href="/about">
  */
@@ -19,24 +20,24 @@ public class InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags implements S
      * href="https://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#serial">
      * oracle docs</a> Syntax: <b>@serial field-description | include | exclude</b>
      */
-    // violation above 'Javadoc comment at column 23 has parse error.
-    // Details: mismatched input 'd' expecting <EOF> while parsing JAVADOC'
+    // violation 5 lines above 'Javadoc comment at column 23 has parse error.'
+    // Details: mismatched input 'd' expecting <EOF> while parsing JAVADOC
     private static final long serialVersionUID = 8669426759693842025L;
 
     /**
      * Parse Error from ANTLR.
      * @serialField Fieldname-fieldtype-fielddescription
      */
-    // violation above 'Javadoc comment at column 30 has parse error.
-    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC'
+    // violation 2 lines above 'Javadoc comment at column 30 has parse error.'
+    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC
     private static ObjectStreamField objectStreamField1;
 
     /**
      * Parse Error from ANTLR.
      * @serialField Fieldname fieldtype-fielddescription
      */
-    // violation above 'Javadoc comment at column 39 has parse error.
-    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC'
+    // violation 2 lines above 'Javadoc comment at column 39 has parse error.'
+    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC
     private static ObjectStreamField objectStreamField2;
 
     /**
@@ -49,8 +50,8 @@ public class InputAbstractJavadocNoWsBeforeDescriptionInJavadocTags implements S
      * Parse Error from ANTLR.
      * @exception RuntimeException-description
      */
-    // violation above 'Javadoc comment at column 34 has parse error.
-    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC'
+    // violation 2 lines above 'Javadoc comment at column 34 has parse error.'
+    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC
     private static void method1() {
 
     }
@@ -59,8 +60,8 @@ private static void method1() {
      * Parse Error from ANTLR.
      * @throws RuntimeException-description
      */
-    // violation above 'Javadoc comment at column 31 has parse error.
-    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC'
+    // violation 2 lines above 'Javadoc comment at column 31 has parse error.'
+    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC
     private static void method2() {
 
     }
@@ -70,8 +71,8 @@ private static void method2() {
      *
      * @param a-description
      */
-    // violation above 'Javadoc comment at column 15 has parse error.
-    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC'
+    // violation 2 lines above 'Javadoc comment at column 15 has parse error.'
+    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC
     private static void method3(int a) {
 
     }
@@ -79,14 +80,14 @@ private static void method3(int a) {
     /**
      * @see #objectStreamField1-description
      */
-    // violation above 'Javadoc comment at column 33 has parse error.
-    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC'
+    // violation 2 lines above 'Javadoc comment at column 32 has parse error.'
+    // Details: mismatched input '-' expecting <EOF> while parsing JAVADOC
     private static void method4() {
 
     }
 
-    // violation below 'Javadoc comment at column 17 has parse error.
-    // Details: mismatched input '<' expecting <EOF> while parsing JAVADOC'
+    // violation 3 lines below 'Javadoc comment at column 17 has parse error.'
+    // Details: mismatched input '<' expecting <EOF> while parsing JAVADOC
     /**
      * @customTag<description>}
      */
@@ -97,23 +98,23 @@ private static void method8() {
     /**
      * {@link #objectStreamField2-description}
      */
-    // violation above 'Javadoc comment at column 34 has parse error.
-    // Details: no viable alternative at input '-' while parsing JAVADOC_INLINE_TAG'
+    // violation 2 lines above 'Javadoc comment at column 34 has parse error.'
+    // Details: no viable alternative at input '-' while parsing JAVADOC_INLINE_TAG
     private static void method5() {
     }
     /**
      * {@linkplain #objectStreamField3-description}
      */
-    // violation above 'Javadoc comment at column 39 has parse error.
-    // Details: no viable alternative at input '-' while parsing JAVADOC_INLINE_TAG'
+    // violation 2 lines above 'Javadoc comment at column 39 has parse error.'
+    // Details: no viable alternative at input '-' while parsing JAVADOC_INLINE_TAG
     private static void method6() {
 
     }
     /**
      * {@customlink<description>}
      */
-    // violation above 'Javadoc comment at column 34 has parse error.
-    // Details: no viable alternative at input '<' while parsing JAVADOC_INLINE_TAG'
+    // violation 2 lines above 'Javadoc comment at column 19 has parse error.'
+    // Details: no viable alternative at input '<' while parsing JAVADOC_INLINE_TAG
     private static void method7() {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags.java
deleted file mode 100644
index 07124bdc679..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
-/*
- * Config: NonTightHtmlTagIntolerantCheck
- * violateExecutionOnNonTightHtml = true
- */
-
-/**
- * <body>
- * <p> This class is only meant for testing. </p>
- * <p> In html, closing all tags is not necessary.
- * </body>
- *
- * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
- */
-// violation above 'Unclosed HTML tag found: p' <li> neither is opening every tag <p> </li>
-public class InputAbstractJavadocNonTightHtmlTags {
-    /** <p> <p> paraception </p> </p> */ // violation 'Unclosed HTML tag found: p'
-    private int field1;
-
-    /**<li> paraTags should be opened</p> list isn't nested in parse tree </li>*/
-    // violation above 'Unclosed HTML tag found: li'
-    private int field2;
-
-    /**
-     * <p> this paragraph is closed and would be nested in javadoc tree </p>
-     * <li> list has an <p> unclosed para, but still the list would get nested </li>
-     */
-    // violation above 'Unclosed HTML tag found: p'
-    private int field3;
-
-    /**
-     * <li> Complete <p> nesting </p> </li>
-     * <tr> Zero </p> nesting despite `tr` is closed </tr>
-     */
-    // violation above 'Unclosed HTML tag found: tr'
-    private int field4;
-
-    /**
-     * <p> <a href="www.something.com">something</a> paragraph with `htmlTag` </p>
-     * <p> <a href="www.something.com"/> Nested paragraph with `singletonTag` </p>
-     * <li> Outer tag <li> Inner tag nested </li> not nested </li>
-     */
-    // violation above 'Unclosed HTML tag found: li'
-    private int field5;
-
-    /**
-     * <th> !isNonTight </th>
-     * <th> th with <base/> singletonElement </th>
-     * <body> body with <br/> singletonElement </body>
-     * <colgroup><col><col><col></colgroup>
-     * <dd> dd with <hr> singletonElement </dd>
-     * <dt> dt with <img src="~/singletonElement.jpg" alt="" width="100" height="150"/>
-     *     singletonElement </dt>
-     * <head> head with <img src="~/singletonElement.jpg" alt="" width="100" height="150">
-     * singletonElement </head>
-     */
-    private int field6;
-
-    /**
-     * <body> body <p> paragraph <li> list </li> </p> </body>
-     *
-     * @return <li> <li> outer list isn't nested in parse tree </li> </li>
-     */
-    // violation above 'Unclosed HTML tag found: li'
-    int getField1() {return field1;}
-
-    /***/
-    int getField2() {return field2;} //method with empty javadoc
-
-    /**
-     * <tr> <li> list is going to be nested in the parse tree </li> </tr>
-     *
-     * @param field1 {@code <p> paraTag will not be recognized} in javadoc tree </p>
-     */
-    void setField1(int field1) {this.field1 = field1;}
-
-    /**
-     * <p>This is a setter method.
-     * And paraTag shall be nested in parse tree </p>
-     * @param field2 <p> setter
-     */
-    // violation above 'Unclosed HTML tag found: p'
-    void setField2(int field2) {this.field2 = field2;}
-
-    /**
-     * <p> paragraph with a <br>singletonElement. <hr> And it contains another one. </p>
-     * <li> List with singletonElement
-     * <param name=mov value="~/imitation game.mp4"> <param name=allowfullscreen value=true> </li>
-     * @return <tr> tr with <base href="www.something.com"> singletonElement </tr>
-     *     <tr> nonTight </th>
-     */
-    // violation above 'Unclosed HTML tag found: tr'
-    private int getField3() {return field3;}
-
-    /**
-     * @param field3 <td> td with singletonElement <br/> </td>
-     */
-    private void setField3(int field3) { this.field3 = field3;}
-
-    /**
-     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html>
-     * <option> <INPut/> </option>
-     * @return <tbody> <input/> <br> </tbody>
-     */
-    private int getField4() {return field4;}
-
-    /**
-     * <thead> <br> </thead>
-     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot>
-     * <p> </p>
-     * @param field4 value to which {@link #field4} is to be set to
-     */
-    private void setField4(int field4) {this.field4 = field4;}
-
-    /**
-     * <li> </li>
-     * <TR> </tr>
-     * <Td> </td>
-     * <tH> </th>
-     * <body> </body>
-     * <colGROUP> </COLgroup>
-     * <DD> </dd>
-     * <dt> </dt>
-     * <Head> </head>
-     * <HTML> </HTML>
-     * <option> </option>
-     * <tBody> </TbODY>
-     * <tHead> </ThEAD>
-     * <tFoot> </TfOOT>
-     * @param field5 value to which {@link #field5} is to be set to
-     */
-    private void setField5(int field5) {this.field5 = field5;}
-
-    /**
-     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD>
-     *      <dt> <Head> <HTML> <option> <tBody> <tHead>
-     *      <tFoot>
-     * @param field6 </p> value to which {@link #field6} is to be set to
-     */
-    // violation above 'Unclosed HTML tag found: p'
-    private void setField6(int field6) {this.field6 = field6;}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags2.java
index d3cb76f81bc..ad6dbe20be6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags2.java
@@ -1,10 +1,11 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: NonTightHtmlTagTolerantCheck
- * violateExecutionOnNonTightHtml: true
- * reportVisitJavadocToken: true
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagTolerantCheck
+violateExecutionOnNonTightHtml = true
+reportVisitJavadocToken = true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /**
  * <body>
@@ -16,33 +17,48 @@
  *
  * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
  */
-// violation above 'First sentence of Javadoc is missing an ending period.'
-// violation above 'First sentence of Javadoc is missing
-// violation above 'Unclosed HTML tag found: p'
-// violation above 'First sentence of Javadoc is missing an ending period.'
+// violation 9 lines above 'tag BODY_TAG_START'
+// violation 9 lines above 'tag P_TAG_START'
+// 2 violations 8 lines above:
+//                            'Unclosed HTML tag found: p'
+//                            'tag P_TAG_START'
+// 2 violations 10 lines above:
+//                            'tag LI_TAG_START'
+//                            'tag P_TAG_START'
+
 public class InputAbstractJavadocNonTightHtmlTags2 {
-    /** <p> <p> paraception </p> </p> */ // violation 'First sentence of Javadoc is missing an
-    // ending period.'
+    /** <p> <p> paraception </p> </p> */
+    // 3 violations above:
+    //                    'Unclosed HTML tag found: p'
+    //                    'tag P_TAG_START'
+    //                    'tag P_TAG_START'
     private int field1;
 
     /**<li> paraTags should be opened</p> list isn't nested in parse tree </li>*/
-    // violation above 'Unclosed HTML tag found: li'
+    // 2 violations above:
+    //                    'Unclosed HTML tag found: li'
+    //                    'tag LI_TAG_START'
     private int field2;
 
     /**
      * <p> this paragraph is closed and would be nested in javadoc tree </p>
      * <li> list has an <p> unclosed para, but still the list would get nested </li>
      */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'First sentence of Javadoc is missing an ending period.'
+    // violation 3 lines above 'P_TAG_START'
+    // 3 violations 3 lines above:
+    //                    'Unclosed HTML tag found: p'
+    //                    'tag LI_TAG_START'
+    //                    'tag P_TAG_START'
     private int field3;
 
     /**
      * <li> Complete <p> nesting </p> </li>
      * <tr> Zero </p> nesting despite `tr` is closed </tr>
      */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'Unclosed HTML tag found: tr'
+    // 2 violations 3 lines above:
+    //                            'tag LI_TAG_START'
+    //                            'tag P_TAG_START'
+    // violation 5 lines above 'Unclosed HTML tag found: tr'
     private int field4;
 
     /**
@@ -50,9 +66,12 @@ public class InputAbstractJavadocNonTightHtmlTags2 {
      * <p> <a href="www.something.com"/> Nested paragraph with `singletonTag` </p>
      * <li> Outer tag <li> Inner tag nested </li> not nested </li>
      */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'Unclosed HTML tag found: '
+    // violation 4 lines above 'tag P_TAG_START'
+    // violation 4 lines above 'tag P_TAG_START'
+    // 3 violations 4 lines above:
+    //                            'Unclosed HTML tag found: li'
+    //                            'tag LI_TAG_START'
+    //                            'tag LI_TAG_START'
     private int field5;
 
     /**
@@ -60,8 +79,14 @@ public class InputAbstractJavadocNonTightHtmlTags2 {
      *
      * @return <li> <li> outer list isn't nested in parse tree </li> </li>
      */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'Unclosed HTML tag found: li'
+    // 3 violations 4 lines above:
+    //                            'tag BODY_TAG_START'
+    //                            'tag P_TAG_START'
+    //                            'tag LI_TAG_START'
+    // 3 violations 6 lines above:
+    //                            'Unclosed HTML tag found: li'
+    //                            'tag LI_TAG_START'
+    //                            'tag LI_TAG_START'
     int getField1() {return field1;}
 
     /***/
@@ -72,8 +97,10 @@ public class InputAbstractJavadocNonTightHtmlTags2 {
      * And paraTag shall be nested in parse tree </p>
      * @param field2 <p> setter
      */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'Unclosed HTML tag found: p'
+    // violation 4 lines above 'tag P_TAG_START'
+    // 2 violations 3 lines above:
+    //                            'Unclosed HTML tag found: p'
+    //                            'tag P_TAG_START'
     void setField2(int field2) {this.field2 = field2;}
 
     /**
@@ -83,36 +110,8 @@ public class InputAbstractJavadocNonTightHtmlTags2 {
      * @return <tr> tr with <base href="www.something.com"> singletonElement </tr>
      *     <tr> nonTight </th>
      */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'Unclosed HTML tag found: tr'
+    // violation 6 lines above 'tag P_TAG_START'
+    // violation 6 lines above 'tag LI_TAG_START'
+    // violation 4 lines above 'Unclosed HTML tag found: tr'
     private int getField3() {return field3;}
-
-    /**
-     * @param field3 <td> td with singletonElement <br/> </td>
-     */
-    private void setField3(int field3) { this.field3 = field3;}
-
-    /**
-     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html> // ok
-     * <option> <INPut/> </option> // ok
-     * @return <tbody> <input/> <br> </tbody>
-     */
-    private int getField4() {return field4;}
-
-    /**
-     * <thead> <br> </thead> // ok
-     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot> // ok
-     * <p> </p> // ok
-     * @param field4 value to which {@link #field4} is to be set to
-     */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    private void setField4(int field4) {this.field4 = field4;}
-
-    /**
-     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD> <dt> <Head> <HTML> <option> <tBody> <tHead>
-     *      <tFoot> // ok
-     * @param field5 </p> value to which {@link #field5} is to be set to
-     */
-    private void setField5(int field5) {this.field5 = field5;}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags3.java
new file mode 100644
index 00000000000..b02735e073c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTags3.java
@@ -0,0 +1,46 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagTolerantCheck
+violateExecutionOnNonTightHtml = true
+reportVisitJavadocToken = true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+public class InputAbstractJavadocNonTightHtmlTags3 {
+    private int field3;
+    private int field4;
+    private int field5;
+    /**
+     * @param field3 <td> td with singletonElement <br/> </td>
+     */
+    private void setField3(int field3) { this.field3 = field3;}
+
+    /**
+     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html>
+     * <option> <INPut/> </option>
+     * @return <tbody> <input/> <br> </tbody>
+     */
+    private int getField4() {return field4;}
+
+    /**
+     * <thead> <br> </thead>
+     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot>
+     * <p> </p>
+     * @param field4 value to which {@link #field4} is to be set to
+     */
+    // violation 3 lines above 'tag P_TAG_START'
+    private void setField4(int field4) {this.field4 = field4;}
+
+    /**
+     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD> <dt> <Head> <HTML> <option> <tBody> <tHead>
+     *      <tFoot>
+     * @param field5 </p> value to which {@link #field5} is to be set to
+     */
+    // 4 violations 4 lines above:
+    //                            'Unclosed HTML tag found: p'
+    //                            'tag P_TAG_START'
+    //                            'tag LI_TAG_START'
+    //                            'tag BODY_TAG_START'
+    private void setField5(int field5) {this.field5 = field5;}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolation.java
deleted file mode 100644
index 33dfd6e127a..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolation.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
-/*
- * Config: NonTightHtmlTagIntolerantCheck
- */
-
-/**
- * <body>
- * <p> This class is only meant for testing. </p>
- * <p> In html, closing all tags is not necessary.
- * <li> neither is opening every tag <p> </li>
- * </body>
- *
- * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
- */
-public class InputAbstractJavadocNonTightHtmlTagsNoViolation {
-    /** <p> <p> paraception </p> </p> */ // ok
-    private int field1;
-
-    /**<li> paraTags should be opened</p> list isn't nested in parse tree </li>*/ // ok
-    private int field2;
-
-    /**
-     * <p> this paragraph is closed and would be nested in javadoc tree </p>
-     * <li> this list has an <p> unclosed para, but still the list would get nested </li>
-     */
-    private int field3;
-
-    /**
-     * <li> Complete <p> nesting </p> </li>
-     * <tr> Zero </p> nesting despite `tr` is closed </tr>
-     */
-    private int field4;
-
-    /**
-     * <p> <a href="www.something.com">something</a> paragraph with `htmlTag` </p>
-     * <p> <a href="www.something.com"/> Nested paragraph with `singletonTag` </p>
-     * <li> Outer tag <li> Inner tag nested </li> not nested </li>
-     */
-    private int field5;
-
-    /**
-     * <th> !isNonTight </th>
-     * <th> th with <base/> singletonElement </th>
-     * <body> body with <br/> singletonElement </body>
-     * <colgroup><col><col><col></colgroup>
-     * <dd> dd with <hr> singletonElement </dd>
-     * <dt> dt with <img src="~/singletonElement.jpg" alt="" width="100" height="150"/>
-     *     singletonElement </dt>
-     * <head> head with <img src="~/singletonElement.jpg" alt="" width="100" height="150">
-     * singletonElement </head>
-     */
-    private int field6;
-
-    /**
-     * <body> body <p> paragraph <li> list </li> </p> </body>
-     *
-     * @return <li> <li> outer list isn't nested in parse tree </li> </li>
-     */
-    int getField1() {return field1;}
-
-    /***/
-    int getField2() {return field2;} //method with empty javadoc
-
-    /**
-     * <tr> <li> list is going to be nested in the parse tree </li> </tr>
-     *
-     * @param field1 {@code <p> paraTag will not be recognized} in javadoc tree </p>
-     */
-    void setField1(int field1) {this.field1 = field1;}
-
-    /**
-     * <p>This is a setter method.
-     * And paraTag shall be nested in parse tree </p>
-     * @param field2 <p> setter
-     */
-    void setField2(int field2) {this.field2 = field2;}
-
-    /**
-     * <p> paragraph with a <br>singletonElement. <hr> And it contains another one. </p>
-     * <li> List with singletonElement
-     * <param name=mov value="~/imitation game.mp4"> <param name=allowfullscreen value=true> </li>
-     * @return <tr> tr with <base href="www.something.com"> singletonElement </tr>
-     *     <tr> nonTight </th>
-     */
-    private int getField3() {return field3;}
-
-    /**
-     * @param field3 <td> td with singletonElement <br/> </td>
-     */
-    private void setField3(int field3) { this.field3 = field3;}
-
-    /**
-     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html>
-     * <option> <INPut/> </option>
-     * @return <tbody> <input/> <br> </tbody>
-     */
-    private int getField4() {return field4;}
-
-    /**
-     * <thead> <br> </thead>
-     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot>
-     * <p> </p>
-     * @param field4 value to which {@link #field4} is to be set to
-     */
-    private void setField4(int field4) {this.field4 = field4;}
-
-    /**
-     * <li> </li>
-     * <TR> </tr>
-     * <Td> </td>
-     * <tH> </th>
-     * <body> </body>
-     * <colGROUP> </COLgroup>
-     * <DD> </dd>
-     * <dt> </dt>
-     * <Head> </head>
-     * <HTML> </HTML>
-     * <option> </option>
-     * <tBody> </TbODY>
-     * <tHead> </ThEAD>
-     * <tFoot> </TfOOT>
-     * @param field5 value to which {@link #field5} is to be set to
-     */
-    private void setField5(int field5) {this.field5 = field5;}
-
-    /**
-     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD> <dt> <Head> <HTML> <option> <tBody> <tHead>
-     *      <tFoot>
-     * @param field6 </p> value to which {@link #field6} is to be set to
-     */
-    private void setField6(int field6) {this.field6 = field6;}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolationOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolationOne.java
new file mode 100644
index 00000000000..af0d47f85ce
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolationOne.java
@@ -0,0 +1,73 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * <body>
+ * <p> This class is only meant for testing. </p>
+ * <p> In html, closing all tags is not necessary.
+ * <li> neither is opening every tag <p> </li>
+ * </body>
+ *
+ * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
+ */
+public class InputAbstractJavadocNonTightHtmlTagsNoViolationOne {
+    /** <p> <p> paraception </p> </p> */
+    private int field1;
+
+    /**<li> paraTags should be opened</p> list isn't nested in parse tree </li>*/
+    private int field2;
+
+    /**
+     * <p> this paragraph is closed and would be nested in javadoc tree </p>
+     * <li> this list has an <p> unclosed para, but still the list would get nested </li>
+     */
+    private int field3;
+
+    /**
+     * <li> Complete <p> nesting </p> </li>
+     * <tr> Zero </p> nesting despite `tr` is closed </tr>
+     */
+
+    int getField1() {return field1;}
+
+    /***/
+    int getField2() {return field2;} //method with empty javadoc
+
+    /**
+     * <tr> <li> list is going to be nested in the parse tree </li> </tr>
+     *
+     * @param field1 {@code <p> paraTag will not be recognized} in javadoc tree </p>
+     */
+    void setField1(int field1) {this.field1 = field1;}
+
+    /**
+     * <p>This is a setter method.
+     * And paraTag shall be nested in parse tree </p>
+     * @param field2 <p> setter
+     */
+    void setField2(int field2) {this.field2 = field2;}
+
+    /**
+     * <p> paragraph with a <br>singletonElement. <hr> And it contains another one. </p>
+     * <li> List with singletonElement
+     * <param name=mov value="~/imitation game.mp4"> <param name=allowfullscreen value=true> </li>
+     * @return <tr> tr with <base href="www.something.com"> singletonElement </tr>
+     *     <tr> nonTight </th>
+     */
+    private int getField3() {return field3;}
+
+    /**
+     * @param field3 <td> td with singletonElement <br/> </td>
+     */
+    private void setField3(int field3) { this.field3 = field3;}
+
+    /**
+     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html>
+     * <option> <INPut/> </option>
+     * @return <tbody> <input/> <br> </tbody>
+     */
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolationTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolationTwo.java
new file mode 100644
index 00000000000..17dab0b081e
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsNoViolationTwo.java
@@ -0,0 +1,82 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * <body>
+ * <p> This class is only meant for testing. </p>
+ * <p> In html, closing all tags is not necessary.
+ * <li> neither is opening every tag <p> </li>
+ * </body>
+ *
+ * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
+ */
+public class InputAbstractJavadocNonTightHtmlTagsNoViolationTwo {
+    /** <p> <p> paraception </p> </p> */
+     private int field4;
+
+    /**
+     * <p> <a href="www.something.com">something</a> paragraph with `htmlTag` </p>
+     * <p> <a href="www.something.com"/> Nested paragraph with `singletonTag` </p>
+     * <li> Outer tag <li> Inner tag nested </li> not nested </li>
+     */
+    private int field5;
+
+    /**
+     * <th> !isNonTight </th>
+     * <th> th with <base/> singletonElement </th>
+     * <body> body with <br/> singletonElement </body>
+     * <colgroup><col><col><col></colgroup>
+     * <dd> dd with <hr> singletonElement </dd>
+     * <dt> dt with <img src="~/singletonElement.jpg" alt="" width="100" height="150"/>
+     *     singletonElement </dt>
+     * <head> head with <img src="~/singletonElement.jpg" alt="" width="100" height="150">
+     * singletonElement </head>
+     */
+    private int field6;
+
+    /**
+     * <body> body <p> paragraph <li> list </li> </p> </body>
+     *
+     * @return <li> <li> outer list isn't nested in parse tree </li> </li>
+     */
+
+private int getField4() {return field4;}
+
+    /**
+     * <thead> <br> </thead>
+     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot>
+     * <p> </p>
+     * @param field4 value to which {@link #field4} is to be set to
+     */
+    private void setField4(int field4) {this.field4 = field4;}
+
+    /**
+     * <li> </li>
+     * <TR> </tr>
+     * <Td> </td>
+     * <tH> </th>
+     * <body> </body>
+     * <colGROUP> </COLgroup>
+     * <DD> </dd>
+     * <dt> </dt>
+     * <Head> </head>
+     * <HTML> </HTML>
+     * <option> </option>
+     * <tBody> </TbODY>
+     * <tHead> </ThEAD>
+     * <tFoot> </TfOOT>
+     * @param field5 value to which {@link #field5} is to be set to
+     */
+    private void setField5(int field5) {this.field5 = field5;}
+
+    /**
+     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD> <dt> <Head> <HTML> <option> <tBody> <tHead>
+     *      <tFoot>
+     * @param field6 </p> value to which {@link #field6} is to be set to
+     */
+    private void setField6(int field6) {this.field6 = field6;}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsOne.java
new file mode 100644
index 00000000000..5e1f1efdae2
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsOne.java
@@ -0,0 +1,79 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagCheck
+violateExecutionOnNonTightHtml = true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * <body>
+ * <p> This class is only meant for testing. </p>
+ * <p> In html, closing all tags is not necessary.
+ * </body>
+ *
+ * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
+ */
+// violation 5 lines above 'Unclosed HTML tag found: p'
+public class InputAbstractJavadocNonTightHtmlTagsOne {
+    /** <p> <p> paraception </p> </p> */ // violation 'Unclosed HTML tag found: p'
+    private int field1;
+
+    /**<li> paraTags should be opened</p> list isn't nested in parse tree </li>*/
+    // violation above 'Unclosed HTML tag found: li'
+    private int field2;
+
+    /**
+     * <p> this paragraph is closed and would be nested in javadoc tree </p>
+     * <li> list has an <p> unclosed para, but still the list would get nested </li>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: p'
+    private int field3;
+
+    /**
+     * <li> Complete <p> nesting </p> </li>
+     * <tr> Zero </p> nesting despite `tr` is closed </tr>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: tr'
+
+    int getField1() {return field1;}
+
+    /***/
+    int getField2() {return field2;} //method with empty javadoc
+
+    /**
+     * <tr> <li> list is going to be nested in the parse tree </li> </tr>
+     *
+     * @param field1 {@code <p> paraTag will not be recognized} in javadoc tree </p>
+     */
+    void setField1(int field1) {this.field1 = field1;}
+
+    /**
+     * <p>This is a setter method.
+     * And paraTag shall be nested in parse tree </p>
+     * @param field2 <p> setter
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: p'
+    void setField2(int field2) {this.field2 = field2;}
+
+    /**
+     * <p> paragraph with a <br>singletonElement. <hr> And it contains another one. </p>
+     * <li> List with singletonElement
+     * <param name=mov value="~/imitation game.mp4"> <param name=allowfullscreen value=true> </li>
+     * @return <tr> tr with <base href="www.something.com"> singletonElement </tr>
+     *     <tr> nonTight </th>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: tr'
+    private int getField3() {return field3;}
+
+    /**
+     * @param field3 <td> td with singletonElement <br/> </td>
+     */
+    private void setField3(int field3) { this.field3 = field3;}
+
+    /**
+     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html>
+     * <option> <INPut/> </option>
+     * @return <tbody> <input/> <br> </tbody>
+     */
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsTwo.java
new file mode 100644
index 00000000000..4aa090b6c2b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsTwo.java
@@ -0,0 +1,87 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagCheck
+violateExecutionOnNonTightHtml = true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * <body>
+ * <p> This class is only meant for testing. </p>
+ * <p> In html, closing all tags is not necessary.
+ * </body>
+ *
+ * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
+ */
+// violation 5 lines above 'Unclosed HTML tag found: p'
+public class InputAbstractJavadocNonTightHtmlTagsTwo {
+    /** <p> <p> paraception </p> </p> */ // violation 'Unclosed HTML tag found: p'
+    private int field4;
+
+    /**
+     * <p> <a href="www.something.com">something</a> paragraph with `htmlTag` </p>
+     * <p> <a href="www.something.com"/> Nested paragraph with `singletonTag` </p>
+     * <li> Outer tag <li> Inner tag nested </li> not nested </li>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: li'
+    private int field5;
+
+    /**
+     * <th> !isNonTight </th>
+     * <th> th with <base/> singletonElement </th>
+     * <body> body with <br/> singletonElement </body>
+     * <colgroup><col><col><col></colgroup>
+     * <dd> dd with <hr> singletonElement </dd>
+     * <dt> dt with <img src="~/singletonElement.jpg" alt="" width="100" height="150"/>
+     *     singletonElement </dt>
+     * <head> head with <img src="~/singletonElement.jpg" alt="" width="100" height="150">
+     * singletonElement </head>
+     */
+    private int field6;
+
+    /**
+     * <body> body <p> paragraph <li> list </li> </p> </body>
+     *
+     * @return <li> <li> outer list isn't nested in parse tree </li> </li>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: li'
+
+    private int getField4() {return field4;}
+
+    /**
+     * <thead> <br> </thead>
+     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot>
+     * <p> </p>
+     * @param field4 value to which {@link #field4} is to be set to
+     */
+    private void setField4(int field4) {this.field4 = field4;}
+
+    /**
+     * <li> </li>
+     * <TR> </tr>
+     * <Td> </td>
+     * <tH> </th>
+     * <body> </body>
+     * <colGROUP> </COLgroup>
+     * <DD> </dd>
+     * <dt> </dt>
+     * <Head> </head>
+     * <HTML> </HTML>
+     * <option> </option>
+     * <tBody> </TbODY>
+     * <tHead> </ThEAD>
+     * <tFoot> </TfOOT>
+     * @param field5 value to which {@link #field5} is to be set to
+     */
+    private void setField5(int field5) {this.field5 = field5;}
+
+    /**
+     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD>
+     *      <dt> <Head> <HTML> <option> <tBody> <tHead>
+     *      <tFoot>
+     * @param field6 </p> value to which {@link #field6} is to be set to
+     */
+    // violation 5 lines above 'Unclosed HTML tag found: p'
+    private void setField6(int field6) {this.field6 = field6;}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCount.java
deleted file mode 100644
index 9f7403ddca1..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCount.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
-/*
- * Config: NonTightHtmlTagIntolerantCheck
- * violateExecutionOnNonTightHtml = true
- * reportVisitJavadocToken = true
- */
-
-/**
- * <body>
- * <p> This class is only meant for testing. </p>
- * <p> In html, closing all tags is not necessary.
- * </body>
- *
- * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
- */
-// violation above 'Unclosed HTML tag found: p' <li> neither is opening every tag <p> </li>
-public class InputAbstractJavadocNonTightHtmlTagsVisitCount {
-    /** <p> <p> paraception </p> </p> */ // violation 'Unclosed HTML tag found: p'
-    private int field1;
-
-    /**<li> paraTags should be opened</p> list isn't nested in parse tree </li>*/
-    // violation above 'Unclosed HTML tag found: li'
-    private int field2;
-
-    /**
-     * <p> this paragraph is closed and would be nested in javadoc tree </p>
-     * <li> list has an <p> unclosed para, but still the list would get nested </li>
-     */
-    // violation above 'Unclosed HTML tag found: p'
-    private int field3;
-
-    /**
-     * <li> Complete <p> nesting </p> </li>
-     * <tr> Zero </p> nesting despite `tr` is closed </tr>
-     */
-    // violation above 'Unclosed HTML tag found: tr'
-    private int field4;
-
-    /**
-     * <p> <a href="www.something.com">something</a> paragraph with `htmlTag` </p>
-     * <p> <a href="www.something.com"/> Nested paragraph with `singletonTag` </p>
-     * <li> Outer tag <li> Inner tag nested </li> not nested </li>
-     */
-    // violation above 'Unclosed HTML tag found: li'
-    private int field5;
-
-    /**
-     * <th> !isNonTight </th>
-     * <th> th with <base/> singletonElement </th>
-     * <body> body with <br/> singletonElement </body>
-     * <colgroup><col><col><col></colgroup>
-     * <dd> dd with <hr> singletonElement </dd>
-     * <dt> dt with <img src="~/singletonElement.jpg" alt="" width="100" height="150"/>
-     *     singletonElement </dt>
-     * <head> head with <img src="~/singletonElement.jpg" alt="" width="100" height="150">
-     * singletonElement </head>
-     */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    private int field6;
-
-    /**
-     * <body> body <p> paragraph <li> list </li> </p> </body>
-     *
-     * @return <li> <li> outer list isn't nested in parse tree </li> </li>
-     */
-    // violation above 'Unclosed HTML tag found: li'
-    int getField1() {return field1;}
-
-    /***/
-    int getField2() {return field2;} //method with empty javadoc
-
-    /**
-     * <tr> <li> list is going to be nested in the parse tree </li> </tr>
-     *
-     * @param field1 {@code <p> paraTag will not be recognized} in javadoc tree </p>
-     */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    void setField1(int field1) {this.field1 = field1;}
-
-    /**
-     * <p>This is a setter method.
-     * And paraTag shall be nested in parse tree </p>
-     * @param field2 <p> setter
-     */
-    // violation above 'Unclosed HTML tag found: p'
-    void setField2(int field2) {this.field2 = field2;}
-
-    /**
-     * <p> paragraph with a <br>singletonElement. <hr> And it contains another one. </p>
-     * <li> List with singletonElement
-     * <param name=mov value="~/imitation game.mp4"> <param name=allowfullscreen value=true> </li>
-     * @return <tr> tr with <base href="www.something.com"> singletonElement </tr>
-     *     <tr> nonTight </th>
-     */
-    // violation above 'Unclosed HTML tag found: tr'
-    private int getField3() {return field3;}
-
-    /**
-     * @param field3 <td> td with singletonElement <br/> </td>
-     */
-    private void setField3(int field3) { this.field3 = field3;}
-
-    /**
-     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html>
-     * <option> <INPut/> </option>
-     * @return <tbody> <input/> <br> </tbody>
-     */
-    private int getField4() {return field4;}
-
-    /**
-     * <thead> <br> </thead>
-     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot>
-     * <p> </p>
-     * @param field4 value to which {@link #field4} is to be set to
-     */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    private void setField4(int field4) {this.field4 = field4;}
-
-    /**
-     * <li> </li>
-     * <TR> </tr>
-     * <Td> </td>
-     * <tH> </th>
-     * <body> </body>
-     * <colGROUP> </COLgroup>
-     * <DD> </dd>
-     * <dt> </dt>
-     * <Head> </head>
-     * <HTML> </HTML>
-     * <option> </option>
-     * <tBody> </TbODY>
-     * <tHead> </ThEAD>
-     * <tFoot> </TfOOT>
-     * @param field5 value to which {@link #field5} is to be set to
-     */
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    // violation above 'First sentence of Javadoc is missing an ending period.'
-    private void setField5(int field5) {this.field5 = field5;}
-
-    /**
-     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD> <dt> <Head> <HTML> <option> <tBody> <tHead>
-     *      <tFoot>
-     * @param field6 </p> value to which {@link #field6} is to be set to
-     */
-    private void setField6(int field6) {this.field6 = field6;}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCountOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCountOne.java
new file mode 100644
index 00000000000..0b66b1d55cc
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCountOne.java
@@ -0,0 +1,81 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagCheck
+violateExecutionOnNonTightHtml = true
+reportVisitJavadocToken = true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * <body>
+ * <p> This class is only meant for testing. </p>
+ * <p> In html, closing all tags is not necessary.
+ * </body>
+ *
+ * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
+ */
+// violation 5 lines above 'Unclosed HTML tag found: p'
+public class InputAbstractJavadocNonTightHtmlTagsVisitCountOne {
+    /** <p> <p> paraception </p> </p> */ // violation 'Unclosed HTML tag found: p'
+    private int field1;
+
+    /**<li> paraTags should be opened</p> list isn't nested in parse tree </li>*/
+    // violation above 'Unclosed HTML tag found: li'
+    private int field2;
+
+    /**
+     * <p> this paragraph is closed and would be nested in javadoc tree </p>
+     * <li> list has an <p> unclosed para, but still the list would get nested </li>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: p'
+    private int field3;
+
+    /**
+     * <li> Complete <p> nesting </p> </li>
+     * <tr> Zero </p> nesting despite `tr` is closed </tr>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: tr'
+
+    int getField1() {return field1;}
+
+    /***/
+    int getField2() {return field2;} //method with empty javadoc
+
+    /**
+     * <tr> <li> list is going to be nested in the parse tree </li> </tr>
+     *
+     * @param field1 {@code <p> paraTag will not be recognized} in javadoc tree </p>
+     */
+    // violation 4 lines above 'tag LI_TAG_START'
+    void setField1(int field1) {this.field1 = field1;}
+
+    /**
+     * <p>This is a setter method.
+     * And paraTag shall be nested in parse tree </p>
+     * @param field2 <p> setter
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: p'
+    void setField2(int field2) {this.field2 = field2;}
+
+    /**
+     * <p> paragraph with a <br>singletonElement. <hr> And it contains another one. </p>
+     * <li> List with singletonElement
+     * <param name=mov value="~/imitation game.mp4"> <param name=allowfullscreen value=true> </li>
+     * @return <tr> tr with <base href="www.something.com"> singletonElement </tr>
+     *     <tr> nonTight </th>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: tr'
+    private int getField3() {return field3;}
+
+    /**
+     * @param field3 <td> td with singletonElement <br/> </td>
+     */
+    private void setField3(int field3) { this.field3 = field3;}
+
+    /**
+     * <html> <bR> <Br> <BR> <Br/> <BR/> <bR/> </html>
+     * <option> <INPut/> </option>
+     * @return <tbody> <input/> <br> </tbody>
+     */
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCountTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCountTwo.java
new file mode 100644
index 00000000000..1f2564309f8
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNonTightHtmlTagsVisitCountTwo.java
@@ -0,0 +1,92 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$NonTightHtmlTagCheck
+violateExecutionOnNonTightHtml = true
+reportVisitJavadocToken = true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+/**
+ * <body>
+ * <p> This class is only meant for testing. </p>
+ * <p> In html, closing all tags is not necessary.
+ * </body>
+ *
+ * @see "https://www.w3.org/TR/html51/syntax.html#optional-start-and-end-tags"
+ */
+// violation 5 lines above 'Unclosed HTML tag found: p'
+public class InputAbstractJavadocNonTightHtmlTagsVisitCountTwo {
+    /** <p> <p> paraception </p> </p> */ // violation 'Unclosed HTML tag found: p'
+
+    private int field4;
+
+    /**
+     * <p> <a href="www.something.com">something</a> paragraph with `htmlTag` </p>
+     * <p> <a href="www.something.com"/> Nested paragraph with `singletonTag` </p>
+     * <li> Outer tag <li> Inner tag nested </li> not nested </li>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: li'
+    private int field5;
+
+    /**
+     * <th> !isNonTight </th>
+     * <th> th with <base/> singletonElement </th>
+     * <body> body with <br/> singletonElement </body>
+     * <colgroup><col><col><col></colgroup>
+     * <dd> dd with <hr> singletonElement </dd>
+     * <dt> dt with <img src="~/singletonElement.jpg" alt="" width="100" height="150"/>
+     *     singletonElement </dt>
+     * <head> head with <img src="~/singletonElement.jpg" alt="" width="100" height="150">
+     * singletonElement </head>
+     */
+    // violation 8 lines above 'tag BODY_TAG_START'
+    private int field6;
+
+    /**
+     * <body> body <p> paragraph <li> list </li> </p> </body>
+     *
+     * @return <li> <li> outer list isn't nested in parse tree </li> </li>
+     */
+    // violation 2 lines above 'Unclosed HTML tag found: li'
+
+    private int getField4() {return field4;}
+
+    /**
+     * <thead> <br> </thead>
+     * <tfoot> <AREA ALT="alt" COORDS="100,0,200,50" HREF="/href/"> </tfoot>
+     * <p> </p>
+     * @param field4 value to which {@link #field4} is to be set to
+     */
+    // violation 3 lines above 'tag P_TAG_START'
+    private void setField4(int field4) {this.field4 = field4;}
+
+    /**
+     * <li> </li>
+     * <TR> </tr>
+     * <Td> </td>
+     * <tH> </th>
+     * <body> </body>
+     * <colGROUP> </COLgroup>
+     * <DD> </dd>
+     * <dt> </dt>
+     * <Head> </head>
+     * <HTML> </HTML>
+     * <option> </option>
+     * <tBody> </TbODY>
+     * <tHead> </ThEAD>
+     * <tFoot> </TfOOT>
+     * @param field5 value to which {@link #field5} is to be set to
+     */
+    // violation 16 lines above 'tag LI_TAG_START'
+    // violation 13 lines above 'tag BODY_TAG_START'
+    private void setField5(int field5) {this.field5 = field5;}
+
+    /**
+     *  <p> <li> <TR> <Td> <tH> <body> <colGROUP> <DD> <dt> <Head> <HTML> <option> <tBody> <tHead>
+     *      <tFoot>
+     * @param field6 </p> value to which {@link #field6} is to be set to
+     */
+    // violation 4 lines above 'Unclosed HTML tag found: p'
+    private void setField6(int field6) {this.field6 = field6;}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNumberFormatException.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNumberFormatException.java
index d51033e1e32..be6d9f835d4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNumberFormatException.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocNumberFormatException.java
@@ -1,10 +1,11 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /** <ul><li>a' {@link EntityEntry} (by way of {@link #;}</li></ul> */
-// violation 'Javadoc comment at column 52 has parse error.
-// Details: mismatched input '-' expecting MEMBER while parsing REFERENCE'
+// violation above 'Javadoc comment at column 52 has parse error.'
+// Details: mismatched input ';' expecting MEMBER while parsing REFERENCE
 class InputAbstractJavadocNumberFormatException{}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors.java
index 150aac433ad..7c65d0ab180 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors.java
@@ -1,19 +1,22 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /**
  * <unclosedTag>
  */
-// violation above 'Unclosed HTML tag found: unclosedTag'
+// violation 2 lines above 'Javadoc comment at column 4 has parse error.'
+// Missed HTML close tag 'unclosedTag'. Sometimes it means that close tag missed for
+// one of previous tags.
 class InputAbstractJavadocParsingErrors {
     /**
      * <img src="singletonTag"/></img>
      */
-    // violation above 'Javadoc comment at column 35 has parse error.
-    // It is forbidden to close singleton HTML tags. Tag: img.'
+    // violation 2 lines above 'Javadoc comment at column 35 has parse error.'
+    // It is forbidden to close singleton HTML tags. Tag: img.
     void singletonTag() {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors2.java
index acaed9d6d58..55947f21b45 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocParsingErrors2.java
@@ -1,19 +1,22 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /**
  * <unclosedTag>
  */
-// violation above 'Unclosed HTML tag found: unclosedTag'
+// violation 2 lines above 'Javadoc comment at column 4 has parse error.'
+// Missed HTML close tag 'unclosedTag'. Sometimes it means that close tag missed for
+// one of previous tags.
 class InputAbstractJavadocParsingErrors2 {
     /**
      * <img src="singletonTag"/></img>
      */
-    // violation above 'Javadoc comment at column 35 has parse error.
-    // It is forbidden to close singleton HTML tags. Tag: img.'
+    // violation 2 lines above 'Javadoc comment at column 35 has parse error.'
+    // It is forbidden to close singleton HTML tags. Tag: img.
     void singletonTag() {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPosition.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPosition.java
deleted file mode 100644
index 48dc5d49279..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPosition.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/*
- * Config: JavadocCatchCheck
- */
-
-/////////////
-// CLASSES //
-/////////////
-
-/**Javadoc*/
-class/**nope*/ InputAbstractJavadocPosition/**nope*/{ // ok
-    /**Javadoc*/
-    protected/**nope*/ class/**nope*/ B/**nope*/{/**nope*/}
-
-    /**Javadoc*/
-    private/**nope*/ static/**nope*/ class/**nope*/ C/**nope*/{/**nope*/}
-
-    /**Javadoc*/
-    @Component/**nope*/ class/**nope*/ D/**nope*/{/**nope*/}
-
-    /**Javadoc*/
-    @Component/**nope*/ private/**nope*/ class/**nope*/ E/**nope*/{/**nope*/}
-
-    /**Javadoc*/
-    private/**nope*/ @Component/**nope*/ class/**nope*/ F/**nope*/{/**nope*/}
-}
-
-//////////////////
-// CONSTRUCTORS //
-//////////////////
-
-/**Javadoc*/
-class/**nope*/ AA/**nope*/{
-    /**Javadoc*/
-    AA/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-/**Javadoc*/
-class/**nope*/ BB/**nope*/{
-    /**Javadoc*/
-    private/**nope1*/ BB/**nope2*/(/**nope3*/)/**nope4*/{/**nope5*/}/**nope6*/
-}
-
-class/**nope*/ DD/**nope*/{
-    /**Javadoc*/
-    @Component/**nope*/ DD/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class/**nope*/ EE/**nope*/{
-    /**Javadoc*/
-    @Component/**nope*/ private/**nope*/ EE/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class/**nope*/ FF/**nope*/{
-    /**Javadoc*/
-    private/**nope*/ @Component/**nope*/ FF/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-/////////////
-// METHODS //
-/////////////
-
-class AAA {
-    /**Javadoc*/
-    void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class BBB {
-    /**Javadoc*/
-    private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class CCC {
-    /**Javadoc*/
-    static/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class DDD {
-    /**Javadoc*/
-    @Component/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class EEE {
-    /**Javadoc*/
-    @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class FFF {
-    /**Javadoc*/
-    static/**nope*/ @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class GGG {
-    /**Javadoc*/
-    void/**nope*/ a/**nope*/(@Component/**nope*/int/**nope*/ a/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class HHH {
-    /**Javadoc*/
-    java.lang.String/**nope*/ a/**nope*/()/**nope*/{/**nope*/return null;/**nope*/}/**nope*/
-}
-
-////////////////
-// INTERFACES //
-////////////////
-
-/**Javadoc*/
-interface/**nope*/ AAAA/**nope*/ {}
-
-/**Javadoc*/
-abstract/**nope*/ interface/**nope*/ BBBB/**nope*/ {/**nope*/}
-
-/**Javadoc*/
-@Component/**nope*/ interface/**nope*/ CCCC/**nope*/ {/**nope*/}
-
-/**Javadoc*/
-@Component/**nope*/ abstract/**nope*/ interface/**nope*/ DDDD/**nope*/ {/**nope*/}
-
-/**Javadoc*/
-abstract/**nope*/ @Component/**nope*/ interface/**nope*/ EEEE/**nope*/ {/**nope*/}
-
-///////////
-// ENUMS //
-///////////
-
-/**Javadoc*/
-enum/**nope*/ AAAAA/**nope*/ {}
-
-class ASD {
-    /**Javadoc*/
-    private/**nope*/ enum/**nope*/ BBBBB/**nope*/ {/**nope*/}
-
-    /**Javadoc*/
-    @Component/**nope*/ enum/**nope*/ CCCCC/**nope*/ {/**nope*/}
-
-    /**Javadoc*/
-    @Component/**nope*/ private/**nope*/ enum/**nope*/ DDDDD/**nope*/ {/**nope*/}
-
-    /**Javadoc*/
-    private/**nope*/ @Component/**nope*/ enum/**nope*/ EEEEE/**nope*/ {/**nope*/}
-}
-
-////////////
-// FIELDS //
-////////////
-
-class AAAAAA {
-    /**Javadoc*/
-    int/**nope*/ a/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ int/**nope*/ b/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=1;
-    /**Javadoc*/
-    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=1;
-}
-
-class BBBBBB {
-    /**Javadoc*/
-    int/**nope*/ a/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ int/**nope*/ b/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=/**nope*/1/**nope*/;
-}
-
-
-class CCCCCC {
-    /**Javadoc*/
-    Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-class DDDDDD {
-    /**Javadoc*/
-    @Component/**nope*/ Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    @Component/**nope*/ private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    @Component/**nope*/ private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    @Component/**nope*/ private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-class EEEEEE {
-    /**Javadoc*/
-    private/**nope*/ @Component/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ @Component/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/
-    private/**nope*/ @Component/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-/////////////////
-// ENUM CONSTS //
-/////////////////
-
-enum AAAAAAA {
-    /**Javadoc*/
-    ONE/**nope*/,
-    /**Javadoc*/
-    TWO/**nope*/
-}
-
-enum BBBBBBB {
-    /**Javadoc*/
-    ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
-    /**Javadoc*/
-    TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
-    BBBBBBB(int i){}
-}
-
-enum CCCCCCC {
-    /**Javadoc*/
-    @Component/**nope*/ ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
-    /**Javadoc*/
-    @Component/**nope*/ TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
-    CCCCCCC(int i){}
-}
-
-/**Javadoc*/
-@Retention(/**nope*/RetentionPolicy/**nope*/./**nope*/RUNTIME/**nope4*/)/**nope*/
-@Target(/**nope*/{/**nope*/ElementType/**nope*/./**nope*/CONSTRUCTOR/**nope*/, /**nope*/ElementType/**nope*/./**nope*/FIELD/**nope*/
-    , /**nope*/ElementType/**nope*/./**nope*/LOCAL_VARIABLE/**nope*/, /**nope*/ElementType/**nope*/./**nope*/METHOD
-    , /**nope*/ElementType/**nope*/./**nope*/PARAMETER/**nope*/, /**nope*/ElementType/**nope*/./**nope*/TYPE/**nope*/}/**nope*/)/**nope*/
-@interface/**nope*/ Component1/**nope*/ {/**nope*/
-}
-
-/**Javadoc*/
-@interface/**nope*/ MyAnnotation/**nope*/ {
-    /**Javadoc*/
-    @Component/**nope*/abstract/**nope*/String/**nope*/val1()/**nope*/default/**nope*/"";
-    /**Javadoc*/
-    abstract/**nope*/String/**nope*/val2()/**nope*/;
-    /**Javadoc*/
-    java.lang.String/**nope*/val3()/**nope*/;
-    /**nope*/
-}
-
-class MyTemp1 {
-    /**Javadoc*/ //noise
-    private @interface/**nope*/ MyAnnotation3/**nope*/ {/**nope*/
-    }
-}
-
-/**nope*/
-/*noise*/
-/**nope*/
-/**Javadoc*/
-//noise
-@Component
-/*noise*/
-interface MultipleJavadoc {
-    /**nope*/
-    /*noise*/
-    /**nope*/
-    /**Javadoc*/
-    /* noise */
-    public /**nope*/ int method();
-    /**nope*/
-    /*noise*/
-    /**nope*/
-    /**Javadoc*/
-    // noise
-    @Deprecated
-    // noise
-    /**nope*/
-    public /**nope*/ void method2();
-}
-
-/**nope*/
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionOne.java
new file mode 100644
index 00000000000..1209f3d5c67
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionOne.java
@@ -0,0 +1,108 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocCatchCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/////////////
+// CLASSES //
+/////////////
+
+/**Javadoc*/
+class/**nope*/ InputAbstractJavadocPositionOne/**nope*/{
+    /**Javadoc*/
+    protected/**nope*/ class/**nope*/ B/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ class/**nope*/ C/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ class/**nope*/ D/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ class/**nope*/ E/**nope*/{/**nope*/}
+
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ class/**nope*/ F/**nope*/{/**nope*/}
+}
+
+//////////////////
+// CONSTRUCTORS //
+//////////////////
+
+/**Javadoc*/
+class/**nope*/ AA/**nope*/{
+    /**Javadoc*/
+    AA/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+/**Javadoc*/
+class/**nope*/ BB/**nope*/{
+    /**Javadoc*/
+    private/**nope1*/ BB/**nope2*/(/**nope3*/)/**nope4*/{/**nope5*/}/**nope6*/
+}
+
+class/**nope*/ DD/**nope*/{
+    /**Javadoc*/
+    @Component/**nope*/ DD/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class/**nope*/ EE/**nope*/{
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ EE/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class/**nope*/ FF/**nope*/{
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ FF/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+/////////////
+// METHODS //
+/////////////
+
+class AAA {
+    /**Javadoc*/
+    void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class BBB {
+    /**Javadoc*/
+    private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class CCC {
+    /**Javadoc*/
+    static/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class DDD {
+    /**Javadoc*/
+    @Component/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class EEE {
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class FFF {
+    /**Javadoc*/
+    static/**nope*/ @Component/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class GGG {
+    /**Javadoc*/
+    void/**nope*/ a/**nope*/(@Component/**nope*/int/**nope*/ a/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class HHH {
+    /**Javadoc*/
+    java.lang.String/**nope*/ a/**nope*/()/**nope*/{/**nope*/return null;/**nope*/}/**nope*/
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionOnlyComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionOnlyComments.java
index 299f2e7ae67..c9425368364 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionOnlyComments.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionOnlyComments.java
@@ -1,7 +1,8 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocCatchCheck
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 /** Javadoc for import */ // ok
 import java.io.Serializable;
-
-/*
- * Config: JavadocCatchCheck
- */
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionThree.java
new file mode 100644
index 00000000000..8a35d8f6ed7
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionThree.java
@@ -0,0 +1,92 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocCatchCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/////////////////
+// ENUM CONSTS //
+/////////////////
+
+class InputAbstractJavadocPositionThree {
+    enum AAAAAAA {
+        /**Javadoc*/
+        ONE/**nope*/,
+        /**Javadoc*/
+        TWO/**nope*/
+    }
+
+    enum BBBBBBB {
+        /**Javadoc*/
+        ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
+        /**Javadoc*/
+        TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
+        BBBBBBB(int i){}
+    }
+
+    enum CCCCCCC {
+        /**Javadoc*/
+        @Component/**nope*/ ONE/**nope*/(/**nope*/1/**nope*/)/**nope*/,
+        /**Javadoc*/
+        @Component/**nope*/ TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
+        CCCCCCC(int i){}
+    }
+}
+
+/**Javadoc*/
+@Retention(/**nope*/RetentionPolicy/**nope*/./**nope*/RUNTIME/**nope4*/)/**nope*/
+@Target(/**nope*/{/**nope*/ElementType/**nope*/./**nope*/CONSTRUCTOR/**nope*/, /**nope*/ElementType/**nope*/./**nope*/FIELD/**nope*/
+    , /**nope*/ElementType/**nope*/./**nope*/LOCAL_VARIABLE/**nope*/, /**nope*/ElementType/**nope*/./**nope*/METHOD
+    , /**nope*/ElementType/**nope*/./**nope*/PARAMETER/**nope*/, /**nope*/ElementType/**nope*/./**nope*/TYPE/**nope*/}/**nope*/)/**nope*/
+@interface/**nope*/ Component1/**nope*/ {/**nope*/
+}
+
+/**Javadoc*/
+@interface/**nope*/ MyAnnotation/**nope*/ {
+    /**Javadoc*/
+    @Component/**nope*/abstract/**nope*/String/**nope*/val1()/**nope*/default/**nope*/"";
+    /**Javadoc*/
+    abstract/**nope*/String/**nope*/val2()/**nope*/;
+    /**Javadoc*/
+    java.lang.String/**nope*/val3()/**nope*/;
+    /**nope*/
+}
+
+class MyTemp1 {
+    /**Javadoc*/ //noise
+    private @interface/**nope*/ MyAnnotation3/**nope*/ {/**nope*/
+    }
+}
+
+/**nope*/
+/*noise*/
+/**nope*/
+/**Javadoc*/
+//noise
+@Component
+/*noise*/
+interface MultipleJavadoc {
+    /**nope*/
+    /*noise*/
+    /**nope*/
+    /**Javadoc*/
+    /* noise */
+    public /**nope*/ int method();
+    /**nope*/
+    /*noise*/
+    /**nope*/
+    /**Javadoc*/
+    // noise
+    @Deprecated
+    // noise
+    /**nope*/
+    public /**nope*/ void method2();
+}
+
+/**nope*/
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionTwo.java
new file mode 100644
index 00000000000..2540f3ea503
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionTwo.java
@@ -0,0 +1,111 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocCatchCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+///////////
+// ENUMS //
+///////////
+
+class InputAbstractJavadocPositionTwo {
+/**Javadoc*/
+enum/**nope*/ AAAAA/**nope*/ {}
+}
+
+////////////////
+// INTERFACES //
+////////////////
+
+/**Javadoc*/
+interface/**nope*/ AAAA/**nope*/ {}
+
+/**Javadoc*/
+abstract/**nope*/ interface/**nope*/ BBBB/**nope*/ {/**nope*/}
+
+/**Javadoc*/
+@Component/**nope*/ interface/**nope*/ CCCC/**nope*/ {/**nope*/}
+
+/**Javadoc*/
+@Component/**nope*/ abstract/**nope*/ interface/**nope*/ DDDD/**nope*/ {/**nope*/}
+
+/**Javadoc*/
+abstract/**nope*/ @Component/**nope*/ interface/**nope*/ EEEE/**nope*/ {/**nope*/}
+
+class ASD {
+    /**Javadoc*/
+    private/**nope*/ enum/**nope*/ BBBBB/**nope*/ {/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ enum/**nope*/ CCCCC/**nope*/ {/**nope*/}
+
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ enum/**nope*/ DDDDD/**nope*/ {/**nope*/}
+
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ enum/**nope*/ EEEEE/**nope*/ {/**nope*/}
+}
+
+////////////
+// FIELDS //
+////////////
+
+class AAAAAA {
+    /**Javadoc*/
+    int/**nope*/ a/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ int/**nope*/ b/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=1;
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=1;
+}
+
+class BBBBBB {
+    /**Javadoc*/
+    int/**nope*/ a/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ int/**nope*/ b/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=/**nope*/1/**nope*/;
+}
+
+
+class CCCCCC {
+    /**Javadoc*/
+    Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
+
+class DDDDDD {
+    /**Javadoc*/
+    @Component/**nope*/ Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    @Component/**nope*/ private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
+
+class EEEEEE {
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/
+    private/**nope*/ @Component/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineComments.java
deleted file mode 100644
index 442c14797ef..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineComments.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/*
- * Config: JavadocCatchCheck
- */
-
-/////////////
-// CLASSES //
-/////////////
-
-/**Javadoc*/ /*noise*/ //noise
-class/**nope*/ InputAbstractJavadocPositionWithSinglelineComments/**nope*/{ // ok
-    /**Javadoc*/ //noise
-    protected/**nope*/ class/**nope*/ N/**nope*/{/**nope*/}
-
-    /**Javadoc*/ //noise
-    private/**nope*/ static/**nope*/ class/**nope*/ X/**nope*/{/**nope*/}
-
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ class/**nope*/ Z/**nope*/{/**nope*/}
-
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ private/**nope*/ class/**nope*/ Y/**nope*/{/**nope*/}
-
-    /**Javadoc*/ //noise
-    private/**nope*/ @Component2/**nope*/ class/**nope*/ M/**nope*/{/**nope*/}
-}
-
-//////////////////
-// CONSTRUCTORS //
-//////////////////
-
-/**Javadoc*/ //noise
-class/**nope*/ VV/**nope*/{
-    /**Javadoc*/ //noise
-    VV/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-/**Javadoc*/ //noise
-class/**nope*/ NN/**nope*/{
-    /**Javadoc*/ //noise
-    private/**nope1*/ NN/**nope2*/(/**nope3*/)/**nope4*/{/**nope5*/}/**nope6*/
-}
-
-class/**nope*/ ZZ/**nope*/{
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ ZZ/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class/**nope*/ YY/**nope*/{
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ private/**nope*/ YY/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class/**nope*/ MM/**nope*/{
-    /**Javadoc*/ //noise
-    private/**nope*/ @Component2/**nope*/ MM/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-/////////////
-// METHODS //
-/////////////
-
-class VVV {
-    /**Javadoc*/ //noise
-    void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class NNN {
-    /**Javadoc*/ //noise
-    private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class XXX {
-    /**Javadoc*/ //noise
-    static/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class ZZZ {
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class YYY {
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class MMM {
-    /**Javadoc*/ //noise
-    static/**nope*/ @Component2/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class LKJ {
-    /**Javadoc*/ //noise
-    void/**nope*/ a/**nope*/(@Component2/**nope*/int/**nope*/ a/**nope*/)/**nope*/{/**nope*/}/**nope*/
-}
-
-class LKM {
-    /**Javadoc*/ //noise
-    java.lang.String/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/return null;/**nope*/}/**nope*/
-}
-
-////////////////
-// INTERFACES //
-////////////////
-
-/**Javadoc*/ //noise
-interface/**nope*/ VVVV/**nope*/ {}
-
-/**Javadoc*/ //noise
-abstract/**nope*/ interface/**nope*/ NNNN/**nope*/ {/**nope*/}
-
-/**Javadoc*/ //noise
-@Component2/**nope*/ interface/**nope*/ XXXX/**nope*/ {/**nope*/}
-
-/**Javadoc*/ //noise
-@Component2/**nope*/ abstract/**nope*/ interface/**nope*/ ZZZZ/**nope*/ {/**nope*/}
-
-/**Javadoc*/ //noise
-abstract/**nope*/ @Component2/**nope*/ interface/**nope*/ YYYY/**nope*/ {/**nope*/}
-
-///////////
-// ENUMS //
-///////////
-
-/**Javadoc*/ //noise
-enum/**nope*/ VVVVV/**nope*/ {}
-
-class VSZ {
-    /**Javadoc*/ //noise
-    private/**nope*/ enum/**nope*/ NNNNN/**nope*/ {/**nope*/}
-
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ enum/**nope*/ XXXXX/**nope*/ {/**nope*/}
-
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ private/**nope*/ enum/**nope*/ ZZZZZ/**nope*/ {/**nope*/}
-
-    /**Javadoc*/ //noise
-    private/**nope*/ @Component2/**nope*/ enum/**nope*/ YYYYY/**nope*/ {/**nope*/}
-}
-
-////////////
-// FIELDS //
-////////////
-
-class VVVVVV {
-    /**Javadoc*/ //noise
-    int/**nope*/ a/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ int/**nope*/ b/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=1;
-    /**Javadoc*/ //noise
-    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=1;
-}
-
-class NNNNNN {
-    /**Javadoc*/ //noise
-    int/**nope*/ a/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ int/**nope*/ b/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=/**nope*/1/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=/**nope*/1/**nope*/;
-}
-
-
-class XXXXXX {
-    /**Javadoc*/ //noise
-    Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-class ZZZZZZ {
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-class YYYYYY {
-    /*noise*/ /**Javadoc*/ //noise
-    private/**nope*/ @Component2/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ @Component2/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-    /**Javadoc*/ //noise
-    private/**nope*/ @Component2/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
-}
-
-/////////////////
-// ENUM CONSTS //
-/////////////////
-
-enum VVVVVVV {
-    /**Javadoc*/ //noise
-    ONY/**nope*/,
-    /**Javadoc*/ //noise
-    TWO/**nope*/
-}
-
-enum NNNNNNN {
-    /**Javadoc*/ /*noise*/ //noise
-    ONY/**nope*/(/**nope*/1/**nope*/)/**nope*/,
-    /**Javadoc*/ //noise
-    TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
-    NNNNNNN(int i){}
-}
-
-enum XXXXXXX {
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ ONY/**nope*/(/**nope*/1/**nope*/)/**nope*/,
-    /**Javadoc*/ //noise
-    @Component2/**nope*/ TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
-    XXXXXXX(int i){}
-}
-
-
-/**Javadoc*/ //noise
-@Retention(/**nope*/RetentionPolicy/**nope*/./**nope*/RUNTIME/**nope4*/)/**nope*/
-@Target(/**nope*/{/**nope*/ElementType/**nope*/./**nope*/CONSTRUCTOR/**nope*/, /**nope*/ElementType/**nope*/./**nope*/FIELD/**nope*/
-    , /**nope*/ElementType/**nope*/./**nope*/LOCAL_VARIABLE/**nope*/, /**nope*/ElementType/**nope*/./**nope*/METHOD
-    , /**nope*/ElementType/**nope*/./**nope*/PARAMETER/**nope*/, /**nope*/ElementType/**nope*/./**nope*/TYPE/**nope*/}/**nope*/)/**nope*/
-@interface/**nope*/ Component2/**nope*/ {/**nope*/
-}
-
-/**Javadoc*/ //noise
-@interface/**nope*/ MyAnnotation2/**nope*/ {
-    /**Javadoc*/ //noise
-    @Component2/**nope*/abstract/**nope*/String/**nope*/val1()/**nope*/default/**nope*/"";
-    /**Javadoc*/ //noise
-    abstract/**nope*/String/**nope*/val2()/**nope*/;
-    /**Javadoc*/ //noise
-    java.lang.String/**nope*/val3()/**nope*/;
-    /**nope*/
-}
-
-class MyTemp3 {
-    /**Javadoc*/ //noise
-    private @interface/**nope*/ MyAnnotation3/**nope*/ {/**nope*/
-    }
-}
-
-/**nope*/ /*noise*/ /**nope*/ /**Javadoc*/ //noise
-interface MultipleJavadocs2 {
-    /**nope*/ /*noise*/ /**nope*/ /**Javadoc*/ //noise
-    int method();
-    /**nope*/ /*noise*/ /**nope*/ /**Javadoc*/ //noise
-    @Deprecated
-    /**nope*/ /*noise*/ /**nope*/ //noise
-    public
-    /**nope*/ /*noise*/ /**nope*/ //noise
-    void method2();
-}
-
-/**nope*/
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsOne.java
new file mode 100644
index 00000000000..15ad25b8cb0
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsOne.java
@@ -0,0 +1,108 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocCatchCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/////////////
+// CLASSES //
+/////////////
+
+/**Javadoc*/ /*noise*/ //noise
+class/**nope*/ InputAbstractJavadocPositionWithSinglelineCommentsOne/**nope*/{
+    /**Javadoc*/ //noise
+    protected/**nope*/ class/**nope*/ N/**nope*/{/**nope*/}
+
+    /**Javadoc*/ //noise
+    private/**nope*/ static/**nope*/ class/**nope*/ X/**nope*/{/**nope*/}
+
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ class/**nope*/ Z/**nope*/{/**nope*/}
+
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ private/**nope*/ class/**nope*/ Y/**nope*/{/**nope*/}
+
+    /**Javadoc*/ //noise
+    private/**nope*/ @Component2/**nope*/ class/**nope*/ M/**nope*/{/**nope*/}
+}
+
+//////////////////
+// CONSTRUCTORS //
+//////////////////
+
+/**Javadoc*/ //noise
+class/**nope*/ VV/**nope*/{
+    /**Javadoc*/ //noise
+    VV/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+/**Javadoc*/ //noise
+class/**nope*/ NN/**nope*/{
+    /**Javadoc*/ //noise
+    private/**nope1*/ NN/**nope2*/(/**nope3*/)/**nope4*/{/**nope5*/}/**nope6*/
+}
+
+class/**nope*/ ZZ/**nope*/{
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ ZZ/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class/**nope*/ YY/**nope*/{
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ private/**nope*/ YY/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class/**nope*/ MM/**nope*/{
+    /**Javadoc*/ //noise
+    private/**nope*/ @Component2/**nope*/ MM/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+/////////////
+// METHODS //
+/////////////
+
+class VVV {
+    /**Javadoc*/ //noise
+    void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class NNN {
+    /**Javadoc*/ //noise
+    private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class XXX {
+    /**Javadoc*/ //noise
+    static/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class ZZZ {
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class YYY {
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class MMM {
+    /**Javadoc*/ //noise
+    static/**nope*/ @Component2/**nope*/ private/**nope*/ void/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class LKJ {
+    /**Javadoc*/ //noise
+    void/**nope*/ a/**nope*/(@Component2/**nope*/int/**nope*/ a/**nope*/)/**nope*/{/**nope*/}/**nope*/
+}
+
+class LKM {
+    /**Javadoc*/ //noise
+    java.lang.String/**nope*/ a/**nope*/(/**nope*/)/**nope*/{/**nope*/return null;/**nope*/}/**nope*/
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsThree.java
new file mode 100644
index 00000000000..be99fb2599b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsThree.java
@@ -0,0 +1,79 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocCatchCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/////////////////
+// ENUM CONSTS //
+/////////////////
+
+class InputAbstractJavadocPositionWithSinglelineCommentsThree {
+    enum VVVVVVV {
+        /**Javadoc*/ //noise
+        ONY/**nope*/,
+        /**Javadoc*/ //noise
+        TWO/**nope*/
+    }
+
+    enum NNNNNNN {
+        /**Javadoc*/ /*noise*/ //noise
+        ONY/**nope*/(/**nope*/1/**nope*/)/**nope*/,
+        /**Javadoc*/ //noise
+        TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
+        NNNNNNN(int i){}
+    }
+
+    enum XXXXXXX {
+        /**Javadoc*/ //noise
+        @Component2/**nope*/ ONY/**nope*/(/**nope*/1/**nope*/)/**nope*/,
+        /**Javadoc*/ //noise
+        @Component2/**nope*/ TWO/**nope*/(/**nope*/2/**nope*/)/**nope*/;
+        XXXXXXX(int i){}
+    }
+}
+
+/**Javadoc*/ //noise
+@Retention(/**nope*/RetentionPolicy/**nope*/./**nope*/RUNTIME/**nope4*/)/**nope*/
+@Target(/**nope*/{/**nope*/ElementType/**nope*/./**nope*/CONSTRUCTOR/**nope*/, /**nope*/ElementType/**nope*/./**nope*/FIELD/**nope*/
+    , /**nope*/ElementType/**nope*/./**nope*/LOCAL_VARIABLE/**nope*/, /**nope*/ElementType/**nope*/./**nope*/METHOD
+    , /**nope*/ElementType/**nope*/./**nope*/PARAMETER/**nope*/, /**nope*/ElementType/**nope*/./**nope*/TYPE/**nope*/}/**nope*/)/**nope*/
+@interface/**nope*/ Component2/**nope*/ {/**nope*/
+}
+
+/**Javadoc*/ //noise
+@interface/**nope*/ MyAnnotation2/**nope*/ {
+    /**Javadoc*/ //noise
+    @Component2/**nope*/abstract/**nope*/String/**nope*/val1()/**nope*/default/**nope*/"";
+    /**Javadoc*/ //noise
+    abstract/**nope*/String/**nope*/val2()/**nope*/;
+    /**Javadoc*/ //noise
+    java.lang.String/**nope*/val3()/**nope*/;
+    /**nope*/
+}
+
+class MyTemp3 {
+    /**Javadoc*/ //noise
+    private @interface/**nope*/ MyAnnotation3/**nope*/ {/**nope*/
+    }
+}
+
+/**nope*/ /*noise*/ /**nope*/ /**Javadoc*/ //noise
+interface MultipleJavadocs2 {
+    /**nope*/ /*noise*/ /**nope*/ /**Javadoc*/ //noise
+    int method();
+    /**nope*/ /*noise*/ /**nope*/ /**Javadoc*/ //noise
+    @Deprecated
+    /**nope*/ /*noise*/ /**nope*/ //noise
+    public
+    /**nope*/ /*noise*/ /**nope*/ //noise
+    void method2();
+}
+
+/**nope*/
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsTwo.java
new file mode 100644
index 00000000000..67b40ab5f16
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocPositionWithSinglelineCommentsTwo.java
@@ -0,0 +1,111 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$JavadocCatchCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+///////////
+// ENUMS //
+///////////
+
+class InputAbstractJavadocPositionWithSinglelineCommentsTwo {
+    /**Javadoc*/ //noise
+    enum/**nope*/ VVVVV/**nope*/ {}
+}
+
+class VSZ {
+    /**Javadoc*/ //noise
+    private/**nope*/ enum/**nope*/ NNNNN/**nope*/ {/**nope*/}
+
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ enum/**nope*/ XXXXX/**nope*/ {/**nope*/}
+
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ private/**nope*/ enum/**nope*/ ZZZZZ/**nope*/ {/**nope*/}
+
+    /**Javadoc*/ //noise
+    private/**nope*/ @Component2/**nope*/ enum/**nope*/ YYYYY/**nope*/ {/**nope*/}
+}
+
+////////////////
+// INTERFACES //
+////////////////
+
+/**Javadoc*/ //noise
+interface/**nope*/ VVVV/**nope*/ {}
+
+/**Javadoc*/ //noise
+abstract/**nope*/ interface/**nope*/ NNNN/**nope*/ {/**nope*/}
+
+/**Javadoc*/ //noise
+@Component2/**nope*/ interface/**nope*/ XXXX/**nope*/ {/**nope*/}
+
+/**Javadoc*/ //noise
+@Component2/**nope*/ abstract/**nope*/ interface/**nope*/ ZZZZ/**nope*/ {/**nope*/}
+
+/**Javadoc*/ //noise
+abstract/**nope*/ @Component2/**nope*/ interface/**nope*/ YYYY/**nope*/ {/**nope*/}
+
+////////////
+// FIELDS //
+////////////
+
+class VVVVVV {
+    /**Javadoc*/ //noise
+    int/**nope*/ a/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ int/**nope*/ b/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=1;
+    /**Javadoc*/ //noise
+    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=1;
+}
+
+class NNNNNN {
+    /**Javadoc*/ //noise
+    int/**nope*/ a/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ int/**nope*/ b/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ final/**nope*/ int/**nope*/ c/**nope*/=/**nope*/1/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ static/**nope*/ final/**nope*/ int/**nope*/ d/**nope*/=/**nope*/1/**nope*/;
+}
+
+
+class XXXXXX {
+    /**Javadoc*/ //noise
+    Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
+
+class ZZZZZZ {
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ Object/**nope*/ a/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ private/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ private/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    @Component2/**nope*/ private/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
+
+class YYYYYY {
+    /*noise*/ /**Javadoc*/ //noise
+    private/**nope*/ @Component2/**nope*/ Object/**nope*/ b/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ @Component2/**nope*/ final/**nope*/ Object/**nope*/ c/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+    /**Javadoc*/ //noise
+    private/**nope*/ @Component2/**nope*/ static/**nope*/ final/**nope*/ Object/**nope*/ d/**nope*/ =/**nope*/ new/**nope*/ Object/**nope*/(/**nope*/)/**nope*/{/**nope*/}/**nope*/;
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensFail.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensFail.java
index fd6b3a61d30..4afcb7b07a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensFail.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensFail.java
@@ -1,9 +1,10 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TokenIsNotInAcceptablesJavadocCheck
- * javadocTokens: RETURN_LITERAL
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$TokenIsNotInAcceptablesCheck
+javadocTokens: RETURN_LITERAL
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /** Javadoc */
 public class InputAbstractJavadocTokensFail { // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensPass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensPass.java
index 8c647b966ea..4c3c96b6f20 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensPass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocTokensPass.java
@@ -1,9 +1,10 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TokenIsNotInAcceptablesJavadocCheck
- * javadocTokens: DEPRECATED_LITERAL
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$TokenIsNotInAcceptablesCheck
+javadocTokens: DEPRECATED_LITERAL
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /** Javadoc */
 public class InputAbstractJavadocTokensPass { // ok
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocUnclosedTagAndInvalidAtSeeReference.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocUnclosedTagAndInvalidAtSeeReference.java
index 9de2d72b663..15124927dea 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocUnclosedTagAndInvalidAtSeeReference.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocUnclosedTagAndInvalidAtSeeReference.java
@@ -1,19 +1,22 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 /**
  * <unclosedTag>
  */
-// violation above 'Unclosed HTML tag found: unclosedTag'
+// violation 2 lines above 'Javadoc comment at column 4 has parse error.'
+// Missed HTML close tag 'unclosedTag'. Sometimes it means that close tag missed for
+// one of previous tags.
 class InputAbstractJavadocUnclosedTagAndInvalidAtSeeReference {
     /**
      * @see javax.swing.tree.DefaultTreeCellRenderer.getTreeCellRendererComponent()
      */
-    // violation above 'Javadoc comment at column 82 has parse error.
-    // Details: mismatched input '(' expecting <EOF> while parsing JAVADOC'
+    // violation 2 lines above 'Javadoc comment at column 82 has parse error.'
+    // Details: mismatched input '(' expecting <EOF> while parsing JAVADOC
     void invalidAtSeeReference() {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocWrongSingletonTagInJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocWrongSingletonTagInJavadoc.java
index 1acc633e941..ddf8ac077a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocWrongSingletonTagInJavadoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/abstractjavadoc/InputAbstractJavadocWrongSingletonTagInJavadoc.java
@@ -1,42 +1,43 @@
-package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
-
 /*
- * Config: TempCheck
- */
+com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheckTest$ParseJavadocOnlyCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.abstractjavadoc;
 
 public class InputAbstractJavadocWrongSingletonTagInJavadoc {
     /**
      * </embed>
      */
-    // violation above 'Javadoc comment at column 9 has parse error.
-    // It is forbidden to close singleton HTML tags. Tag: embed.'
+    // violation 2 lines above 'Javadoc comment at column 9 has parse error.'
+    // It is forbidden to close singleton HTML tags. Tag: embed.
     private int field1;
 
     /**
      * </keygen>
      */
-    // violation above 'Javadoc comment at column 9 has parse error.
-    // It is forbidden to close singleton HTML tags. Tag: keygen.'
+    // violation 2 lines above 'Javadoc comment at column 9 has parse error.'
+    // It is forbidden to close singleton HTML tags. Tag: keygen.
     private int field2;
 
     /**
      * </SOURCE>
      */
-    // violation above 'Javadoc comment at column 9 has parse error.
-    // It is forbidden to close singleton HTML tags. Tag: SOURCE.'
+    // violation 2 lines above 'Javadoc comment at column 9 has parse error.'
+    // It is forbidden to close singleton HTML tags. Tag: SOURCE.
     private int field3;
 
     /**
      * </TRACK>
      */
-    // violation above 'Javadoc comment at column 9 has parse error.
-    // It is forbidden to close singleton HTML tags. Tag: TRACK.'
+    // violation 2 lines above 'Javadoc comment at column 9 has parse error.'
+    // It is forbidden to close singleton HTML tags. Tag: TRACK.
     private int field4;
 
     /**
      * </WBR>
      */
-    // violation above 'Javadoc comment at column 9 has parse error.
-    // It is forbidden to close singleton HTML tags. Tag: WBR.'
+    // violation 2 lines above 'Javadoc comment at column 9 has parse error.'
+    // It is forbidden to close singleton HTML tags. Tag: WBR.
     private int field5;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrder1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrder1.java
index 55192b4cb39..35e7e5276fb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrder1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrder1.java
@@ -11,7 +11,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
 
-// ok
 /**
  * Some javadoc.
  *
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect1.java
index d8aedcc77aa..7c572aa3fea 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect1.java
@@ -20,7 +20,7 @@
  * @version 1.0
  * @see Some javadoc.
  * @since Some javadoc.
- * @deprecated Some javadoc. // ok
+ * @deprecated Some javadoc.
  */
 class InputAtclauseOrderCorrect1 implements Serializable
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect2.java
index d514cde9672..fc7d91ce833 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect2.java
@@ -30,7 +30,7 @@ class InnerClassWithAnnotations2
          * @throws Exception Some text.
          * @deprecated Some text.
          */
-        String method(String aString) throws Exception { // ok
+        String method(String aString) throws Exception {
             return "null";
         }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect3.java
index 7827e0efe2c..189ad53f8f8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect3.java
@@ -26,7 +26,7 @@ class InnerClassWithAnnotations3 {
          * @throws Exception Some text.
          * @deprecated Some text.
          */
-        void method3() throws Exception { // ok
+        void method3() throws Exception {
         }
 
         /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect4.java
index 1b37de2db9a..622ee556dfb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderCorrect4.java
@@ -30,7 +30,7 @@ class InnerClassWithAnnotations4 {
           * @serialData Some javadoc.
           * @deprecated Some text.
           */
-         String method5(String aString) { // ok
+         String method5(String aString) {
              return "null";
          }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrect4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrect4.java
index f065990535e..b041dbfc5a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrect4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrect4.java
@@ -39,7 +39,7 @@ class InnerClassWithAnnotations4 {
          * @deprecated Some text.
          * @return Some text. // violation
          */
-        String method5(String aString) { // ok
+        String method5(String aString) {
             return "null";
         }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrectCustom1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrectCustom1.java
index f37daa7c6e4..f6e5b9723dd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrectCustom1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/InputAtclauseOrderIncorrectCustom1.java
@@ -49,7 +49,7 @@ class InputAtclauseOrderIncorrectCustom1 implements Serializable
      * @deprecated Some text.
      * @throws Exception Some text.
      */
-    String method(String aString) throws Exception { // ok
+    String method(String aString) throws Exception {
         return "null";
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/InputJavadocContentLocationTrailingSpace.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/InputJavadocContentLocationTrailingSpace.java
index d4d9586041e..fb324092f67 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/InputJavadocContentLocationTrailingSpace.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/InputJavadocContentLocationTrailingSpace.java
@@ -10,63 +10,63 @@
 public interface InputJavadocContentLocationTrailingSpace {
 
     /**  
-     * ^^ There is a trailing space in the first line // ok
+     * ^^ There is a trailing space in the first line
      */
     void space();
 
     /**********************
-     * Trailing asterisks in the first line // OK
+     * Trailing asterisks in the first line
      *
      **********************/
     void asterisk();
 
     /** ******
-     * There is a space, then leading asterisks in the first line // OK
+     * There is a space, then leading asterisks in the first line
      */
     void spaceAsterisk();
 
     /**********************              
-     * Trailing asterisks, then spaces ^^ in the first line // OK
+     * Trailing asterisks, then spaces ^^ in the first line
      *
      **********************/
     void asteriskSpace();
 
     /**      ***************************************            
-     * There is a spaces, then leading asterisks, then spaces ^^ in the first line // OK
+     * There is a spaces, then leading asterisks, then spaces ^^ in the first line
      */
     void spaceAsteriskSpace();
 
     /*** **
      * There is an extra asterisk after the Javadoc start,
-     * then a space, then leading asterisks in the first line // OK
+     * then a space, then leading asterisks in the first line
      * The generated javadoc will be "There is an extra ..."
      */
     void asteriskSpaceAsterisk();
 
     /**   *  ***
      * There is a space, then a leading asterisk, then a space,
-     * then asterisks in the first line // OK
+     * then asterisks in the first line
      * The generated javadoc will be "*** There is a space ..."
      */
     void spaceAsteriskSpaceAsterisk();
 
     /*** **  
      * There is an extra asterisk after the Javadoc start,
-     * then a space, then leading asterisks, then a space in the first line // OK
+     * then a space, then leading asterisks, then a space in the first line
      * The generated javadoc will be "There is an extra ..."
      */
     void asteriskSpaceAsteriskSpace();
 
     /**   *  ***   
      * There is a space, then a leading asterisk, then a space again,
-     * then asterisks, then third space in the first line // OK
+     * then asterisks, then third space in the first line
      * The generated javadoc will be "*** There is a space ..."
      */
     void spaceAsteriskSpaceAsteriskSpace();
 
     /*** **  **
      * There is an extra asterisk after the Javadoc start, then a space, 
-     * then leading asterisks, then a space, then third asterisk in the first line // OK
+     * then leading asterisks, then a space, then third asterisk in the first line
      * The generated javadoc will be "** There is an extra ..."
      */
     void asteriskSpaceAsteriskSpaceAsterisk();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodExtraThrows.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodExtraThrows.java
index 68ce626e29a..869cab3d974 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodExtraThrows.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodExtraThrows.java
@@ -21,10 +21,10 @@ public class InputJavadocMethodExtraThrows {
     /**
      * Extra throws in javadoc it is ok.
      * @param properties some value
-     * @throws IllegalArgumentException when argument is wrong // ok
-     * @throws NullPointerException indicates null was passed // ok
+     * @throws IllegalArgumentException when argument is wrong
+     * @throws NullPointerException indicates null was passed
      */
-    public InputJavadocMethodExtraThrows(String properties) { // ok
+    public InputJavadocMethodExtraThrows(String properties) {
         // here is NPE possible
         if (properties.charAt(0) == 0) {
             throw new IllegalArgumentException("cannot have char with code 0");
@@ -34,10 +34,10 @@ public InputJavadocMethodExtraThrows(String properties) { // ok
     /**
      * Extra throws in javadoc it is ok
      * @param properties some value
-     * @throws java.lang.IllegalArgumentException when argument is wrong // ok
-     * @throws java.lang.NullPointerException indicates null was passed // ok
+     * @throws java.lang.IllegalArgumentException when argument is wrong
+     * @throws java.lang.NullPointerException indicates null was passed
      */
-    public void doSomething(String properties) throws IllegalArgumentException { // ok
+    public void doSomething(String properties) throws IllegalArgumentException {
         // here is NPE possible
         if (properties.charAt(0) == 0) {
             throw new IllegalArgumentException("cannot have char with code 0");
@@ -47,8 +47,8 @@ public void doSomething(String properties) throws IllegalArgumentException { //
     /**
      * declared exception in method signature is missed in javadoc
      * @param properties some value
-     * @throws java.lang.IllegalArgumentException when argument is wrong // ok
-     * @throws java.lang.NullPointerException indicates null was passed // ok
+     * @throws java.lang.IllegalArgumentException when argument is wrong
+     * @throws java.lang.NullPointerException indicates null was passed
      */
     // violation below 'Expected @throws tag for 'IllegalStateException'.'
     public void doSomething2(String properties) throws IllegalStateException {
@@ -61,9 +61,9 @@ public void doSomething2(String properties) throws IllegalStateException {
     /**
      * exception is explitly thrown in code missed in javadoc
      * @param properties some value
-     * @throws java.lang.IllegalStateException when argument is wrong // ok
+     * @throws java.lang.IllegalStateException when argument is wrong
      */
-    public void doSomething3(String properties) throws IllegalStateException { // ok
+    public void doSomething3(String properties) throws IllegalStateException {
         // here is NPE possible
         if (properties.charAt(0) == 0) {
             // violation below 'Expected @throws tag for 'IllegalArgumentException'.'
@@ -74,9 +74,9 @@ public void doSomething3(String properties) throws IllegalStateException { // ok
     /**
      * exception is explitly thrown in code missed in javadoc
      * @param properties some value
-     * @throws java.lang.IllegalStateException when argument is wrong // ok
+     * @throws java.lang.IllegalStateException when argument is wrong
      */
-    public void doSomething4(String properties) { // ok
+    public void doSomething4(String properties) {
         // here is NPE possible
         if (properties.charAt(0) == 0) {
             // violation below 'Expected @throws tag for 'IllegalArgumentException'.'
@@ -87,7 +87,7 @@ public void doSomething4(String properties) { // ok
     /**
      * exception is explitly thrown in code missed in javadoc
      * @param properties some value
-     * @throws java.lang.IllegalStateException when argument is wrong // ok
+     * @throws java.lang.IllegalStateException when argument is wrong
      */
     public void doSomething5(String properties) {
         // here is NPE possible
@@ -99,11 +99,11 @@ public void doSomething5(String properties) {
     }
 
     /**
-     * expicitly throwed is declared in javadoc // ok
+     * expicitly throwed is declared in javadoc
      * @param properties some value
-     * @throws IllegalArgumentException when argument is wrong // ok
+     * @throws IllegalArgumentException when argument is wrong
      */
-    public void doSomething6(String properties) { // ok
+    public void doSomething6(String properties) {
         // here is NPE possible
         if (properties.charAt(0) == 0) {
             throw new java.lang.IllegalArgumentException("cannot have char with code 0");
@@ -111,14 +111,14 @@ public void doSomething6(String properties) { // ok
     }
 
     /**
-     * expicitly throwed  but throwed as variable, we do not catch this for now // ok
+     * expicitly throwed  but throwed as variable, we do not catch this for now
      * @param properties some value
      */
-    public void doSomething7(String properties) { // ok
+    public void doSomething7(String properties) {
         // here is NPE possible
         if (properties.charAt(0) == 0) {
             IllegalArgumentException exception =
-                    new IllegalArgumentException("cannot have char with code 0"); // ok
+                    new IllegalArgumentException("cannot have char with code 0");
             throw exception;
         }
     }
@@ -131,7 +131,7 @@ public void doSomething7(String properties) { // ok
      * @param file some file
      * @throws IOException if some problem
      */
-    public void doSomething8(File file) throws IOException { // ok
+    public void doSomething8(File file) throws IOException {
         if (file == null) {
             // violation below 'Expected @throws tag for 'FileNotFoundException'.'
             throw new FileNotFoundException();
@@ -146,9 +146,9 @@ public void doSomething8(File file) throws IOException { // ok
     * @throws IOException if some problem
     * @throws FileNotFoundException if file is not found
     */
-    public void doSomething9(File file) throws IOException { // ok
+    public void doSomething9(File file) throws IOException {
         if (file == null) {
-            throw new FileNotFoundException(); // ok
+            throw new FileNotFoundException();
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodProtectedScopeJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodProtectedScopeJavadoc.java
index 6b6414ca488..61f9e04dc21 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodProtectedScopeJavadoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodProtectedScopeJavadoc.java
@@ -12,9 +12,9 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocmethod;
 
-public class InputJavadocMethodProtectedScopeJavadoc // ignore - need javadoc // ok
+public class InputJavadocMethodProtectedScopeJavadoc // ignore - need javadoc
 {
-    private interface InnerInterface // ignore - when not relaxed about Javadoc // ok
+    private interface InnerInterface // ignore - when not relaxed about Javadoc
     {
         String CONST = "InnerInterface"; // ignore - w.n.r.a.j
         void method(); // ignore - when not relaxed about Javadoc
@@ -33,7 +33,7 @@ private InnerInnerClass()
             void method2() // ignore - when not relaxed about Javadoc
             {
                 final Runnable r = new Runnable() {
-                    public void run() {}; // ok
+                    public void run() {};
                 };
             }
         }
@@ -54,32 +54,32 @@ void method() // ignore - when not relaxed about Javadoc
     public int aFreddo; // ignore
 
     // ignore - need Javadoc
-    private InputJavadocMethodProtectedScopeJavadoc(int aA) // ok
+    private InputJavadocMethodProtectedScopeJavadoc(int aA)
     {
     }
 
     // ignore - need Javadoc when not relaxed
-    InputJavadocMethodProtectedScopeJavadoc(String aA) // ok
+    InputJavadocMethodProtectedScopeJavadoc(String aA)
     {
     }
 
     // ignore - always need javadoc
-    protected InputJavadocMethodProtectedScopeJavadoc(Object aA) // ok
+    protected InputJavadocMethodProtectedScopeJavadoc(Object aA)
     {
     }
 
     // ignore - always need javadoc
-    public InputJavadocMethodProtectedScopeJavadoc(Class<Object> aA) // ok
+    public InputJavadocMethodProtectedScopeJavadoc(Class<Object> aA)
     {
     }
 
     /** Here should not be an error, Out of scope */
-    private void method(int aA) // ok
+    private void method(int aA)
     {
     }
 
     /** Here should not be an error, Out of scope */
-    void method(Long aA) // ok
+    void method(Long aA)
     {
     }
 
@@ -99,26 +99,26 @@ public void method(StringBuffer aA) // violation 'Expected @param tag for 'aA'.'
      Writing a little documentation should not be worse than not
      writing any documentation at all.
      */
-    private void method(String aA) // ok
+    private void method(String aA)
     {
     }
 
     /**
      This inner class has no author tag, which is OK.
      */
-    public class InnerWithoutAuthor // ok
+    public class InnerWithoutAuthor
     {
 
     }
 
     /** {@inheritDoc} */
-    public String toString() // ok
+    public String toString()
     {
         return super.toString();
     }
 
     @Deprecated @Override
-    public int hashCode() // ok
+    public int hashCode()
     {
         return super.hashCode();
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodScopeInnerInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodScopeInnerInterfaces.java
index e9845353e96..a982c0fffc2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodScopeInnerInterfaces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodScopeInnerInterfaces.java
@@ -16,7 +16,7 @@ public class InputJavadocMethodScopeInnerInterfaces
 {
     // inner interfaces with different scopes
 
-    private interface PrivateInterface // ok
+    private interface PrivateInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -25,7 +25,7 @@ private interface PrivateInterface // ok
         void mb();
     }
 
-    interface PackageInnerInterface // ok
+    interface PackageInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -34,7 +34,7 @@ interface PackageInnerInterface // ok
         void mb();
     }
 
-    protected interface ProtectedInnerInterface // ok
+    protected interface ProtectedInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -43,7 +43,7 @@ protected interface ProtectedInnerInterface // ok
         void mb();
     }
 
-    public interface PublicInnerInterface // ok
+    public interface PublicInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -54,29 +54,29 @@ public interface PublicInnerInterface // ok
 
     private
     class
-    MyClass1 { // ok
+    MyClass1 {
     }
 
     class
-    MyClass2 { // ok
+    MyClass2 {
     }
 
     private
     interface
-    MyInterface1 { // ok
+    MyInterface1 {
     }
 
     interface
-    MyInterface2 { // ok
+    MyInterface2 {
     }
 
     protected
     enum
-    MyEnum { // ok
+    MyEnum {
     }
 
     private
     @interface
-    MyAnnotation { // ok
+    MyAnnotation {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodSetterGetter.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodSetterGetter.java
index 92394e972bd..fdfe719ecd0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodSetterGetter.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmethod/InputJavadocMethodSetterGetter.java
@@ -14,75 +14,75 @@
 
 public class InputJavadocMethodSetterGetter
 {
-    private int mNumber; // ok
+    private int mNumber;
 
-    public void setNumber(final int number) // ok
+    public void setNumber(final int number)
     {
         mNumber = number;
     }
 
-    public int getNumber() // ok
+    public int getNumber()
     {
         return mNumber;
     }
 
-    public void setNumber1() // ok
+    public void setNumber1()
     {
         mNumber = mNumber;
     }
 
-    public void setNumber2(int number) // ok
+    public void setNumber2(int number)
     {
         mNumber = number;
         firePropertyChanged();
     }
 
-    public void getNumber2() // ok
+    public void getNumber2()
     {
     }
 
-    public int getCost1(int forMe) // ok
+    public int getCost1(int forMe)
     {
         return 666;
     }
 
-    public int getCost2() // ok
+    public int getCost2()
     {
             mNumber = 4;
         return 666;
     }
 
-    public int getCost3() throws Exception // ok
+    public int getCost3() throws Exception
     {
         return 666;
     }
 
-    public boolean isSomething() // ok
+    public boolean isSomething()
     {
         return false;
     }
 
-    private void firePropertyChanged(){} // ok
+    private void firePropertyChanged(){}
 
-    Object setObject(Object object) { // ok
+    Object setObject(Object object) {
         return new Object();
     }
 
-    Object getNext() { // ok
+    Object getNext() {
         throw new UnsupportedOperationException();
     }
 
-    public void setWithoutAssignment(Object object) { // ok
+    public void setWithoutAssignment(Object object) {
         object.notify();
     }
 
-    InputJavadocMethodSetterGetter() {} // ok
+    InputJavadocMethodSetterGetter() {}
 
-    public InputJavadocMethodSetterGetter(Object object) throws Exception {} // ok
+    public InputJavadocMethodSetterGetter(Object object) throws Exception {}
 
 }
 
-interface TestInterface { // ok
+interface TestInterface {
     void setObject(Object object);
 
     Object getObject();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValid.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValid.java
index e3d4f705a64..aa858b71bef 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValid.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValid.java
@@ -8,9 +8,9 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocmissingwhitespaceafterasterisk;
 
 /***
- * Some Javadoc. // ok
+ * Some Javadoc.
  *
- * <p>Some Javadoc. // ok
+ * <p>Some Javadoc.
  ***/
 class InputJavadocMissingWhitespaceAfterAsteriskValid
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValidWithTab.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValidWithTab.java
index 703cca357b7..cee14cfe558 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValidWithTab.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingwhitespaceafterasterisk/InputJavadocMissingWhitespaceAfterAsteriskValidWithTab.java
@@ -8,9 +8,9 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocmissingwhitespaceafterasterisk;
 
 /***
- *	Some Javadoc with tab. // ok
+ *	Some Javadoc with tab.
  *
- *	<p>Some Javadoc with tab. // ok
+ *	<p>Some Javadoc with tab.
  ***/
 class InputJavadocMissingWhitespaceAfterAsteriskValidWithTab
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocpackage/pkghtml/InputJavadocPackageHtmlIgnored2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocpackage/pkghtml/InputJavadocPackageHtmlIgnored2.java
index 5e27e5b7350..013aa863ba7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocpackage/pkghtml/InputJavadocPackageHtmlIgnored2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocpackage/pkghtml/InputJavadocPackageHtmlIgnored2.java
@@ -6,7 +6,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocpackage.pkghtml;      // ok
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocpackage.pkghtml;
 
 
 class InputJavadocPackageHtmlIgnored2 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocparagraph/InputJavadocParagraphCorrect.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocparagraph/InputJavadocParagraphCorrect.java
index 3885baf54eb..d6d6aadd108 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocparagraph/InputJavadocParagraphCorrect.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocparagraph/InputJavadocParagraphCorrect.java
@@ -9,7 +9,7 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocparagraph;
 
 /**
- * Some Javadoc. // ok
+ * Some Javadoc.
  *
  * <p>Some Javadoc.
  *
@@ -17,7 +17,7 @@
 class InputJavadocParagraphCorrect {
 
     /**
-     * Some Javadoc. // ok
+     * Some Javadoc.
      *   
      * <p>{@code function} will never be invoked with a null value.
      *
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleCheckOptionLowercaseProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleCheckOptionLowercaseProperty.java
index 4a621ea50e4..2b94e77f35c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleCheckOptionLowercaseProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleCheckOptionLowercaseProperty.java
@@ -23,13 +23,13 @@ public class InputJavadocStyleCheckOptionLowercaseProperty {
      * and ends afterwards
      * </PRE>
      */
-    private void toLowerCaseForSingleHTMLTag() { // ok
+    private void toLowerCaseForSingleHTMLTag() {
     }
 
     /**
      * And This is ok.<BR>
      * <CODE>lowercase</CODE>
      */
-    public void allowedTAGToLowerCase() { // ok
+    public void allowedTAGToLowerCase() {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsFive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsFive.java
new file mode 100644
index 00000000000..0c50f2858a8
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsFive.java
@@ -0,0 +1,62 @@
+/*
+JavadocStyle
+scope = (default)private
+excludeScope = (default)null
+checkFirstSentence = (default)true
+endOfSentenceFormat = (default)([.?!][ \t\n\r\f<])|([.?!]$)
+checkEmptyJavadoc = (default)false
+checkHtml = (default)true
+tokens = (default)ANNOTATION_DEF, ANNOTATION_FIELD_DEF, CLASS_DEF, CTOR_DEF, \
+         ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, METHOD_DEF, PACKAGE_DEF, \
+         VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
+
+public class InputJavadocStyleDefaultSettingsFive
+{
+   /**
+    * {@return a string}
+    */
+    public String foo()
+    {
+        return "Hello, world";
+    }
+
+   /**
+    *   This is the first sentence with leading and trailing spaces.   Second sentence.
+    */
+    public String foo2()
+    {
+        return "Hello, world";
+    }
+
+   /**
+    * {@return the Java language {@linkplain Modifier modifiers} for
+    * the executable represented by this object}
+    */
+    public int foo3()
+    {
+        return 0;
+    }
+
+   /**
+    * {@return {@code true} if this method is a bridge
+    * method; returns {@code false} otherwise}
+    */
+    public boolean foo4()
+    {
+        return true;
+    }
+
+    /**
+     * {@return {@code true} if this object has been {@linkplain #init
+     * initialized}, {@code false} otherwise}
+     */
+     public boolean foo5()
+     {
+       return true;
+     }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsFour.java
index c1b3183ebac..f0160f8855e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsFour.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsFour.java
@@ -22,11 +22,12 @@ public class InputJavadocStyleDefaultSettingsFour
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
+    // violation 3 lines below 'Unclosed HTML tag found: <code>'
     /**
      * This Javadoc contains unclosed tag.
-     * <code>unclosed 'code' tag<code> // violation
+     * <code>unclosed 'code' tag<code>
      */
     private void unclosedTag() {}
 
@@ -34,31 +35,36 @@ void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
-    // violation below
+
+    // violation below 'First sentence should end with a period.'
     /**
      * {@inheritDoc}
      */
     private void inheritDoc() {}
 
+    // violation 2 lines below 'Unclosed HTML tag found: <b>Note:<b> it's unterminated tag.</p>'
     /**
-     * <p><b>Note:<b> it's unterminated tag.</p> // violation
+     * <p><b>Note:<b> it's unterminated tag.</p>
      */
     private void unterminatedTag() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Javadoc without dot
      */
     public interface TestInterface {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         void method();
     }
 
     static class TestStaticClass {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         public int field;
@@ -68,9 +74,10 @@ static class TestStaticClass {
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * text /
      * @throws Exception if an error occurs
      */
@@ -81,9 +88,10 @@ void bar() throws Exception {}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * /
      *
      **
@@ -92,9 +100,6 @@ void inheritDocWithThrows() {} // ok
      */
     public int test(String s) { return 0; }
 
-    /** Set of all class field names.*/
-    public String field; // ok
-
     /**
      * <p>Test.</p>
      * <pre class="body">
@@ -102,7 +107,7 @@ void inheritDocWithThrows() {} // ok
      ; i &lt; j; i++, j--) {}
      </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -110,5 +115,5 @@ public void test2() {} // ok
      public class SampleTest {
      }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsOne.java
index 2f421c5989a..6d5af3a4631 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsOne.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsOne.java
@@ -15,12 +15,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleDefaultSettingsOne // ok
+public class InputJavadocStyleDefaultSettingsOne
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
-   /** This Javadoc is missing an ending period */ // violation
+   // violation below 'First sentence should end with a period.'
+   /** This Javadoc is missing an ending period */
    private String second;
 
    /**
@@ -28,70 +29,70 @@ public class InputJavadocStyleDefaultSettingsOne // ok
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleDefaultSettingsOne() {} // ok
+   public InputJavadocStyleDefaultSettingsOne() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * This should fail even.though.there are embedded periods
     */
    private void method4() {}
 
+   // violation 7 lines below 'Unclosed HTML tag found: <b>'
+   // violation 9 lines below 'Extra HTML tag found: </td>'
+   // violation 9 lines below 'Extra HTML tag found: </style>'
+   // violation 9 lines below 'Unclosed HTML tag found: <code>dummy'
    /**
     * Test HTML in Javadoc comment
     * <dl>
-    * <dt><b>This guy is missing end of bold tag // violation
+    * <dt><b>
     * <dd>The dt and dd don't require end tags.
     * </dl>
-    * </td>Extra tag shouldn't be here // violation
-    * <style>this tag isn't supported in Javadoc</style> // violation
-    * @param arg1 <code>dummy. // violation
+    * </td>
+    * <style>this tag isn't supported in Javadoc</style>
+    * @param arg1 <code>dummy
     */
    private void method5(int arg1) {}
 
-   /** // violation
-    * Protected check <b>should fail // violation
+   // violation 2 lines below 'First sentence should end with a period.'
+   // violation 2 lines below 'Unclosed HTML tag found: <b>'
+   /**
+    * Protected check <b>
     */
    protected void method6() {}
 
-   /** // violation
-    * Package protected check <b>should fail // violation
+   // violation 2 lines below 'First sentence should end with a period.'
+   // violation 2 lines below 'Unclosed HTML tag found: <b>'
+   /**
+    * Package protected check <b>
     */
    void method7() {}
 
-   /** // violation
-    * Public check should fail</code> // violation
+   // violation 3 lines below 'First sentence should end with a period.'
+   // violation 3 lines below 'Extra HTML tag found: </code>'
+   // violation 3 lines below 'should fail <'
+   /**
+    * Public check should fail</code>
     * should fail <
-    */ // violation above
+    */
    public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
-
-
-    // Testcases to exercise the Tag parser (bug 843887)
-
-    /**
-     * Real men don't use XHTML.
-     * <br />
-     * <hr/>
-     * < br/>
-     * <img src="schattenparker.jpg"/></img> // violation
-     */
-    private void method10() {}
+   public void method9() {}
 
     /**
      * Tag content can be really mean.
@@ -108,13 +109,11 @@ private void method10() {}
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
-
+    private void method10() {}
     /**
      * Tags for two lines.
      * <a href="some_link"
      * >Link Text</a>
      */
-    private void method12() {} // ok
+    private void method11() {}
 }
-
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsThree.java
index 06ea38b7ad1..c347249ff67 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsThree.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsThree.java
@@ -23,13 +23,13 @@ public class InputJavadocStyleDefaultSettingsThree
      * @param <KEY_T> for bug 1649020.
      * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
      */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
          * Retrieves X.
          * @return a value
          */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -39,7 +39,7 @@ public T1 getX() // ok
          * @param <V> this is not an unclosed V tag
          * @return a value
          */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -50,7 +50,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -61,7 +61,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -71,7 +71,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -80,13 +80,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -94,15 +94,6 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
-
-    /**
-     * Checks HTML tags in javadoc.
-     *
-     * HTML no good tag
-     * <string>Tests</string> // violation
-     *
-     */
     public void method21() {}
 
     /**
@@ -110,5 +101,19 @@ public void method21() {}
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
+
+    public enum Test
+    {
+        // violation below 'First sentence should end with a period.'
+        /**
+         * Value 1 without a period
+         */
+        value1,
+
+        /**
+         * Value 2 with a period.
+         */
+        value2,
+    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsTwo.java
index f6eef21b719..d5d8fd883d7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsTwo.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleDefaultSettingsTwo.java
@@ -17,6 +17,16 @@
 
 public class InputJavadocStyleDefaultSettingsTwo
 {
+    // violation 6 lines below  'Extra HTML tag found: </img>'
+    /**
+     * Real men don't use XHTML.
+     * <br />
+     * <hr/>
+     * < br/>
+     * <img src="schattenparker.jpg"/></img>
+     */
+    private void method12() {}
+
     /**
      * First sentence.
      * <pre>
@@ -54,16 +64,17 @@ public class InputJavadocStyleDefaultSettingsTwo
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
+    // violation 3 lines below 'Unclosed HTML tag found: <blockquote>'
     /**
      * Some problematic javadoc. Sample usage:
-     * <blockquote> // violation
+     * <blockquote>
      */
-
     private void method14() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
@@ -71,38 +82,38 @@ private void method14() {}
     private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
+    public static final int dummy = 4911;
 
     /**
      */
-    public void method16() {} // ok
+    public void method16() {}
 
     /**
      * @param a A parameter
      */
-    protected void method17(String a) {} // ok
+    protected void method17(String a) {}
 
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
     /** @see java.lang.Object */
-    public void method19() {} // ok
+    public void method19() {}
 
-    public enum Test // ok
-    {
-        /** // violation
-         * Value 1 without a period
-         */
-        value1,
+    // violation 5 lines below 'Extra HTML tag found: </string>'
+    /**
+     * Checks HTML tags in javadoc.
+     *
+     * HTML no good tag
+     * <string>Tests</string>
+     *
+     */
+    public void method20() {}
 
-        /**
-         * Value 2 with a period.
-         */
-        value2, // ok
-    }
+    /** Set of all class field names.*/
+    public String field;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc1.java
index 0dd578428a7..d28ce440e2d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc1.java
@@ -15,39 +15,39 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleEmptyJavadoc1 { // ok
+public class InputJavadocStyleEmptyJavadoc1 {
     // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
    /** This Javadoc is missing an ending period */
-   private String second; // ok
+   private String second;
 
    /**
     * We don't want {@link com.puppycrawl.tools.checkstyle.checks.JavadocStyleCheck}
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleEmptyJavadoc1() {} // ok
+   public InputJavadocStyleEmptyJavadoc1() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
    /**
     * This should fail even.though.there are embedded periods
     */
-   private void method4() {} // ok
+   private void method4() {}
 
    /**
     * Test HTML in Javadoc comment
@@ -59,26 +59,26 @@ private void method4() {} // ok
     * <style>this tag isn't supported in Javadoc</style>
     * @param arg1 <code>dummy.
     */
-   private void method5(int arg1) {} // ok
+   private void method5(int arg1) {}
 
    /**
     * Protected check <b>should fail
     */
-   protected void method6() {} // ok
+   protected void method6() {}
 
    /**
     * Package protected check <b>should fail
     */
-   void method7() {} // ok
+   void method7() {}
 
    /**
     * Public check should fail</code>
     * should fail <
     */
-   public void method8() {} // ok
+   public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
+   public void method9() {}
 
     // Testcases to exercise the Tag parser (bug 843887)
 
@@ -89,7 +89,7 @@ public void method9() {} // ok
      * < br/>
      * <img src="schattenparker.jpg"/></img>
      */
-    private void method10() {} // ok
+    private void method10() {}
 
     /**
      * Tag content can be really mean.
@@ -106,12 +106,12 @@ private void method10() {} // ok
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
+    private void method11() {}
 
     /**
      * Tags for two lines.
      * <a href="some_link"
      * >Link Text</a>
      */
-    private void method12() {} // ok
+    private void method12() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc2.java
index 684fb58e04f..40fec4230b8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc2.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleEmptyJavadoc2 { // ok
+public class InputJavadocStyleEmptyJavadoc2 {
         /**
      * First sentence.
      * <pre>
@@ -53,44 +53,46 @@ public class InputJavadocStyleEmptyJavadoc2 { // ok
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
     /**
      * Some problematic javadoc. Sample usage:
      * <blockquote>
      */
 
-    private void method14() {} // ok
+    private void method14() {}
 
     /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
 
-    private void method15() {} // ok
+    private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
-     // violation below
+    public static final int dummy = 4911;
+    // violation below 'Javadoc has empty description section'
     /**
      */
     public void method16() {}
-     // violation below
+    // violation below 'Javadoc has empty description section'
     /**
      * @param a A parameter
      */
     protected void method17(String a) {}
-     // violation below
+    // violation below 'Javadoc has empty description section'
     /**
      * @exception RuntimeException should be thrown
      */
     void method18(String a) {}
-     // violation below
+
+    // violation below 'Javadoc has empty description section'
     /**
      */
     private static int ASDF = 0;
 
-    /** @see Object */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** @see Object */
     public void method19() {}
 
     public enum Test
@@ -98,11 +100,11 @@ public enum Test
         /**
          * Value 1 without a period
          */
-        value1, // ok
+        value1,
 
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc3.java
index f8523e34058..1a77bd78333 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc3.java
@@ -15,20 +15,20 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleEmptyJavadoc3 { // ok
+public class InputJavadocStyleEmptyJavadoc3 {
         /**
     * A test class.
     * @param <T1> this is NOT an unclosed T1 tag
     * @param <KEY_T> for bug 1649020.
     * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
     */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
         * Retrieves X.
         * @return a value
         */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -38,7 +38,7 @@ public T1 getX() // ok
         * @param <V> this is not an unclosed V tag
         * @return a value
         */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -49,7 +49,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -60,7 +60,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -70,7 +70,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -79,13 +79,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -93,7 +93,7 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
     /**
      * Checks HTML tags in javadoc.
@@ -102,12 +102,12 @@ public void method20() {} // ok
      * <string>Tests</string>
      *
      */
-    public void method21() {} // ok
+    public void method21() {}
 
     /**
      * First sentence.
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc4.java
index 85de2dcc7ef..aba922bd399 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEmptyJavadoc4.java
@@ -15,72 +15,72 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleEmptyJavadoc4 { // ok
+public class InputJavadocStyleEmptyJavadoc4 {
         /**
      * Link to some page in two lines.
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
     /**
      * This Javadoc contains unclosed tag.
      * <code>unclosed 'code' tag<code>
      */
-    private void unclosedTag() {} // ok
+    private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
 
     /**
      * {@inheritDoc}
      */
-    private void inheritDoc() {} // ok
+    private void inheritDoc() {}
 
     /**
      * <p><b>Note:<b> it's unterminated tag.</p>
      */
-    private void unterminatedTag() {} // ok
+    private void unterminatedTag() {}
 
     /**
      * Javadoc without dot
      */
-    public interface TestInterface { // ok
+    public interface TestInterface {
         /**
          * Javadoc without dot
          */
-        void method(); // ok
+        void method();
     }
 
-    static class TestStaticClass { // ok
+    static class TestStaticClass {
         /**
          * Javadoc without dot
          */
-        public int field; // ok
+        public int field;
     }
 
     /**
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
     /**
      * text /
      * @throws Exception if an error occurs
      */
-    void bar() throws Exception {} // ok
+    void bar() throws Exception {}
 
     /**
      * {@inheritDoc}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
     /**
      * /
@@ -89,10 +89,10 @@ void inheritDocWithThrows() {} // ok
      * @param s
      * @return Return
      */
-    public int test(String s) { return 0; } // ok
+    public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -101,7 +101,7 @@ void inheritDocWithThrows() {} // ok
           ; i &lt; j; i++, j--) {}
        </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -109,5 +109,5 @@ public void test2() {} // ok
 public class SampleTest {
 }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEnumCtorScopeIsPrivate.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEnumCtorScopeIsPrivate.java
index aeb312bf62a..f2d1525eeca 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEnumCtorScopeIsPrivate.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleEnumCtorScopeIsPrivate.java
@@ -17,18 +17,21 @@
 
 public enum InputJavadocStyleEnumCtorScopeIsPrivate {
 
-    /** */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** */
     CONSTANT(0);
 
-    /** */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** */
     final int value;
 
-    /** */ // ok
+    /** */
     InputJavadocStyleEnumCtorScopeIsPrivate(int value) {
         this.value = value;
     }
 
-    /** */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** */
     void method() {
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope1.java
index ff35cde35c3..281e5920103 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope1.java
@@ -15,12 +15,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleExcludeScope1 // ok
+public class InputJavadocStyleExcludeScope1
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
-   /** This Javadoc is missing an ending period */ // violation
+   // violation below 'First sentence should end with a period.'
+   /** This Javadoc is missing an ending period */
    private String second;
 
    /**
@@ -28,47 +29,54 @@ public class InputJavadocStyleExcludeScope1 // ok
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleExcludeScope1() {} // ok
+   public InputJavadocStyleExcludeScope1() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * This should fail even.though.there are embedded periods
     */
    private void method4() {}
 
+   // violation 7 lines below 'Unclosed HTML tag found: <b>'
+   // violation 9 lines below 'Extra HTML tag found: </td>'
+   // violation 9 lines below 'Extra HTML tag found: </style>'
+   // violation 9 lines below 'Unclosed HTML tag found: <code>dummy'
    /**
     * Test HTML in Javadoc comment
     * <dl>
-    * <dt><b>This guy is missing end of bold tag // violation
+    * <dt><b>
     * <dd>The dt and dd don't require end tags.
     * </dl>
-    * </td>Extra tag shouldn't be here // violation
-    * <style>this tag isn't supported in Javadoc</style> // violation
-    * @param arg1 <code>dummy. // violation
+    * </td>
+    * <style>this tag isn't supported in Javadoc</style>
+    * @param arg1 <code>dummy
     */
    private void method5(int arg1) {}
 
    /**
     * Protected check <b>should fail
     */
-   protected void method6() {} // ok
+   protected void method6() {}
 
-   /** // violation
-    * Package protected check <b>should fail // violation
+   // violation 2 lines below 'First sentence should end with a period.'
+   // violation 2 lines below 'Unclosed HTML tag found:'
+   /**
+    * Package protected check <b>
     */
    void method7() {}
 
@@ -76,20 +84,20 @@ void method7() {}
     * Public check should fail</code>
     * should fail <
     */
-   public void method8() {} // ok
+   public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
-
+   public void method9() {}
 
-    // Testcases to exercise the Tag parser (bug 843887)
 
+   // Testcases to exercise the Tag parser (bug 843887)
+   // violation 6 lines below  'Extra HTML tag found: </img>'
     /**
      * Real men don't use XHTML.
      * <br />
      * <hr/>
      * < br/>
-     * <img src="schattenparker.jpg"/></img> // violation
+     * <img src="schattenparker.jpg"/></img>
      */
     private void method10() {}
 
@@ -108,5 +116,5 @@ private void method10() {}
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope2.java
index e17bb8cb618..330280d3377 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope2.java
@@ -15,14 +15,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleExcludeScope2 // ok
+public class InputJavadocStyleExcludeScope2
 {
     /**
      * Tags for two lines.
      * <a href="some_link"
      * >Link Text</a>
      */
-    private void method12() {} // ok
+    private void method12() {}
 
     /**
      * First sentence.
@@ -61,16 +61,18 @@ private void method12() {} // ok
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
+    // violation 3 lines below 'Unclosed HTML tag found: <blockquote>'
     /**
      * Some problematic javadoc. Sample usage:
-     * <blockquote> // violation
+     * <blockquote>
      */
 
     private void method14() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
@@ -78,39 +80,39 @@ private void method14() {}
     private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
+    public static final int dummy = 4911;
 
     /**
      */
-    public void method16() {} // ok
+    public void method16() {}
 
     /**
      * @param a A parameter
      */
-    protected void method17(String a) {} // ok
+    protected void method17(String a) {}
 
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
     /** @see Object */
-    public void method19() {} // ok
+    public void method19() {}
 
     public enum Test
     {
         /**
          * Value 1 without a period
          */
-        value1, // ok
+        value1,
 
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope3.java
index bcb5f2079cd..b8002ab9a47 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope3.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleExcludeScope3 // ok
+public class InputJavadocStyleExcludeScope3
 {
     /**
     * A test class.
@@ -23,13 +23,13 @@ public class InputJavadocStyleExcludeScope3 // ok
     * @param <KEY_T> for bug 1649020.
     * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
     */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
         * Retrieves X.
         * @return a value
         */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -39,7 +39,7 @@ public T1 getX() // ok
         * @param <V> this is not an unclosed V tag
         * @return a value
         */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -50,7 +50,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -61,7 +61,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -71,7 +71,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -80,13 +80,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -94,7 +94,7 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
     /**
      * Checks HTML tags in javadoc.
@@ -103,12 +103,12 @@ public void method20() {} // ok
      * <string>Tests</string>
      *
      */
-    public void method21() {} // ok
+    public void method21() {}
 
     /**
      * First sentence.
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope4.java
index dfa1c32e8be..cf56132b71c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleExcludeScope4.java
@@ -15,50 +15,54 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleExcludeScope4 // ok
+public class InputJavadocStyleExcludeScope4
 {
     /**
      * Link to some page in two lines.
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
+    // violation 3 lines below 'Unclosed HTML tag found: <code>'
     /**
      * This Javadoc contains unclosed tag.
-     * <code>unclosed 'code' tag<code> // violation
+     * <code>unclosed 'code' tag<code>
      */
     private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
-    // violation below
+
+    // violation below 'First sentence should end with a period.'
     /**
      * {@inheritDoc}
      */
     private void inheritDoc() {}
 
+    // violation 2 lines below 'Unclosed HTML tag found: <b>Note:<b> it's unterminated tag.</p>'
     /**
-     * <p><b>Note:<b> it's unterminated tag.</p> // violation
+     * <p><b>Note:<b> it's unterminated tag.</p>
      */
     private void unterminatedTag() {}
 
     /**
      * Javadoc without dot
      */
-    public interface TestInterface { // ok
+    public interface TestInterface {
         /**
          * Javadoc without dot
          */
-        void method(); // ok
+        void method();
     }
 
-    static class TestStaticClass { // ok
-        /** // violation
+    static class TestStaticClass {
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         public int field;
@@ -68,9 +72,10 @@ static class TestStaticClass { // ok
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * text /
      * @throws Exception if an error occurs
      */
@@ -81,7 +86,7 @@ void bar() throws Exception {}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
     /**
      * /
@@ -90,10 +95,10 @@ void inheritDocWithThrows() {} // ok
      * @param s
      * @return Return
      */
-    public int test(String s) { return 0; } // ok
+    public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -102,7 +107,7 @@ void inheritDocWithThrows() {} // ok
           ; i &lt; j; i++, j--) {}
        </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -110,5 +115,5 @@ public void test2() {} // ok
 public class SampleTest {
 }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatFour.java
index 7115fa06b6c..1297e4ed199 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatFour.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatFour.java
@@ -22,21 +22,21 @@ public class InputJavadocStyleFirstSentenceFormatFour
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
     /**
      * This Javadoc contains unclosed tag.
      * <code>unclosed 'code' tag<code>
      */
-    private void unclosedTag() {} // ok
+    private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
-    // violation below
+    // violation below 'First sentence should end with a period.'
     /**
      * {@inheritDoc}
      */
@@ -45,20 +45,23 @@ private void inheritDoc() {}
     /**
      * <p><b>Note:<b> it's unterminated tag.</p>
      */
-    private void unterminatedTag() {} // ok
+    private void unterminatedTag() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Javadoc without dot
      */
     public interface TestInterface {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         void method();
     }
 
-    static class TestStaticClass { // ok
-        /** // violation
+    static class TestStaticClass {
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         public int field;
@@ -68,9 +71,10 @@ static class TestStaticClass { // ok
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * text /
      * @throws Exception if an error occurs
      */
@@ -81,9 +85,10 @@ void bar() throws Exception {}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * /
      *
      **
@@ -93,7 +98,7 @@ void inheritDocWithThrows() {} // ok
     public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -102,7 +107,7 @@ void inheritDocWithThrows() {} // ok
      ; i &lt; j; i++, j--) {}
      </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -110,5 +115,5 @@ public void test2() {} // ok
      public class SampleTest {
      }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatOne.java
index 4f5463df4d0..9cb80110b10 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatOne.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatOne.java
@@ -18,9 +18,10 @@
 public class InputJavadocStyleFirstSentenceFormatOne
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
-   /** This Javadoc is missing an ending period */ // violation
+   // violation below 'First sentence should end with a period.'
+   /** This Javadoc is missing an ending period */
    private String second;
 
    /**
@@ -28,14 +29,16 @@ public class InputJavadocStyleFirstSentenceFormatOne
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleFirstSentenceFormatOne() {} // ok
+   public InputJavadocStyleFirstSentenceFormatOne() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * This is ok!
     */
    private void method1() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * This is ok?
     */
    private void method2() {}
@@ -43,9 +46,10 @@ private void method2() {}
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * This should fail even.though.there are embedded periods
     */
    private void method4() {}
@@ -60,26 +64,29 @@ private void method4() {}
     * <style>this tag isn't supported in Javadoc</style>
     * @param arg1 <code>dummy.
     */
-   private void method5(int arg1) {} // ok
+   private void method5(int arg1) {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * Protected check <b>should fail
     */
    protected void method6() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * Package protected check <b>should fail
     */
    void method7() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * Public check should fail</code>
     * should fail <
     */
    public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
+   public void method9() {}
 
 
     // Testcases to exercise the Tag parser (bug 843887)
@@ -91,7 +98,7 @@ public void method9() {} // ok
      * < br/>
      * <img src="schattenparker.jpg"/></img>
      */
-    private void method10() {} // ok
+    private void method10() {}
 
     /**
      * Tag content can be really mean.
@@ -108,12 +115,5 @@ private void method10() {} // ok
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
-
-    /**
-     * Tags for two lines.
-     * <a href="some_link"
-     * >Link Text</a>
-     */
-    private void method12() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatThree.java
index 9c88c1f0d97..3beefa839ee 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatThree.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatThree.java
@@ -23,13 +23,13 @@ public class InputJavadocStyleFirstSentenceFormatThree
      * @param <KEY_T> for bug 1649020.
      * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
      */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
          * Retrieves X.
          * @return a value
          */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -39,7 +39,7 @@ public T1 getX() // ok
          * @param <V> this is not an unclosed V tag
          * @return a value
          */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -50,7 +50,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -61,7 +61,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -71,7 +71,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -80,13 +80,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -94,7 +94,7 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
     /**
      * Checks HTML tags in javadoc.
@@ -103,12 +103,12 @@ public void method20() {} // ok
      * <string>Tests</string>
      *
      */
-    public void method21() {} // ok
+    public void method21() {}
 
     /**
      * First sentence.
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatTwo.java
index a5e13b205f7..40109203d93 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatTwo.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFormatTwo.java
@@ -17,6 +17,13 @@
 
 public class InputJavadocStyleFirstSentenceFormatTwo
 {
+    /**
+     * Tags for two lines.
+     * <a href="some_link"
+     * >Link Text</a>
+     */
+    private void method12() {}
+
     /**
      * First sentence.
      * <pre>
@@ -54,16 +61,17 @@ public class InputJavadocStyleFirstSentenceFormatTwo
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
     /**
      * Some problematic javadoc. Sample usage:
      * <blockquote>
      */
 
-    private void method14() {} // ok
+    private void method14() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
@@ -71,32 +79,33 @@ private void method14() {} // ok
     private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
+    public static final int dummy = 4911;
 
     /**
      */
-    public void method16() {} // ok
+    public void method16() {}
 
     /**
      * @param a A parameter
      */
-    protected void method17(String a) {} // ok
+    protected void method17(String a) {}
 
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
     /** @see Object */
-    public void method19() {} // ok
+    public void method19() {}
 
-    public enum Test // ok
+    public enum Test
     {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Value 1 without a period
          */
         value1,
@@ -104,6 +113,6 @@ public enum Test // ok
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFour.java
index 2941d900fce..f746a756dba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFour.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceFour.java
@@ -22,21 +22,21 @@ public class InputJavadocStyleFirstSentenceFour
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
     /**
      * This Javadoc contains unclosed tag.
      * <code>unclosed 'code' tag<code>
      */
-    private void unclosedTag() {} // ok
+    private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
-    // violation below
+    // violation below 'First sentence should end with a period.'
     /**
      * {@inheritDoc}
      */
@@ -45,20 +45,23 @@ private void inheritDoc() {}
     /**
      * <p><b>Note:<b> it's unterminated tag.</p>
      */
-    private void unterminatedTag() {} // ok
+    private void unterminatedTag() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Javadoc without dot
      */
     public interface TestInterface {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         void method();
     }
 
-    static class TestStaticClass { // ok
-        /** // violation
+    static class TestStaticClass {
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         public int field;
@@ -68,9 +71,10 @@ static class TestStaticClass { // ok
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * text /
      * @throws Exception if an error occurs
      */
@@ -81,9 +85,10 @@ void bar() throws Exception {}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * /
      *
      **
@@ -93,7 +98,7 @@ void inheritDocWithThrows() {} // ok
     public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -102,7 +107,7 @@ void inheritDocWithThrows() {} // ok
      ; i &lt; j; i++, j--) {}
      </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -110,5 +115,5 @@ public void test2() {} // ok
      public class SampleTest {
      }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceOne.java
index 2a6d25c6b2d..036092429f3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceOne.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceOne.java
@@ -18,9 +18,10 @@
 public class InputJavadocStyleFirstSentenceOne
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
-   /** This Javadoc is missing an ending period */ // violation
+   // violation below 'First sentence should end with a period.'
+   /** This Javadoc is missing an ending period */
    private String second;
 
    /**
@@ -28,24 +29,25 @@ public class InputJavadocStyleFirstSentenceOne
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleFirstSentenceOne() {} // ok
+   public InputJavadocStyleFirstSentenceOne() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * This should fail even.though.there are embedded periods
     */
    private void method4() {}
@@ -60,26 +62,29 @@ private void method4() {}
     * <style>this tag isn't supported in Javadoc</style>
     * @param arg1 <code>dummy.
     */
-   private void method5(int arg1) {} // ok
+   private void method5(int arg1) {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * Protected check <b>should fail
     */
    protected void method6() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * Package protected check <b>should fail
     */
    void method7() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * Public check should fail</code>
     * should fail <
     */
    public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
+   public void method9() {}
 
 
     // Testcases to exercise the Tag parser (bug 843887)
@@ -91,7 +96,7 @@ public void method9() {} // ok
      * < br/>
      * <img src="schattenparker.jpg"/></img>
      */
-    private void method10() {} // ok
+    private void method10() {}
 
     /**
      * Tag content can be really mean.
@@ -108,12 +113,5 @@ private void method10() {} // ok
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
-
-    /**
-     * Tags for two lines.
-     * <a href="some_link"
-     * >Link Text</a>
-     */
-    private void method12() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceThree.java
index 96b9c544b8b..b5e58ca7a7c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceThree.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceThree.java
@@ -23,13 +23,13 @@ public class InputJavadocStyleFirstSentenceThree
      * @param <KEY_T> for bug 1649020.
      * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
      */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
          * Retrieves X.
          * @return a value
          */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -39,7 +39,7 @@ public T1 getX() // ok
          * @param <V> this is not an unclosed V tag
          * @return a value
          */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -50,7 +50,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -61,7 +61,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -71,7 +71,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -80,13 +80,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -94,7 +94,7 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
     /**
      * Checks HTML tags in javadoc.
@@ -103,12 +103,12 @@ public void method20() {} // ok
      * <string>Tests</string>
      *
      */
-    public void method21() {} // ok
+    public void method21() {}
 
     /**
      * First sentence.
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceTwo.java
index b21bc7e49b8..ebb2f44d3b2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceTwo.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleFirstSentenceTwo.java
@@ -54,16 +54,17 @@ public class InputJavadocStyleFirstSentenceTwo
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
     /**
      * Some problematic javadoc. Sample usage:
      * <blockquote>
      */
 
-    private void method14() {} // ok
+    private void method14() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
@@ -71,32 +72,33 @@ private void method14() {} // ok
     private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
+    public static final int dummy = 4911;
 
     /**
      */
-    public void method16() {} // ok
+    public void method16() {}
 
     /**
      * @param a A parameter
      */
-    protected void method17(String a) {} // ok
+    protected void method17(String a) {}
 
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
     /** @see Object */
-    public void method19() {} // ok
+    public void method19() {}
 
-    public enum Test // ok
+    public enum Test
     {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Value 1 without a period
          */
         value1,
@@ -104,6 +106,13 @@ public enum Test // ok
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
+
+    /**
+     * Tags for two lines.
+     * <a href="some_link"
+     * >Link Text</a>
+     */
+    private void method12() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml1.java
index 98d81b1ed89..ed0853046e3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml1.java
@@ -17,78 +17,86 @@
 
 public class InputJavadocStyleHtml1 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
    /** This Javadoc is missing an ending period */
-   private String second; // ok
+   private String second;
 
    /**
     * We don't want {@link com.puppycrawl.tools.checkstyle.checks.JavadocStyleCheck}
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleHtml1() {} // ok
+   public InputJavadocStyleHtml1() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
    /**
     * This should fail even.though.there are embedded periods
     */
-   private void method4() {} // ok
+   private void method4() {}
 
+   // violation 7 lines below 'Unclosed HTML tag found: <b>'
+   // violation 9 lines below 'Extra HTML tag found: </td>'
+   // violation 9 lines below 'Extra HTML tag found: </style>'
+   // violation 9 lines below 'Unclosed HTML tag found: <code>dummy'
    /**
     * Test HTML in Javadoc comment
     * <dl>
-    * <dt><b>This guy is missing end of bold tag // violation
+    * <dt><b>
     * <dd>The dt and dd don't require end tags.
     * </dl>
-    * </td>Extra tag shouldn't be here // violation
-    * <style>this tag isn't supported in Javadoc</style> // violation
-    * @param arg1 <code>dummy. // violation
+    * </td>
+    * <style>this tag isn't supported in Javadoc</style>
+    * @param arg1 <code>dummy
     */
    private void method5(int arg1) {}
 
+   // violation 2 lines below 'Unclosed HTML tag found: <b>'
    /**
-    * Protected check <b>should fail // violation
+    * Protected check <b>
     */
    protected void method6() {}
 
+   // violation 2 lines below 'Unclosed HTML tag found: <b>'
    /**
-    * Package protected check <b>should fail // violation
+    * Package protected check <b>
     */
    void method7() {}
 
+   // violation 3 lines below 'Extra HTML tag found: </code>'
+   // violation 3 lines below 'should fail <'
    /**
-    * Public check should fail</code> // violation
+    * Public check should fail</code>
     * should fail <
-    */ // violation above
+    */
    public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
-
+   public void method9() {}
 
-    // Testcases to exercise the Tag parser (bug 843887)
 
+   // Testcases to exercise the Tag parser (bug 843887)
+   // violation 6 lines below  'Extra HTML tag found: </img>'
     /**
      * Real men don't use XHTML.
      * <br />
      * <hr/>
      * < br/>
-     * <img src="schattenparker.jpg"/></img> // violation
+     * <img src="schattenparker.jpg"/></img>
      */
     private void method10() {}
 
@@ -107,5 +115,5 @@ private void method10() {}
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml2.java
index 178864110d8..17561e576dd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml2.java
@@ -21,7 +21,7 @@ public class InputJavadocStyleHtml2 {
      * <a href="some_link"
      * >Link Text</a>
      */
-    private void method12() {} // ok
+    private void method12() {}
 
     /**
      * First sentence.
@@ -60,11 +60,12 @@ private void method12() {} // ok
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
+    // violation 3 lines below 'Unclosed HTML tag found: <blockquote>'
     /**
      * Some problematic javadoc. Sample usage:
-     * <blockquote> // violation
+     * <blockquote>
      */
 
     private void method14() {}
@@ -74,42 +75,42 @@ private void method14() {}
      * line number for reporting error (bug 841942)
      */
 
-    private void method15() {} // ok
+    private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
+    public static final int dummy = 4911;
 
     /**
      */
-    public void method16() {} // ok
+    public void method16() {}
 
     /**
      * @param a A parameter
      */
-    protected void method17(String a) {} // ok
+    protected void method17(String a) {}
 
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
     /** @see Object */
-    public void method19() {} // ok
+    public void method19() {}
 
     public enum Test
     {
         /**
          * Value 1 without a period
          */
-        value1, // ok
+        value1,
 
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml3.java
index f8d6d657492..ed42cdd75e9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml3.java
@@ -22,13 +22,13 @@ public class InputJavadocStyleHtml3 {
     * @param <KEY_T> for bug 1649020.
     * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
     */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
         * Retrieves X.
         * @return a value
         */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -38,7 +38,7 @@ public T1 getX() // ok
         * @param <V> this is not an unclosed V tag
         * @return a value
         */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -49,7 +49,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -60,7 +60,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -70,7 +70,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -79,13 +79,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -93,13 +93,14 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
+    // violation 5 lines below 'Extra HTML tag found: </string>'
     /**
      * Checks HTML tags in javadoc.
      *
      * HTML no good tag
-     * <string>Tests</string> // violation
+     * <string>Tests</string>
      *
      */
     public void method21() {}
@@ -109,5 +110,5 @@ public void method21() {}
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml4.java
index 838f8218db6..26e951979f6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtml4.java
@@ -21,66 +21,69 @@ public class InputJavadocStyleHtml4 {
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
+    // violation 3 lines below 'Unclosed HTML tag found: <code>'
     /**
      * This Javadoc contains unclosed tag.
-     * <code>unclosed 'code' tag<code> // violation
+     * <code>unclosed 'code' tag<code>
      */
     private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
 
     /**
      * {@inheritDoc}
      */
-    private void inheritDoc() {} // ok
+    private void inheritDoc() {}
 
+    // violation 2 lines below 'Unclosed HTML tag found: <b>'
     /**
-     * <p><b>Note:<b> it's unterminated tag.</p> // violation
+     * <p><b>
+     * </p>
      */
     private void unterminatedTag() {}
 
     /**
      * Javadoc without dot
      */
-    public interface TestInterface { // ok
+    public interface TestInterface {
         /**
          * Javadoc without dot
          */
-        void method(); // ok
+        void method();
     }
 
-    static class TestStaticClass { // ok
+    static class TestStaticClass {
         /**
          * Javadoc without dot
          */
-        public int field; // ok
+        public int field;
     }
 
     /**
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
     /**
      * text /
      * @throws Exception if an error occurs
      */
-    void bar() throws Exception {} // ok
+    void bar() throws Exception {}
 
     /**
      * {@inheritDoc}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
     /**
      * /
@@ -89,10 +92,10 @@ void inheritDocWithThrows() {} // ok
      * @param s
      * @return Return
      */
-    public int test(String s) { return 0; } // ok
+    public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -101,7 +104,7 @@ void inheritDocWithThrows() {} // ok
           ; i &lt; j; i++, j--) {}
        </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -109,5 +112,5 @@ public void test2() {} // ok
 public class SampleTest {
 }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtmlComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtmlComment.java
index e5060a454f5..2c0e231e1a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtmlComment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleHtmlComment.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleHtmlComment // ok
+public class InputJavadocStyleHtmlComment
 {
     /**
      * sometimes a tag starts
@@ -25,7 +25,7 @@ public class InputJavadocStyleHtmlComment // ok
      * and ends afterwards
      * </pre>
      */
-    private void method1() {} // ok
+    private void method1() {}
 
     /**
      * sometimes a tag starts
@@ -37,7 +37,7 @@ private void method1() {} // ok
      * and ends afterwards
      * </pre>
      */
-    private void method2() {} // ok
+    private void method2() {}
 
     /**
      * sometimes a tag starts
@@ -48,7 +48,7 @@ private void method2() {} // ok
      * multiple lines --></pre>
      * and ends on the same line
      */
-    private void method3() {} // ok
+    private void method3() {}
 
     /**
      * sometimes a tag starts
@@ -58,18 +58,18 @@ private void method3() {} // ok
      * and ends afterwards
      * </pre>
      */
-    private void method4() {} // ok
+    private void method4() {}
 
     /**
      * sometimes a tag starts
      * <pre><!-- ignore this --></pre>
      * and ends with a comment in the middle
      */
-    private void method5() {} // ok
+    private void method5() {}
 
     /**
      * Parameterized interface.
      * @param <I>
      */
-    interface Interface<I> {} // ok
+    interface Interface<I> {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleInterfaceMemberScopeIsPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleInterfaceMemberScopeIsPublic.java
index 8c62c872c3f..fc19c6f7091 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleInterfaceMemberScopeIsPublic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleInterfaceMemberScopeIsPublic.java
@@ -17,21 +17,23 @@
 
 public interface InputJavadocStyleInterfaceMemberScopeIsPublic {
 
-    /** */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** */
     enum Enum {
 
-        /** */ // violation
+        // violation below 'Javadoc has empty description section'
+        /** */
         CONSTANT(0);
 
-        /** */ // ok
+        /** */
         final int value;
 
-        /** */ // ok
+        /** */
         Enum(int value) {
             this.value = value;
         }
 
-        /** */ // ok
+        /** */
         void method() {
         }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNeverEndingXmlComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNeverEndingXmlComment.java
index 96e184b10a4..5e1cc38dd4c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNeverEndingXmlComment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNeverEndingXmlComment.java
@@ -16,6 +16,6 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
 public class InputJavadocStyleNeverEndingXmlComment {
-    /** DTD: <!--. */ // ok
+    /** DTD: <!--. */
     public int i;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc1.java
index 1d209b64cb9..9a00f099c16 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc1.java
@@ -15,99 +15,99 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleNoJavadoc1 // ok
+public class InputJavadocStyleNoJavadoc1
 {
-    public int i1; // ok
-    protected int i2; // ok
-    int i3; // ok
-    private int i4; // ok
-
-    public void foo1() {} // ok
-    protected void foo2() {} // ok
-    void foo3() {} // ok
-    private void foo4() {} // ok
-
-    protected class ProtectedInner { // ok
-        public int i1; // ok
-        protected int i2; // ok
-        int i3; // ok
-        private int i4; // ok
-
-        public void foo1() {} // ok
-        protected void foo2() {} // ok
-        void foo3() {} // ok
-        private void foo4() {} // ok
+    public int i1;
+    protected int i2;
+    int i3;
+    private int i4;
+
+    public void foo1() {}
+    protected void foo2() {}
+    void foo3() {}
+    private void foo4() {}
+
+    protected class ProtectedInner {
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
     }
 
-    class PackageInner { // ok
-        public int i1; // ok
-        protected int i2; // ok
-        int i3; // ok
-        private int i4; // ok
+    class PackageInner {
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
 
-        public void foo1() {} // ok
-        protected void foo2() {} // ok
-        void foo3() {} // ok
-        private void foo4() {} // ok
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
     }
 
-    private class PrivateInner { // ok
-        public int i1; // ok
-        protected int i2; // ok
-        int i3; // ok
-        private int i4; // ok
+    private class PrivateInner {
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
 
-        public void foo1() {} // ok
-        protected void foo2() {} // ok
-        void foo3() {} // ok
-        private void foo4() {} // ok
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
     }
 }
 
-class PackageClass { // ok
-    public int i1; // ok
-    protected int i2; // ok
-    int i3; // ok
-    private int i4; // ok
-
-    public void foo1() {} // ok
-    protected void foo2() {} // ok
-    void foo3() {} // ok
-    private void foo4() {} // ok
-
-    public class PublicInner { // ok
-        public int i1; // ok
-        protected int i2; // ok
-        int i3; // ok
-        private int i4; // ok
-
-        public void foo1() {} // ok
-        protected void foo2() {} // ok
-        void foo3() {} // ok
-        private void foo4() {} // ok
+class PackageClass {
+    public int i1;
+    protected int i2;
+    int i3;
+    private int i4;
+
+    public void foo1() {}
+    protected void foo2() {}
+    void foo3() {}
+    private void foo4() {}
+
+    public class PublicInner {
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
     }
 
-    protected class ProtectedInner { // ok
-        public int i1; // ok
-        protected int i2; // ok
-        int i3; // ok
-        private int i4; // ok
+    protected class ProtectedInner {
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
 
-        public void foo1() {} // ok
-        protected void foo2() {} // ok
-        void foo3() {} // ok
-        private void foo4() {} // ok
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
     }
 
-    class PackageInner { // ok
-        public int i1; // ok
-        protected int i2; // ok
-        int i3; // ok
-        private int i4; // ok
+    class PackageInner {
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
 
-        public void foo1() {} // ok
-        protected void foo2() {} // ok
-        void foo3() {} // ok
-        private void foo4() {} // ok
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc2.java
index 7118c6abf08..e1580e125e8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNoJavadoc2.java
@@ -15,27 +15,27 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleNoJavadoc2 // OK
+public class InputJavadocStyleNoJavadoc2
 {
-    private class PrivateInner { // ok
-        public int i1; // ok
-        protected int i2; // ok
-        int i3; // ok
-        private int i4; // ok
+    private class PrivateInner {
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
 
-        public void foo1() {} // ok
-        protected void foo2() {} // ok
-        void foo3() {} // ok
-        private void foo4() {} // ok
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
     }
 
-    class IgnoredName { // ok
+    class IgnoredName {
         // ignore by name
-        private int logger; // ok
+        private int logger;
         // no warning, 'serialVersionUID' fields do not require Javadoc
-        private static final long serialVersionUID = 0; // ok
+        private static final long serialVersionUID = 0;
     }
 
     /**/
-    void methodWithTwoStarComment() {} // ok
+    void methodWithTwoStarComment() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNothing.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNothing.java
index a7ee0733329..46ff07d1d90 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNothing.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleNothing.java
@@ -13,7 +13,7 @@
 
 */
 
-/** Desc but no period */ // ok
+/** Desc but no period */
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
 public class InputJavadocStyleNothing {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet1.java
index c35fafc0faa..c16f0012095 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet1.java
@@ -13,40 +13,40 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleRestrictedTokenSet1 // ok
+public class InputJavadocStyleRestrictedTokenSet1
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
    /** This Javadoc is missing an ending period */
-   private String second; // ok
+   private String second;
 
    /**
     * We don't want {@link com.puppycrawl.tools.checkstyle.checks.JavadocStyleCheck}
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleRestrictedTokenSet1() {} // ok
+   public InputJavadocStyleRestrictedTokenSet1() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
    /**
     * This should fail even.though.there are embedded periods
     */
-   private void method4() {} // ok
+   private void method4() {}
 
    /**
     * Test HTML in Javadoc comment
@@ -58,26 +58,27 @@ private void method4() {} // ok
     * <style>this tag isn't supported in Javadoc</style>
     * @param arg1 <code>dummy.
     */
-   private void method5(int arg1) {} // ok
+   private void method5(int arg1) {}
 
    /**
     * Protected check <b>should fail
     */
-   protected void method6() {} // ok
+   protected void method6() {}
 
    /**
     * Package protected check <b>should fail
     */
-   void method7() {} // ok
+   void method7() {}
 
-   /** // violation
+   // violation below 'First sentence should end with a period.'
+   /**
     * Public check should fail</code>
     * should fail <
     */
    public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
+   public void method9() {}
 
     // Testcases to exercise the Tag parser (bug 843887)
 
@@ -88,7 +89,7 @@ public void method9() {} // ok
      * < br/>
      * <img src="schattenparker.jpg"/></img>
      */
-    private void method10() {} // ok
+    private void method10() {}
 
     /**
      * Tag content can be really mean.
@@ -105,5 +106,5 @@ private void method10() {} // ok
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet2.java
index 599c8260344..097ca5beb1b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet2.java
@@ -13,14 +13,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleRestrictedTokenSet2 // ok
+public class InputJavadocStyleRestrictedTokenSet2
 {
       /**
      * Tags for two lines.
      * <a href="some_link"
      * >Link Text</a>
      */
-    private void method12() {} // ok
+    private void method12() {}
 
     /**
      * First sentence.
@@ -59,56 +59,56 @@ private void method12() {} // ok
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
     /**
      * Some problematic javadoc. Sample usage:
      * <blockquote>
      */
 
-    private void method14() {} // ok
+    private void method14() {}
 
     /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
 
-    private void method15() {} // ok
+    private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
+    public static final int dummy = 4911;
 
     /**
      */
-    public void method16() {} // ok
+    public void method16() {}
 
     /**
      * @param a A parameter
      */
-    protected void method17(String a) {} // ok
+    protected void method17(String a) {}
 
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
     /** @see Object */
-    public void method19() {} // ok
+    public void method19() {}
 
     public enum Test
     {
         /**
          * Value 1 without a period
          */
-        value1, // ok
+        value1,
 
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet3.java
index 030d0b9e673..5db381f9fca 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet3.java
@@ -13,21 +13,28 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleRestrictedTokenSet3 // ok
+public class InputJavadocStyleRestrictedTokenSet3
 {
+    /**
+     * First sentence.
+     * <
+     * /a>
+     */
+    void tagClosedInNextLine() {}
+
     /**
     * A test class.
     * @param <T1> this is NOT an unclosed T1 tag
     * @param <KEY_T> for bug 1649020.
     * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
     */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
         * Retrieves X.
         * @return a value
         */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -37,7 +44,7 @@ public T1 getX() // ok
         * @param <V> this is not an unclosed V tag
         * @return a value
         */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -48,7 +55,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -59,7 +66,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -69,7 +76,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -78,13 +85,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -92,7 +99,7 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
     /**
      * Checks HTML tags in javadoc.
@@ -101,6 +108,5 @@ public void method20() {} // ok
      * <string>Tests</string>
      *
      */
-    public void method21() {} // ok
-
+    public void method21() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet4.java
index 074e711c5ab..1e4d96d9cb2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleRestrictedTokenSet4.java
@@ -13,82 +13,77 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleRestrictedTokenSet4 // ok
+public class InputJavadocStyleRestrictedTokenSet4
 {
-     /**
-     * First sentence.
-     * <
-     * /a>
-     */
-    void tagClosedInNextLine() {} // ok
-
     /**
      * Link to some page in two lines.
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
     /**
      * This Javadoc contains unclosed tag.
      * <code>unclosed 'code' tag<code>
      */
-    private void unclosedTag() {} // ok
+    private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
 
     /**
      * {@inheritDoc}
      */
-    private void inheritDoc() {} // ok
+    private void inheritDoc() {}
 
     /**
      * <p><b>Note:<b> it's unterminated tag.</p>
      */
-    private void unterminatedTag() {} // ok
+    private void unterminatedTag() {}
 
     /**
      * Javadoc without dot
      */
-    public interface TestInterface { // ok
-        /** // violation
+    public interface TestInterface {
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         void method();
     }
 
-    static class TestStaticClass { // ok
+    static class TestStaticClass {
         /**
          * Javadoc without dot
          */
-        public int field; // ok
+        public int field;
     }
 
     /**
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
     /**
      * text /
      * @throws Exception if an error occurs
      */
-    void bar() throws Exception {} // ok
+    void bar() throws Exception {}
 
     /**
      * {@inheritDoc}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * /
      *
      **
@@ -98,7 +93,7 @@ void inheritDocWithThrows() {} // ok
     public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -107,7 +102,7 @@ void inheritDocWithThrows() {} // ok
           ; i &lt; j; i++, j--) {}
        </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -115,5 +110,5 @@ public void test2() {} // ok
 public class SampleTest {
 }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage1.java
index 3c2aef008da..d6e55df45cf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage1.java
@@ -18,37 +18,37 @@
 public class InputJavadocStyleScopePackage1
 {
     // This is OK. We don't flag missing javadoc.  That's left for other checks.
-    private String first; // ok
+    private String first;
 
     /** This Javadoc is missing an ending period */
-    private String second; // ok
+    private String second;
 
     /**
      * We don't want {@link com.puppycrawl.tools.checkstyle.checks.JavadocStyleCheck}
      * tags to stop the scan for the end of sentence.
      * @see Something
      */
-    public InputJavadocStyleScopePackage1() {} // ok
+    public InputJavadocStyleScopePackage1() {}
 
     /**
      * This is ok!
      */
-    private void method1() {} // ok
+    private void method1() {}
 
     /**
      * This is ok?
      */
-    private void method2() {} // ok
+    private void method2() {}
 
     /**
      * And This is ok.<br>
      */
-    private void method3() {} // ok
+    private void method3() {}
 
     /**
      * This should fail even.though.there are embedded periods
      */
-    private void method4() {} // ok
+    private void method4() {}
 
     /**
      * Test HTML in Javadoc comment
@@ -60,26 +60,33 @@ private void method4() {} // ok
      * <style>this tag isn't supported in Javadoc</style>
      * @param arg1 <code>dummy.
      */
-    private void method5(int arg1) {} // ok
+    private void method5(int arg1) {}
 
-    /** // violation
-     * Protected check <b>should fail // violation
+    // violation 2 lines below 'First sentence should end with a period.'
+    // violation 2 lines below 'Unclosed HTML tag found: <b>'
+    /**
+     * Protected check <b>
      */
     protected void method6() {}
 
-    /** // violation
-     * Package protected check <b>should fail // violation
+    // violation 2 lines below 'First sentence should end with a period.'
+    // violation 2 lines below 'Unclosed HTML tag found: <b>'
+    /**
+     * Package protected check <b>
      */
     void method7() {}
 
-    /** // violation
-     * Public check should fail</code> // violation
+    // violation 3 lines below 'First sentence should end with a period.'
+    // violation 3 lines below 'Extra HTML tag found: </code>'
+    // violation 3 lines below 'should fail <'
+    /**
+     * Public check should fail</code>
      * should fail <
-     */ // violation above
+     */
     public void method8() {}
 
     /** {@inheritDoc} **/
-    public void method9() {} // ok
+    public void method9() {}
 
     // Testcases to exercise the Tag parser (bug 843887)
 
@@ -90,7 +97,7 @@ public void method9() {} // ok
      * < br/>
      * <img src="schattenparker.jpg"/></img>
      */
-    private void method10() {} // ok
+    private void method10() {}
 
     /**
      * Tag content can be really mean.
@@ -107,12 +114,5 @@ private void method10() {} // ok
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
-
-    /**
-     * Tags for two lines.
-     * <a href="some_link"
-     * >Link Text</a>
-     */
-    private void method12() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage2.java
index ea5458f7fcb..c88c7614642 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage2.java
@@ -17,6 +17,13 @@
 
 public class InputJavadocStyleScopePackage2
 {
+    /**
+     * Tags for two lines.
+     * <a href="some_link"
+     * >Link Text</a>
+     */
+    private void method12() {}
+
     /**
      * First sentence.
      * <pre>
@@ -54,34 +61,34 @@ public class InputJavadocStyleScopePackage2
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
     /**
      * Some problematic javadoc. Sample usage:
      * <blockquote>
      */
 
-    private void method14() {} // ok
+    private void method14() {}
 
     /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
 
-    private void method15() {} // ok
+    private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
-    // violation below
+    public static final int dummy = 4911;
+    // violation below 'Javadoc has empty description section'
     /**
      */
     public void method16() {}
-    // violation below
+    // violation below 'Javadoc has empty description section'
     /**
      * @param a A parameter
      */
     protected void method17(String a) {}
-    // violation below
+    // violation below 'Javadoc has empty description section'
     /**
      * @exception RuntimeException should be thrown
      */
@@ -89,14 +96,16 @@ void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
-    /** @see Object */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** @see Object */
     public void method19() {}
 
     public enum Test
     {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Value 1 without a period
          */
         value1,
@@ -104,6 +113,6 @@ public enum Test
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage3.java
index 0d879d1cc3a..3d17ae223d6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage3.java
@@ -23,13 +23,13 @@ public class InputJavadocStyleScopePackage3
      * @param <KEY_T> for bug 1649020.
      * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
      */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
          * Retrieves X.
          * @return a value
          */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -39,7 +39,7 @@ public T1 getX() // ok
          * @param <V> this is not an unclosed V tag
          * @return a value
          */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -50,7 +50,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -61,7 +61,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -71,7 +71,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -80,13 +80,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -94,13 +94,14 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
+    // violation 5 lines below 'Extra HTML tag found: </string>'
     /**
      * Checks HTML tags in javadoc.
      *
      * HTML no good tag
-     * <string>Tests</string> // violation
+     * <string>Tests</string>
      *
      */
     public void method21() {}
@@ -110,5 +111,5 @@ public void method21() {}
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage4.java
index d98485905d7..e7a0ee9e18f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePackage4.java
@@ -22,43 +22,46 @@ public class InputJavadocStyleScopePackage4
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
     /**
      * This Javadoc contains unclosed tag.
      * <code>unclosed 'code' tag<code>
      */
-    private void unclosedTag() {} // ok
+    private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
 
     /**
      * {@inheritDoc}
      */
-    private void inheritDoc() {} // ok
+    private void inheritDoc() {}
 
     /**
      * <p><b>Note:<b> it's unterminated tag.</p>
      */
-    private void unterminatedTag() {} // ok
+    private void unterminatedTag() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Javadoc without dot
      */
     public interface TestInterface {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         void method();
     }
 
-    static class TestStaticClass { // ok
-        /** // violation
+    static class TestStaticClass {
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         public int field;
@@ -68,9 +71,10 @@ static class TestStaticClass { // ok
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * text /
      * @throws Exception if an error occurs
      */
@@ -81,9 +85,10 @@ void bar() throws Exception {}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * /
      *
      **
@@ -93,7 +98,7 @@ void inheritDocWithThrows() {} // ok
     public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -102,7 +107,7 @@ void inheritDocWithThrows() {} // ok
      ; i &lt; j; i++, j--) {}
      </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -110,5 +115,5 @@ public void test2() {} // ok
      public class SampleTest {
      }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected1.java
index 68bb022c032..09be177920f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected1.java
@@ -15,40 +15,40 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopeProtected1 // ok
+public class InputJavadocStyleScopeProtected1
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
    /** This Javadoc is missing an ending period */
-   private String second; // ok
+   private String second;
 
    /**
     * We don't want {@link com.puppycrawl.tools.checkstyle.checks.JavadocStyleCheck}
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleScopeProtected1() {} // ok
+   public InputJavadocStyleScopeProtected1() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
    /**
     * This should fail even.though.there are embedded periods
     */
-   private void method4() {} // ok
+   private void method4() {}
 
    /**
     * Test HTML in Javadoc comment
@@ -60,26 +60,31 @@ private void method4() {} // ok
     * <style>this tag isn't supported in Javadoc</style>
     * @param arg1 <code>dummy.
     */
-   private void method5(int arg1) {} // ok
+   private void method5(int arg1) {}
 
-   /** // violation
-    * Protected check <b>should fail // violation
+   // violation 2 lines below 'First sentence should end with a period.'
+   // violation 2 lines below 'Unclosed HTML tag found: <b>'
+   /**
+    * Protected check <b>
     */
    protected void method6() {}
 
    /**
     * Package protected check <b>should fail
     */
-   void method7() {} // ok
+   void method7() {}
 
-   /** // violation
-    * Public check should fail</code> // violation
+   // violation 3 lines below 'First sentence should end with a period.'
+   // violation 3 lines below 'Extra HTML tag found: </code>'
+   // violation 3 lines below 'should fail <'
+   /**
+    * Public check should fail</code>
     * should fail <
-    */ // violation above
+    */
    public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
+   public void method9() {}
 
 
     // Testcases to exercise the Tag parser (bug 843887)
@@ -91,7 +96,7 @@ public void method9() {} // ok
      * < br/>
      * <img src="schattenparker.jpg"/></img>
      */
-    private void method10() {} // ok
+    private void method10() {}
 
     /**
      * Tag content can be really mean.
@@ -108,12 +113,5 @@ private void method10() {} // ok
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
-
-    /**
-     * Tags for two lines.
-     * <a href="some_link"
-     * >Link Text</a>
-     */
-    private void method12() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected2.java
index e47ceb7d195..e4c4e75715c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected2.java
@@ -15,9 +15,16 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopeProtected2 // ok
+public class InputJavadocStyleScopeProtected2
 {
-      /**
+    /**
+     * Tags for two lines.
+     * <a href="some_link"
+     * >Link Text</a>
+     */
+    private void method12() {}
+
+    /**
      * First sentence.
      * <pre>
      * +--LITERAL_DO (do)
@@ -54,29 +61,29 @@ public class InputJavadocStyleScopeProtected2 // ok
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
     /**
      * Some problematic javadoc. Sample usage:
      * <blockquote>
      */
 
-    private void method14() {} // ok
+    private void method14() {}
 
     /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
 
-    private void method15() {} // ok
+    private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
-    // violation below
+    public static final int dummy = 4911;
+    // violation below 'Javadoc has empty description section'
     /**
      */
     public void method16() {}
-    // violation below
+    // violation below 'Javadoc has empty description section'
     /**
      * @param a A parameter
      */
@@ -85,18 +92,20 @@ protected void method17(String a) {}
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
-    /** @see Object */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** @see Object */
     public void method19() {}
 
     public enum Test
     {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Value 1 without a period
          */
         value1,
@@ -104,6 +113,6 @@ public enum Test
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected3.java
index d71a3088de6..bbbed86c4ba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected3.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopeProtected3 // ok
+public class InputJavadocStyleScopeProtected3
 {
     /**
     * A test class.
@@ -23,13 +23,13 @@ public class InputJavadocStyleScopeProtected3 // ok
     * @param <KEY_T> for bug 1649020.
     * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
     */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
         * Retrieves X.
         * @return a value
         */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -39,7 +39,7 @@ public T1 getX() // ok
         * @param <V> this is not an unclosed V tag
         * @return a value
         */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -50,7 +50,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -61,7 +61,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -71,7 +71,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -80,13 +80,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -94,13 +94,14 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
+    // violation 5 lines below 'Extra HTML tag found: </string>'
     /**
      * Checks HTML tags in javadoc.
      *
      * HTML no good tag
-     * <string>Tests</string> // violation
+     * <string>Tests</string>
      *
      */
     public void method21() {}
@@ -110,5 +111,5 @@ public void method21() {}
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected4.java
index 8c28bd4e463..f6a1d39c1c6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopeProtected4.java
@@ -15,75 +15,78 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopeProtected4 // ok
+public class InputJavadocStyleScopeProtected4
 {
     /**
      * Link to some page in two lines.
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
     /**
      * This Javadoc contains unclosed tag.
      * <code>unclosed 'code' tag<code>
      */
-    private void unclosedTag() {} // ok
+    private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
 
     /**
      * {@inheritDoc}
      */
-    private void inheritDoc() {} // ok
+    private void inheritDoc() {}
 
     /**
      * <p><b>Note:<b> it's unterminated tag.</p>
      */
-    private void unterminatedTag() {} // ok
+    private void unterminatedTag() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Javadoc without dot
      */
     public interface TestInterface {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         void method();
     }
 
-    static class TestStaticClass { // ok
+    static class TestStaticClass {
         /**
          * Javadoc without dot
          */
-        public int field; // ok
+        public int field;
     }
 
     /**
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
     /**
      * text /
      * @throws Exception if an error occurs
      */
-    void bar() throws Exception {} // ok
+    void bar() throws Exception {}
 
     /**
      * {@inheritDoc}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * /
      *
      **
@@ -93,7 +96,7 @@ void inheritDocWithThrows() {} // ok
     public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -102,7 +105,7 @@ void inheritDocWithThrows() {} // ok
           ; i &lt; j; i++, j--) {}
        </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -110,5 +113,5 @@ public void test2() {} // ok
 public class SampleTest {
 }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic1.java
index d0befa3ab2c..35fe372929d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic1.java
@@ -15,40 +15,40 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopePublic1 // ok
+public class InputJavadocStyleScopePublic1
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
-   private String first; // ok
+   private String first;
 
    /** This Javadoc is missing an ending period */
-   private String second; // ok
+   private String second;
 
    /**
     * We don't want {@link com.puppycrawl.tools.checkstyle.checks.JavadocStyleCheck}
     * tags to stop the scan for the end of sentence.
     * @see Something
     */
-   public InputJavadocStyleScopePublic1() {} // ok
+   public InputJavadocStyleScopePublic1() {}
 
    /**
     * This is ok!
     */
-   private void method1() {} // ok
+   private void method1() {}
 
    /**
     * This is ok?
     */
-   private void method2() {} // ok
+   private void method2() {}
 
    /**
     * And This is ok.<br>
     */
-   private void method3() {} // ok
+   private void method3() {}
 
    /**
     * This should fail even.though.there are embedded periods
     */
-   private void method4() {} // ok
+   private void method4() {}
 
    /**
     * Test HTML in Javadoc comment
@@ -60,26 +60,29 @@ private void method4() {} // ok
     * <style>this tag isn't supported in Javadoc</style>
     * @param arg1 <code>dummy.
     */
-   private void method5(int arg1) {} // ok
+   private void method5(int arg1) {}
 
    /**
     * Protected check <b>should fail
     */
-   protected void method6() {} // ok
+   protected void method6() {}
 
    /**
     * Package protected check <b>should fail
     */
-   void method7() {} // ok
+   void method7() {}
 
-   /** // violation
-    * Public check should fail</code> // violation
+   // violation 3 lines below 'First sentence should end with a period.'
+   // violation 3 lines below 'Extra HTML tag found: </code>'
+   // violation 3 lines below 'should fail <'
+   /**
+    * Public check should fail</code>
     * should fail <
-    */ // violation above
+    */
    public void method8() {}
 
    /** {@inheritDoc} **/
-   public void method9() {} // ok
+   public void method9() {}
 
     // Testcases to exercise the Tag parser (bug 843887)
 
@@ -90,7 +93,7 @@ public void method9() {} // ok
      * < br/>
      * <img src="schattenparker.jpg"/></img>
      */
-    private void method10() {} // ok
+    private void method10() {}
 
     /**
      * Tag content can be really mean.
@@ -107,5 +110,5 @@ private void method10() {} // ok
      * <img src="slashesCanOccurWithin/attributes.jpg">
      * <!-- comments <div> should not be checked. -->
      */
-    private void method11() {} // ok
+    private void method11() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic2.java
index 652536ac864..b5c0fcf54e3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic2.java
@@ -15,14 +15,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopePublic2 // ok
+public class InputJavadocStyleScopePublic2
 {
      /**
      * Tags for two lines.
      * <a href="some_link"
      * >Link Text</a>
      */
-    private void method12() {} // ok
+    private void method12() {}
 
     /**
      * First sentence.
@@ -61,25 +61,25 @@ private void method12() {} // ok
      *     +--SEMI (;)
      * </pre>
      */
-    private void method13() {} // ok
+    private void method13() {}
 
     /**
      * Some problematic javadoc. Sample usage:
      * <blockquote>
      */
 
-    private void method14() {} // ok
+    private void method14() {}
 
     /**
      * Empty line between javadoc and method declaration cause wrong
      * line number for reporting error (bug 841942)
      */
 
-    private void method15() {} // ok
+    private void method15() {}
 
     /** Description of field: {@value}. */
-    public static final int dummy = 4911; // ok
-     // violation below
+    public static final int dummy = 4911;
+    // violation below 'Javadoc has empty description section'
     /**
      */
     public void method16() {}
@@ -87,23 +87,25 @@ public void method16() {}
     /**
      * @param a A parameter
      */
-    protected void method17(String a) {} // ok
+    protected void method17(String a) {}
 
     /**
      * @exception RuntimeException should be thrown
      */
-    void method18(String a) {} // ok
+    void method18(String a) {}
 
     /**
      */
-    private static int ASDF = 0; // ok
+    private static int ASDF = 0;
 
-    /** @see Object */ // violation
+    // violation below 'Javadoc has empty description section'
+    /** @see Object */
     public void method19() {}
 
     public enum Test
     {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Value 1 without a period
          */
         value1,
@@ -111,7 +113,7 @@ public enum Test
         /**
          * Value 2 with a period.
          */
-        value2, // ok
+        value2,
     }
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic3.java
index f0aa0dd65a6..1757c441fd7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic3.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopePublic3 // ok
+public class InputJavadocStyleScopePublic3
 {
      /**
     * A test class.
@@ -23,13 +23,13 @@ public class InputJavadocStyleScopePublic3 // ok
     * @param <KEY_T> for bug 1649020.
     * @author <a href="mailto:foo@nomail.com">Foo Bar</a>
     */
-    public class TestClass<T1, KEY_T> // ok
+    public class TestClass<T1, KEY_T>
     {
         /**
         * Retrieves X.
         * @return a value
         */
-        public T1 getX() // ok
+        public T1 getX()
         {
             return null;
         }
@@ -39,7 +39,7 @@ public T1 getX() // ok
         * @param <V> this is not an unclosed V tag
         * @return a value
         */
-        public <V> V getY() // ok
+        public <V> V getY()
         {
             return null;
         }
@@ -50,7 +50,7 @@ public <V> V getY() // ok
          * @param <KEY_T1> this is not an unclosed KEY_T tag
          * @return a value
          */
-        public <KEY_T1> KEY_T getZ_1649020_1() // ok
+        public <KEY_T1> KEY_T getZ_1649020_1()
         {
             return null;
         }
@@ -61,7 +61,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <KEY_T_$_1_t> strange type
          * @return a value
          */
-        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() { // ok
+        public <KEY_T_$_1_t> KEY_T_$_1_t getEh_1649020_2() {
             return null;
         }
 
@@ -71,7 +71,7 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
          * @param <$_12_xY_z> strange type
          * @return a value
          */
-        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() { // ok
+        public <$_12_xY_z> $_12_xY_z getUmmm_1649020_3() {
             return null;
         }
     }
@@ -80,13 +80,13 @@ public <KEY_T1> KEY_T getZ_1649020_1() // ok
      * Checks if the specified IClass needs to be
      * annotated with the @Type annotation.
      */
-    public void foo_1291847_1() {} // ok
+    public void foo_1291847_1() {}
 
     /**
      * Returns the string containing the properties of
      * <code>@Type</code> annotation.
      */
-    public void foo_1291847_2() {} // ok
+    public void foo_1291847_2() {}
 
     /**
      * Checks generics javadoc.
@@ -94,13 +94,14 @@ public void foo_1291847_2() {} // ok
      * @param strings this is a List<String>
      * @param test Map<String, List<String>> a map indexed on String of Lists of Strings.
      */
-    public void method20() {} // ok
+    public void method20() {}
 
+    //violation 5 lines below 'Extra HTML tag found: </string>'
     /**
      * Checks HTML tags in javadoc.
      *
      * HTML no good tag
-     * <string>Tests</string> // violation
+     * <string>Tests</string>
      *
      */
     public void method21() {}
@@ -110,6 +111,6 @@ public void method21() {}
      * <
      * /a>
      */
-    void tagClosedInNextLine() {} // ok
+    void tagClosedInNextLine() {}
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic4.java
index 7ff594b95bf..bdf35e49886 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/InputJavadocStyleScopePublic4.java
@@ -15,75 +15,78 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle;
 
-public class InputJavadocStyleScopePublic4 // ok
+public class InputJavadocStyleScopePublic4
 {
        /**
      * Link to some page in two lines.
      * <a
      * href="someLink"/>
      */
-    void tagInTwoLines() {} // ok
+    void tagInTwoLines() {}
 
     /**
      * This Javadoc contains unclosed tag.
      * <code>unclosed 'code' tag<code>
      */
-    private void unclosedTag() {} // ok
+    private void unclosedTag() {}
 
-    void javadocLikeCommentInMethod() { // ok
+    void javadocLikeCommentInMethod() {
         /**
          * It pretends to be Javadoc without dot, but it's just comment in method
          */
-        final int i = 0; // ok
+        final int i = 0;
     }
 
     /**
      * {@inheritDoc}
      */
-    private void inheritDoc() {} // ok
+    private void inheritDoc() {}
 
     /**
      * <p><b>Note:<b> it's unterminated tag.</p>
      */
-    private void unterminatedTag() {} // ok
+    private void unterminatedTag() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * Javadoc without dot
      */
     public interface TestInterface {
-        /** // violation
+        // violation below 'First sentence should end with a period.'
+        /**
          * Javadoc without dot
          */
         void method();
     }
 
-    static class TestStaticClass { // ok
+    static class TestStaticClass {
         /**
          * Javadoc without dot
          */
-        public int field; // ok
+        public int field;
     }
 
     /**
      * .
      * @throws Exception if an error occurs
      */
-    void foo() throws Exception {} // ok
+    void foo() throws Exception {}
 
     /**
      * text /
      * @throws Exception if an error occurs
      */
-    void bar() throws Exception {} // ok
+    void bar() throws Exception {}
 
     /**
      * {@inheritDoc}
      * <p>
      * @throws IllegalArgumentException with errMsg as its message
      */
-    void inheritDocWithThrows() {} // ok
+    void inheritDocWithThrows() {}
 
-    /** // violation
+    // violation below 'First sentence should end with a period.'
+    /**
      * /
      *
      **
@@ -93,7 +96,7 @@ void inheritDocWithThrows() {} // ok
     public int test(String s) { return 0; }
 
     /** Set of all class field names.*/
-    public String field; // ok
+    public String field;
 
     /**
      * <p>Test.</p>
@@ -102,7 +105,7 @@ void inheritDocWithThrows() {} // ok
           ; i &lt; j; i++, j--) {}
        </pre>
      */
-    public void test2() {} // ok
+    public void test2() {}
 
     /**
      * <p>Test.</p>
@@ -110,5 +113,5 @@ public void test2() {} // ok
 public class SampleTest {
 }</code></pre>
      */
-    public void test3() {} // ok
+    public void test3() {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidformat/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidformat/package-info.java
index 4d9d39517b0..6573d35d878 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidformat/package-info.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidformat/package-info.java
@@ -13,7 +13,8 @@
 
 */
 
-/** // violation
+// violation below 'First sentence should end with a period.'
+/**
  * blah blah
  */
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocstyle.pkginfo.invalidformat;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidinherit/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidinherit/package-info.java
index 03478e2b944..8c4a896d56f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidinherit/package-info.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/pkginfo/invalidinherit/package-info.java
@@ -12,7 +12,7 @@
 
 
 */
-// violation below
+// violation below 'First sentence should end with a period.'
 /**
  * {@inheritDoc} Where are we inheriting from
  */
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType1.java
index 8e1a2520095..17b4551e293 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType1.java
@@ -14,7 +14,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-// ok
+
 public class InputJavadocType1 {
 
     /**<p>Some Javadoc. //warn
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType3.java
index 4c01737e198..444ab8531d1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocType3.java
@@ -14,7 +14,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-// ok
+
 public class InputJavadocType3 {
     /**
      * @param <P> some parameter
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations.java
index 7ececd69df3..05b1821bf02 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations.java
@@ -16,7 +16,7 @@
 
 import java.lang.SuppressWarnings;
 
-@ThisIsOk // ok
+@ThisIsOk
 class InputJavadocTypeAllowedAnnotations {
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_1.java
index 3ee3330e350..138773022b6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_1.java
@@ -12,23 +12,23 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype; // ok
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-import java.lang.SuppressWarnings; // ok
+import java.lang.SuppressWarnings;
 
-@ThisIsOk_1 // ok
-class InputJavadocTypeAllowedAnnotations_1 { // ok
-} // ok
+@ThisIsOk_1
+class InputJavadocTypeAllowedAnnotations_1 {
+}
 
-@com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype.ThisIsOk_1 // ok
-class InputJavadocTypeAllowedAnnotationsFQN_1 { // ok
-} // ok
+@com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype.ThisIsOk_1
+class InputJavadocTypeAllowedAnnotationsFQN_1 {
+}
 
-@SuppressWarnings(value = "some code generator") // ok
-class InputJavadocTypeAllowedAnnotationByDefault_1 { // ok
-} // ok
+@SuppressWarnings(value = "some code generator")
+class InputJavadocTypeAllowedAnnotationByDefault_1 {
+}
 
 /**
  * Annotation for unit tests.
  */
-@interface ThisIsOk_1 {} // ok
+@interface ThisIsOk_1 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_2.java
index 755ca4527e8..c5b5e51cd9c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_2.java
@@ -17,15 +17,15 @@
 
 import java.lang.SuppressWarnings;
 
-@ThisIsOk_2 // ok
+@ThisIsOk_2
 class InputJavadocTypeAllowedAnnotations_2 {
 }
 
-@com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype.ThisIsOk_2 // ok
+@com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype.ThisIsOk_2
 class InputJavadocTypeAllowedAnnotationsFQN_2 {
 }
 
-@SuppressWarnings(value = "some code generator") // ok
+@SuppressWarnings(value = "some code generator")
 class InputJavadocTypeAllowedAnnotationByDefault_2 {
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_3.java
index c62b808a040..463fcbb79a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeAllowedAnnotations_3.java
@@ -17,15 +17,15 @@
 
 import java.lang.SuppressWarnings;
 
-@ThisIsOk_3 // ok
+@ThisIsOk_3
 class InputJavadocTypeAllowedAnnotations_3 {
 }
 
-@com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype.ThisIsOk_3 // ok
+@com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype.ThisIsOk_3
 class InputJavadocTypeAllowedAnnotationsFQN_3 {
 }
 
-@SuppressWarnings(value = "some code generator") // ok
+@SuppressWarnings(value = "some code generator")
 class InputJavadocTypeAllowedAnnotationByDefault_3 {
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeBadTag_1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeBadTag_1.java
index b892c480f35..cbd94d180c2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeBadTag_1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeBadTag_1.java
@@ -16,8 +16,8 @@
 
 /**
  * The following is a bad tag.
- * @mytag Hello // ok
+ * @mytag Hello
  */
-public class InputJavadocTypeBadTag_1 // ok
+public class InputJavadocTypeBadTag_1
 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInner.java
index 90923198d22..d76a1635be8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInner.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInner.java
@@ -18,7 +18,7 @@
  * Tests having inner types
  * @author Oliver Burn
  **/
-class InputJavadocTypeInner // ok
+class InputJavadocTypeInner
 {
     // ok , two violations
     class InnerInner2
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInterfaceMemberScopeIsPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInterfaceMemberScopeIsPublic.java
index df775bf6dc8..f0f4e84b36c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInterfaceMemberScopeIsPublic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeInterfaceMemberScopeIsPublic.java
@@ -14,7 +14,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-public interface InputJavadocTypeInterfaceMemberScopeIsPublic {// ok
+public interface InputJavadocTypeInterfaceMemberScopeIsPublic {
 
     /** @param <T> unused */  // violation 'Unused @param tag for '<T>'.'
     enum Enum {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeNoJavadocOnInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeNoJavadocOnInterface.java
index 09cc2f0443d..297cf289d2f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeNoJavadocOnInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeNoJavadocOnInterface.java
@@ -14,6 +14,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-class InputJavadocTypeNoJavadocOnInterface { // ok
-    interface NoJavadoc {} // ok
+class InputJavadocTypeNoJavadocOnInterface {
+    interface NoJavadoc {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeParamDescriptionWithAngularTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeParamDescriptionWithAngularTags.java
new file mode 100644
index 00000000000..54904e2a2ae
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeParamDescriptionWithAngularTags.java
@@ -0,0 +1,53 @@
+/*
+JavadocType
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
+
+/**
+ *
+ * @param <T> <stuff>
+ */
+public class InputJavadocTypeParamDescriptionWithAngularTags<T> {}
+
+/**
+ *
+ * @param <T> 🐦‍🔥stuff<stuff>stu🐦‍🔥ff</stuff>stuff🐦‍🔥
+ */
+interface Ronin<T> {}
+
+/**
+ *
+ * @param <T> &lt;stuff&gt;
+ * @param <U> stUff&lt;stuff&gt;sutff&lt;🐦‍🔥&gt;🐦‍🔥
+ */
+class Shogun<T, U> {
+    /**
+     *
+     * @param <T> <//< <stuff></> stuff >>  <stuff>st<u>ff</stuff> >><
+     * @param    <U>     stuff <><><<stuff></></></> stuff
+     * @param <V> /-+`[]:^^<stuff **%%$>##(sutff){stuff}{}()stuff</stuff> @@
+     */
+    interface Mandate<T, U, V> {}
+
+    /**
+     *
+     * @param <V> [(<>{@code stuff<stuff>&lt;stuff&gt;}</>)]{@code {&lt;stuff&gt;}}
+     */
+    class Minowara<V> extends Shogun<T, U> implements Mandate<T, U, V> {}
+}
+
+/**
+ * @param    <T>
+ * @param <P> stuff <><><<stuff></></></> stuff // violation, 'Unused @param tag for '<P>'.'
+ */
+interface Regent<T, U> {} // violation, 'Type Javadoc comment is missing @param <U> tag.'
+
+/**
+ *
+ * @param region [(<>{@code stuff<stuff🐦‍🔥@@@>🐦‍🔥&lt;{stuff}&gt;}</>@)]{@code {&lt;stuff&gt;}}
+ * // violation above, 'Unused @param tag for 'region'.'
+ */
+class Fief {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly.java
index bbed8118dc5..b9d8351aca5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly.java
@@ -14,16 +14,16 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-public class InputJavadocTypePublicOnly // ok
+public class InputJavadocTypePublicOnly
 {
-    private interface InnerInterface // ok
+    private interface InnerInterface
     {
-        String CONST = "InnerInterface"; // ok
-        void method(); // ok
+        String CONST = "InnerInterface";
+        void method();
 
-        class InnerInnerClass // ok
+        class InnerInnerClass
         {
-            private int mData; // ok
+            private int mData;
 
             private InnerInnerClass()
             {
@@ -32,7 +32,7 @@ private InnerInnerClass()
                     };
             }
 
-            void method2() // ok
+            void method2()
             {
                 final Runnable r = new Runnable() {
                         public void run() {};
@@ -41,21 +41,21 @@ void method2() // ok
         }
     }
 
-    private class InnerClass // ok
+    private class InnerClass
     {
-        private int mDiff; // ok
+        private int mDiff;
 
-        void method() // ok
+        void method()
         {
         }
     }
 
-    private int mSize; // ok
-    int mLen; // ok
-    protected int mDeer; // ok
-    public int aFreddo; // ok
+    private int mSize;
+    int mLen;
+    protected int mDeer;
+    public int aFreddo;
+
 
-    // ok
     private InputJavadocTypePublicOnly(int aA)
     {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly1.java
index cf6b9c1c0b4..054a8ea07c5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypePublicOnly1.java
@@ -14,14 +14,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-public class InputJavadocTypePublicOnly1 // ok
+public class InputJavadocTypePublicOnly1
 {
-    private interface InnerInterface // ok
+    private interface InnerInterface
     {
         String CONST = "InnerInterface";
         void method();
 
-        class InnerInnerClass // ok
+        class InnerInnerClass
         {
             private int mData;
 
@@ -32,7 +32,7 @@ private InnerInnerClass()
                     };
             }
 
-            void method2() // ok
+            void method2()
             {
                 final Runnable r = new Runnable() {
                         public void run() {};
@@ -41,11 +41,11 @@ void method2() // ok
         }
     }
 
-    private class InnerClass // ok
+    private class InnerClass
     {
-        private int mDiff; // ok
+        private int mDiff;
 
-        void method() // ok
+        void method()
         {
         }
     }
@@ -56,12 +56,12 @@ void method() // ok
     public int aFreddo;
 
 
-    private InputJavadocTypePublicOnly1(int aA) // ok
+    private InputJavadocTypePublicOnly1(int aA)
     {
     }
 
 
-    InputJavadocTypePublicOnly1(String aA) // ok
+    InputJavadocTypePublicOnly1(String aA)
     {
     }
 
@@ -76,22 +76,22 @@ public InputJavadocTypePublicOnly1(Class<Object> aA)
     }
 
 
-    private void method(int aA) // ok
+    private void method(int aA)
     {
     }
 
 
-    void method(Long aA) // ok
+    void method(Long aA)
     {
     }
 
 
-    protected void method(Class<Object> aA) // ok
+    protected void method(Class<Object> aA)
     {
     }
 
 
-    public void method(StringBuffer aA) // ok
+    public void method(StringBuffer aA)
     {
     }
 
@@ -101,14 +101,14 @@ public void method(StringBuffer aA) // ok
        Writing a little documentation should not be worse than not
        writing any documentation at all.
      */
-    private void method(String aA) // ok
+    private void method(String aA)
     {
     }
 
     /**
        This inner class has no author tag, which is OK.
      */
-    public class InnerWithoutAuthor // ok
+    public class InnerWithoutAuthor
     {
 
     }
@@ -117,11 +117,11 @@ public class InnerWithoutAuthor // ok
     public String toString()
     {
         return super.toString();
-    } // ok
+    }
 
     @Deprecated @Override
     public int hashCode()
     {
         return super.hashCode();
-    } // ok
+    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerClasses1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerClasses1.java
index 3081d708100..e66ea99de2f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerClasses1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerClasses1.java
@@ -23,7 +23,7 @@
 
    @author lkuehne
  */
-public class InputJavadocTypeScopeInnerClasses1 // ok
+public class InputJavadocTypeScopeInnerClasses1
 {
     public class InnerPublic
     {
@@ -50,7 +50,7 @@ public class PrivateHiddenPublic
         }
     }
     /** */
-    protected class InnerPublic2<T> // ok
+    protected class InnerPublic2<T>
     {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces.java
index 266e55182a0..17bd3c3137b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces.java
@@ -14,11 +14,11 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 
-public class InputJavadocTypeScopeInnerInterfaces // ok
+public class InputJavadocTypeScopeInnerInterfaces
 {
 
 
-    private interface PrivateInterface // ok
+    private interface PrivateInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -27,7 +27,7 @@ private interface PrivateInterface // ok
         void mb();
     }
 
-    interface PackageInnerInterface // ok
+    interface PackageInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -36,7 +36,7 @@ interface PackageInnerInterface // ok
         void mb();
     }
 
-    protected interface ProtectedInnerInterface // ok
+    protected interface ProtectedInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -45,7 +45,7 @@ protected interface ProtectedInnerInterface // ok
         void mb();
     }
 
-    public interface PublicInnerInterface // ok
+    public interface PublicInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces1.java
index 54711c24d2d..f08611ac77d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeScopeInnerInterfaces1.java
@@ -18,7 +18,7 @@ public class InputJavadocTypeScopeInnerInterfaces1
 {
 
 
-    private interface PrivateInterface // ok
+    private interface PrivateInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -27,7 +27,7 @@ private interface PrivateInterface // ok
         void mb();
     }
 
-    interface PackageInnerInterface // ok
+    interface PackageInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -36,7 +36,7 @@ interface PackageInnerInterface // ok
         void mb();
     }
 
-    protected interface ProtectedInnerInterface // ok
+    protected interface ProtectedInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -45,7 +45,7 @@ protected interface ProtectedInnerInterface // ok
         void mb();
     }
 
-    public interface PublicInnerInterface // ok
+    public interface PublicInnerInterface
     {
         public String CA = "CONST A";
         String CB = "CONST b";
@@ -65,20 +65,20 @@ public interface PublicInnerInterface // ok
 
     private
     interface
-    MyInterface1 { // ok
+    MyInterface1 {
     }
 
     interface
-    MyInterface2 { // ok
+    MyInterface2 {
     }
 
     protected
     enum
-    MyEnum { // ok
+    MyEnum {
     }
 
     private
     @interface
-    MyAnnotation { // ok
+    MyAnnotation {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeTags.java
index 854a5bd6822..2c2c47c83d3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeTags.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoctype/InputJavadocTypeTags.java
@@ -15,18 +15,18 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;
 import java.io.IOException;
 
-class InputJavadocTypeTags1 // ok
+class InputJavadocTypeTags1
 {
 
-    private int mMissingJavadoc; // ok
+    private int mMissingJavadoc;
 
 
-    void method1() // ok
+    void method1()
     {
     }
 
     /** @param unused asd **/
-    void method2() // ok
+    void method2()
     {
     }
 
@@ -34,7 +34,7 @@ void method2() // ok
     int method3()
     {
         return 3;
-    } // ok
+    }
 
     /**
      * <p>missing return
@@ -43,10 +43,10 @@ int method3()
     int method4(int aOne)
     {
         return aOne;
-    } // ok
+    }
 
     /** missing throws **/
-    void method5()           // ok
+    void method5()
         throws Exception
     {
     }
@@ -55,19 +55,19 @@ void method5()           // ok
      * @see missing throws
      * @see need to see tags to avoid shortcut logic
      **/
-    void method6() // ok
+    void method6()
         throws Exception
     {
     }
 
     /** @throws WrongException problem **/
-    void method7()   // ok
+    void method7()
         throws Exception, NullPointerException
     {
     }
 
     /** missing param **/
-    void method8(int aOne) // ok
+    void method8(int aOne)
     {
     }
 
@@ -75,12 +75,12 @@ void method8(int aOne) // ok
      * @see missing param
      * @see need to see tags to avoid shortcut logic
      **/
-    void method9(int aOne)  // ok
+    void method9(int aOne)
     {
     }
 
     /** @param WrongParam problem **/
-    void method10(int aOne, int aTwo)  // ok
+    void method10(int aOne, int aTwo)
     {
     }
 
@@ -88,7 +88,7 @@ void method10(int aOne, int aTwo)  // ok
      * @param Unneeded parameter
      * @return also unneeded
      **/
-    void method11()   // ok
+    void method11()
     {
     }
 
@@ -99,7 +99,7 @@ void method11()   // ok
     int method12()
     {
         return 0;
-    }  // ok
+    }
 
     /**
      * @param aOne
@@ -116,19 +116,19 @@ int method12()
      *
      * @param aFive
      **/
-    void method13(int aOne, int aTwo, int aThree, int aFour, int aFive)  // ok
+    void method13(int aOne, int aTwo, int aThree, int aFour, int aFive)
     {
     }
 
     /** @param aOne Perfectly legal **/
-    void method14(int aOne)  // ok
+    void method14(int aOne)
     {
     }
 
     /** @throws java.io.IOException
      *               just to see if this is also legal **/
     void method14()
-       throws java.io.IOException    // ok
+       throws java.io.IOException
     {
     }
 
@@ -179,7 +179,7 @@ public String toString()
      * @param aOne valid parameter content
      */
 
-    void method16(int aOne) // ok
+    void method16(int aOne)
     {
     }
 
@@ -273,12 +273,12 @@ void method24() throws IOException
      * The problem should be reported with correct line number.
      */
 
-    void method25()  // ok
+    void method25()
     {
     }
 
     /** {@inheritDoc} */
-    int method26()   // ok
+    int method26()
     { return 0;
     }
 
@@ -286,7 +286,7 @@ int method26()   // ok
      * {@inheritDoc}
      * @return something very important.
      */
-    int method27(int aParam)  // ok
+    int method27(int aParam)
     { return 0;
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java
index c6d2cfd894e..4a3f55bfc20 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java
@@ -20,20 +20,20 @@ class InputJavadocVariableInner2
     class InnerInner2
     {
         // Ignore
-        public int fData; // ok
+        public int fData;
     }
 
     // Ignore - 2 violations
     interface InnerInterface2
     {
         // Ignore - should be all upper case
-        String data = "zxzc"; // ok
+        String data = "zxzc";
 
         // Ignore
         class InnerInterfaceInnerClass
         {
             // Ignore - need Javadoc and made private
-            public int rData; // ok
+            public int rData;
 
             /** needs to be made private unless allowProtected. */
             protected int protectedVariable;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc.java
deleted file mode 100644
index 6a611b1d79c..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-JavadocVariable
-scope = (default)private
-excludeScope = (default)null
-ignoreNamePattern = (default)null
-tokens = (default)ENUM_CONSTANT_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
-
-public class InputJavadocVariableNoJavadoc //comment test
-{
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
-
-    public void foo1() {}
-    protected void foo2() {}
-    void foo3() {}
-    private void foo4() {}
-
-    protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-}
-
-class PackageClass {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
-
-    public void foo1() {}
-    protected void foo2() {}
-    void foo3() {}
-    private void foo4() {}
-
-    public class PublicInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    class IgnoredName {
-        // ignore by name
-        private int logger; // violation
-        // no warning, 'serialVersionUID' fields do not require Javadoc
-        private static final long serialVersionUID = 0;
-    }
-
-    /**/
-    void methodWithTwoStarComment() {}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnInnerClassFields.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnInnerClassFields.java
new file mode 100644
index 00000000000..4e4f65fc8b5
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnInnerClassFields.java
@@ -0,0 +1,60 @@
+/*
+JavadocVariable
+scope = (default)private
+excludeScope = (default)null
+ignoreNamePattern = (default)null
+tokens = (default)ENUM_CONSTANT_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
+
+public class InputJavadocVariableOnInnerClassFields //comment test
+{
+    public int i1; // violation
+    protected int i2; // violation
+    int i3; // violation
+    private int i4; // violation
+
+    public void foo1() {}
+    protected void foo2() {}
+    void foo3() {}
+    private void foo4() {}
+
+    protected class ProtectedInner {
+        public int i1; // violation
+        protected int i2; // violation
+        int i3; // violation
+        private int i4; // violation
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    class PackageInner {
+        public int i1; // violation
+        protected int i2; // violation
+        int i3; // violation
+        private int i4; // violation
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    private class PrivateInner {
+        public int i1; // violation
+        protected int i2; // violation
+        int i3; // violation
+        private int i4; // violation
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnPublicInnerClassFields.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnPublicInnerClassFields.java
new file mode 100644
index 00000000000..2b06ae2137d
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnPublicInnerClassFields.java
@@ -0,0 +1,81 @@
+/*
+JavadocVariable
+scope = (default)private
+excludeScope = (default)null
+ignoreNamePattern = (default)null
+tokens = (default)ENUM_CONSTANT_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
+
+public class InputJavadocVariableOnPublicInnerClassFields {
+    public int i1; // violation
+    protected int i2; // violation
+    int i3; // violation
+    private int i4; // violation
+
+    public void foo1() {}
+    protected void foo2() {}
+    void foo3() {}
+    private void foo4() {}
+
+    public class PublicInner {
+        public int i1; // violation
+        protected int i2; // violation
+        int i3; // violation
+        private int i4; // violation
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    protected class ProtectedInner {
+        public int i1; // violation
+        protected int i2; // violation
+        int i3; // violation
+        private int i4; // violation
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    class PackageInner {
+        public int i1; // violation
+        protected int i2; // violation
+        int i3; // violation
+        private int i4; // violation
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    private class PrivateInner {
+        public int i1; // violation
+        protected int i2; // violation
+        int i3; // violation
+        private int i4; // violation
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    class IgnoredName {
+
+        private int logger; // violation
+        // no warning, 'serialVersionUID' fields do not require Javadoc
+        private static final long serialVersionUID = 0;
+    }
+
+    /**/
+    void methodWithTwoStarComment() {}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodAnnotationField.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodAnnotationField.java
new file mode 100644
index 00000000000..6e652553353
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodAnnotationField.java
@@ -0,0 +1,29 @@
+/*
+MissingJavadocMethod
+minLineCount = 1
+allowedAnnotations = (default)Override
+scope = (default)public
+excludeScope = (default)null
+allowMissingPropertyJavadoc = (default)false
+ignoreMethodNamesRegex = (default)null
+tokens = (default)METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface InputMissingJavadocMethodAnnotationField {
+
+    int method(); // violation 'Missing a Javadoc comment'
+
+    String value() default "AMD"; // violation 'Missing a Javadoc comment'
+}
+
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodSetterGetter3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodSetterGetter3.java
new file mode 100644
index 00000000000..bc2810bf678
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodSetterGetter3.java
@@ -0,0 +1,73 @@
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;
+import com.google.common.base.Objects;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * It is class.
+ * @param <V> ssss
+ * @param <C> dddd
+ */
+public class InputMissingJavadocMethodSetterGetter3<V, C> {
+    private Map<String, Integer> field = new HashMap<>();
+    protected int[] array = new int[10];
+    public static final Long VAR_1 = 1L;
+    static final double VAR_2 = 5.0;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        InputMissingJavadocMethodSetterGetter3<V, C> that =
+                (InputMissingJavadocMethodSetterGetter3<V, C>) o;
+        return Objects.equal(field, that.field) &&
+                Objects.equal(array, that.array);
+    }
+
+    public void doSomething(int value) {
+        if (field.isEmpty()) {
+            field.put(String.valueOf(value), value << 1);
+        } else {
+            if(!field.containsKey(String.valueOf(value))){
+                field.put(String.valueOf(value), value << 1);
+            }
+        }
+
+        if(!field.containsKey(String.valueOf(value))){
+            field.put(String.valueOf(value), value << 1);
+        } else if (value == 10) {
+            array[9] = -1;
+        }
+
+        if(field.size() < 10){
+            array[9] = field.getOrDefault(String.valueOf(value), -1);
+        }
+
+    }
+
+    public Map<String, Integer> getField() {
+        return new HashMap<>(field);
+    }
+
+    public void setField(Map<String, Integer> field) {
+        this.field = field;
+    }
+
+    public void setArray(String name, int... array) {
+        this.array = array;
+    }
+
+    public void anotherMethod(int... array) {
+        this.array = array;
+    }
+
+    public void testReceiver(InputMissingJavadocMethodSetterGetter3<V, C>this, int variable) {}
+
+    public interface Example {
+        void method();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodSetterGetter4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodSetterGetter4.java
new file mode 100644
index 00000000000..0c1e17ff345
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodSetterGetter4.java
@@ -0,0 +1,33 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck
+minLineCount = (default)-1
+allowedAnnotations = (default)Override
+scope = private
+excludeScope = (default)null
+allowMissingPropertyJavadoc = true
+ignoreMethodNamesRegex = (default)null
+tokens = (default)METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;
+
+public class InputMissingJavadocMethodSetterGetter4 {
+
+    private int mNumber;
+
+    public void setNumber(final int number) throws Exception {
+        mNumber = number; // violation above 'Missing a Javadoc comment'
+    }
+
+    public int Cost1() // violation 'Missing a Javadoc comment'
+    {
+        return 666;
+    }
+
+    public int getCost1(int forMe) // violation 'Missing a Javadoc comment'
+    {
+        return 666;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1.java
deleted file mode 100644
index bd753c76b3f..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-MissingJavadocType
-scope = PRIVATE
-excludeScope = (default)null
-skipAnnotations = (default)Generated
-tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
-
-public class InputMissingJavadocTypeNoJavadoc1 // violation
-{
-    public int i1;
-    protected int i2;
-    int i3;
-    private int i4;
-
-    public void foo1() {}
-    protected void foo2() {}
-    void foo3() {}
-    private void foo4() {}
-
-    protected class ProtectedInner { // violation
-        public int i1;
-        protected int i2;
-        int i3;
-        private int i4;
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    class PackageInner { // violation
-        public int i1;
-        protected int i2;
-        int i3;
-        private int i4;
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    private class PrivateInner { // violation
-        public int i1;
-        protected int i2;
-        int i3;
-        private int i4;
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-}
-
-class PackageClass1 { // violation
-    public int i1;
-    protected int i2;
-    int i3;
-    private int i4;
-
-    public void foo1() {}
-    protected void foo2() {}
-    void foo3() {}
-    private void foo4() {}
-
-    public class PublicInner { // violation
-        public int i1;
-        protected int i2;
-        int i3;
-        private int i4;
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    protected class ProtectedInner { // violation
-        public int i1;
-        protected int i2;
-        int i3;
-        private int i4;
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    class PackageInner { // violation
-        public int i1;
-        protected int i2;
-        int i3;
-        private int i4;
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    private class PrivateInner { // violation
-        public int i1;
-        protected int i2;
-        int i3;
-        private int i4;
-
-        public void foo1() {}
-        protected void foo2() {}
-        void foo3() {}
-        private void foo4() {}
-    }
-
-    class IgnoredName { // violation
-        // ignore by name
-        private int logger;
-        // no warning, 'serialVersionUID' fields do not require Javadoc
-        private static final long serialVersionUID = 0;
-    }
-
-    /**/
-    void methodWithTwoStarComment() {}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1One.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1One.java
new file mode 100644
index 00000000000..3422e5782c1
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1One.java
@@ -0,0 +1,60 @@
+/*
+MissingJavadocType
+scope = PRIVATE
+excludeScope = (default)null
+skipAnnotations = (default)Generated
+tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
+
+public class InputMissingJavadocTypeNoJavadoc1One // violation
+{
+    public int i1;
+    protected int i2;
+    int i3;
+    private int i4;
+
+    public void foo1() {}
+    protected void foo2() {}
+    void foo3() {}
+    private void foo4() {}
+
+    protected class ProtectedInner { // violation
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    class PackageInner { // violation
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    private class PrivateInner { // violation
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1Two.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1Two.java
new file mode 100644
index 00000000000..8b2685500a4
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeNoJavadoc1Two.java
@@ -0,0 +1,83 @@
+/*
+MissingJavadocType
+scope = PRIVATE
+excludeScope = (default)null
+skipAnnotations = (default)Generated
+tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
+
+public class InputMissingJavadocTypeNoJavadoc1Two {} // violation
+
+class PackageClass1 { // violation
+    public int i1;
+    protected int i2;
+    int i3;
+    private int i4;
+
+    public void foo1() {}
+    protected void foo2() {}
+    void foo3() {}
+    private void foo4() {}
+
+    public class PublicInner { // violation
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    protected class ProtectedInner { // violation
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    class PackageInner { // violation
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    private class PrivateInner { // violation
+        public int i1;
+        protected int i2;
+        int i3;
+        private int i4;
+
+        public void foo1() {}
+        protected void foo2() {}
+        void foo3() {}
+        private void foo4() {}
+    }
+
+    class IgnoredName { // violation
+        // ignore by name
+        private int logger;
+        // no warning, 'serialVersionUID' fields do not require Javadoc
+        private static final long serialVersionUID = 0;
+    }
+
+    /**/
+    void methodWithTwoStarComment() {}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTags.java
deleted file mode 100644
index c14116ea0da..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTags.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
-MissingJavadocType
-scope = PRIVATE
-excludeScope = (default)null
-skipAnnotations = (default)Generated
-tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
-import java.io.IOException;
-// Tests for Javadoc tags.
-class InputMissingJavadocTypeTags1 // violation
-{
-    // Invalid - should be Javadoc
-    private int mMissingJavadoc;
-
-    // Invalid - should be Javadoc
-    void method1()
-    {
-    }
-
-    /** @param unused asd **/
-    void method2()
-    {
-    }
-
-    /** missing return **/
-    int method3()
-    {
-        return 3;
-    }
-
-    /**
-     * <p>missing return
-     * @param aOne ignored
-     **/
-    int method4(int aOne)
-    {
-        return aOne;
-    }
-
-    /** missing throws **/
-    void method5()
-        throws Exception
-    {
-    }
-
-    /**
-     * @see missing throws
-     * @see need to see tags to avoid shortcut logic
-     **/
-    void method6()
-        throws Exception
-    {
-    }
-
-    /** @throws WrongException problem **/
-    void method7()
-        throws Exception, NullPointerException
-    {
-    }
-
-    /** missing param **/
-    void method8(int aOne)
-    {
-    }
-
-    /**
-     * @see missing param
-     * @see need to see tags to avoid shortcut logic
-     **/
-    void method9(int aOne)
-    {
-    }
-
-    /** @param WrongParam problem **/
-    void method10(int aOne, int aTwo)
-    {
-    }
-
-    /**
-     * @param Unneeded parameter
-     * @return also unneeded
-     **/
-    void method11()
-    {
-    }
-
-    /**
-     * @return first one
-     * @return duplicate
-     **/
-    int method12()
-    {
-        return 0;
-    }
-
-    /**
-     * @param aOne
-     * @param aTwo
-     *
-     *     This is a multiline piece of javadoc
-     *     Unlike the previous one, it actually has content
-     * @param aThree
-     *
-     *
-     *     This also has content
-     * @param aFour
-
-     *
-     * @param aFive
-     **/
-    void method13(int aOne, int aTwo, int aThree, int aFour, int aFive)
-    {
-    }
-
-    /** @param aOne Perfectly legal **/
-    void method14(int aOne)
-    {
-    }
-
-    /** @throws java.io.IOException
-     *               just to see if this is also legal **/
-    void method14()
-       throws java.io.IOException
-    {
-    }
-
-
-
-    // Test static initialiser
-    static
-    {
-        int x = 1; // should not require any javadoc
-    }
-
-    // test initialiser
-    {
-        int z = 2; // should not require any javadoc
-    }
-
-    /** handle where variable declaration over several lines **/
-    private static final int
-        ON_SECOND_LINE = 2;
-
-
-    /**
-     * Documenting different causes for the same exception
-     * in separate tags is OK (bug 540384).
-     *
-     * @throws java.io.IOException if A happens
-     * @throws java.io.IOException if B happens
-     **/
-    void method15()
-       throws java.io.IOException
-    {
-    }
-
-    /** {@inheritDoc} **/
-    public String toString()
-    {
-        return super.toString();
-    }
-
-    /** getting code coverage up **/
-    static final int serialVersionUID = 666;
-
-    //**********************************************************************/
-    // Method Name: method16
-    /**
-     * handle the case of an elaborate header surrounding javadoc comments
-     *
-     * @param aOne valid parameter content
-     */
-    //**********************************************************************/
-    void method16(int aOne)
-    {
-    }
-
-
-    /**
-     * @throws ThreadDeath although bad practice, should be silently ignored
-     * @throws ArrayStoreException another r/t subclass
-     * @throws IllegalMonitorStateException should be told to remove from throws
-     */
-    void method17()
-        throws IllegalMonitorStateException
-    {
-    }
-
-    /**
-     * declaring the imported version of an Exception and documenting
-     * the full class name is OK (bug 658805).
-     * @throws java.io.IOException if bad things happen.
-     */
-    void method18()
-        throws IOException
-    {
-        throw new IOException("to make compiler happy");
-    }
-
-    /**
-     * reverse of bug 658805.
-     * @throws IOException if bad things happen.
-     */
-    void method19()
-        throws java.io.IOException
-    {
-        throw new IOException("to make compiler happy");
-    }
-
-    /**
-     * Bug 579190, "expected return tag when one is there".
-     *
-     * Linebreaks after return tag should be legal.
-     *
-     * @return
-     *   the bug that states that linebreak should be legal
-     */
-    int method20()
-    {
-        return 579190;
-    }
-
-    /**
-     * Bug XXXX, "two tags for the same exception"
-     *
-     * @exception java.io.IOException for some reasons
-     * @exception IOException for another reason
-     */
-    void method21()
-       throws IOException
-    {
-    }
-
-    /**
-     * RFE 540383, "Unused throws tag for exception subclass"
-     *
-     * @exception IOException for some reasons
-     * @exception java.io.FileNotFoundException for another reasons
-     */
-    void method22()
-       throws IOException
-    {
-    }
-
-    /**
-     * @exception WrongException exception w/o class info but matched by name
-     */
-    void method23() throws WrongException
-    {
-    }
-
-    /**
-     * Bug 803577, "allowThrowsTagsForSubclasses/allowMissingThrowsTag interfere"
-     *
-     * no exception tag for IOException, but here is a tag for its subclass.
-     * @exception java.io.FileNotFoundException for another reasons
-     */
-    void method24() throws IOException
-    {
-    }
-
-    /**
-     * Bug 841942, "ArrayIndexOutOfBounds in JavadocStyle".
-     * @param aParam there is no such param in the method.
-     * The problem should be reported with correct line number.
-     */
-
-    void method25()
-    {
-    }
-
-    /** {@inheritDoc} */
-    int method26()
-    { return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @return something very important.
-     */
-    int method27(int aParam)
-    { return 0;
-    }
-
-    /**
-     * @return something very important.
-     * {@inheritDoc}
-     */
-    int method28(int aParam)
-    { return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return 1
-     */
-    public int foo(Object _arg) {
-
-        return 1;
-    }
-}
-
-enum InputJavadocTypeTagsEnum // violation
-{
-    CONSTANT_A,
-
-    /**
-     *
-     */
-    CONSTANT_B,
-
-    CONSTANT_C
-    {
-        /**
-         *
-         */
-        public void someMethod()
-        {
-        }
-
-        public void someOtherMethod()
-        {
-
-        }
-    }
-}
-
-@interface InputJavadocTypeTagsAnnotation // violation
-{
-    String someField();
-    int A_CONSTANT = 0;
-    /** Some javadoc. */
-    int B_CONSTANT = 1;
-    /** @return This tag is valid here and expected with Java 8 */
-    String someField2();
-}
-
-/**
- * Some javadoc.
- */
-public class InputMissingJavadocTypeTags {
-
-    /**
-     * Constructor.
-     */
-    public InputMissingJavadocTypeTags() {
-    }
-
-   /**
-    * Sample method.
-    * @param arg1   first argument
-    * @param arg2   second argument
-    * @return java.lang.String      the result string
-    * @throws java.lang.Exception   in case of problem
-    */
-    public final String myMethod(final String arg1,
-                                 final Object arg2)
-      throws Exception
-    {
-        return null;
-    }
-}
-
-/**
- *  Added to make this file compilable.
- */
-class WrongException extends RuntimeException
-{
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsFour.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsFour.java
new file mode 100644
index 00000000000..74e1747f90d
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsFour.java
@@ -0,0 +1,112 @@
+/*
+MissingJavadocType
+scope = PRIVATE
+excludeScope = (default)null
+skipAnnotations = (default)Generated
+tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
+import java.io.IOException;
+
+/**
+ * Some javadoc.
+ */
+public class InputMissingJavadocTypeTagsFour {}
+
+// Tests for Javadoc tags.
+class InputMissingJavadocTypeTags1Four // violation
+{
+    /**
+     * Documenting different causes for the same exception
+     * in separate tags is OK (bug 540384).
+     *
+     * @throws java.io.IOException if A happens
+     * @throws java.io.IOException if B happens
+     **/
+    void method15()
+       throws java.io.IOException
+    {
+    }
+
+    //**********************************************************************/
+    // Method Name: method16
+    /**
+     * handle the case of an elaborate header surrounding javadoc comments
+     *
+     * @param aOne valid parameter content
+     */
+    //**********************************************************************/
+    void method16(int aOne)
+    {
+    }
+
+
+    /**
+     * @throws ThreadDeath although bad practice, should be silently ignored
+     * @throws ArrayStoreException another r/t subclass
+     * @throws IllegalMonitorStateException should be told to remove from throws
+     */
+    void method17()
+        throws IllegalMonitorStateException
+    {
+    }
+
+    /**
+     * declaring the imported version of an Exception and documenting
+     * the full class name is OK (bug 658805).
+     * @throws java.io.IOException if bad things happen.
+     */
+    void method18()
+        throws IOException
+    {
+        throw new IOException("to make compiler happy");
+    }
+
+    /**
+     * reverse of bug 658805.
+     * @throws IOException if bad things happen.
+     */
+    void method19()
+        throws java.io.IOException
+    {
+        throw new IOException("to make compiler happy");
+    }
+
+    /**
+     * Bug 579190, "expected return tag when one is there".
+     *
+     * Linebreaks after return tag should be legal.
+     *
+     * @return
+     *   the bug that states that linebreak should be legal
+     */
+    int method20()
+    {
+        return 579190;
+    }
+
+    /**
+     * Bug XXXX, "two tags for the same exception"
+     *
+     * @exception java.io.IOException for some reasons
+     * @exception IOException for another reason
+     */
+    void method21()
+       throws IOException
+    {
+    }
+
+    /**
+     * RFE 540383, "Unused throws tag for exception subclass"
+     *
+     * @exception IOException for some reasons
+     * @exception java.io.FileNotFoundException for another reasons
+     */
+    void method22()
+       throws IOException
+    {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsOne.java
new file mode 100644
index 00000000000..3b3436e13dc
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsOne.java
@@ -0,0 +1,103 @@
+/*
+MissingJavadocType
+scope = PRIVATE
+excludeScope = (default)null
+skipAnnotations = (default)Generated
+tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
+import java.io.IOException;
+// Tests for Javadoc tags.
+class InputMissingJavadocTypeTags1One // violation
+{
+     /**
+     * @exception WrongException exception w/o class info but matched by name
+     */
+    void method23() throws WrongException
+    {
+    }
+
+    /**
+     * Bug 803577, "allowThrowsTagsForSubclasses/allowMissingThrowsTag interfere"
+     *
+     * no exception tag for IOException, but here is a tag for its subclass.
+     * @exception java.io.FileNotFoundException for another reasons
+     */
+    void method24() throws IOException
+    {
+    }
+
+    /**
+         * Bug 841942, "ArrayIndexOutOfBounds in JavadocStyle".
+         * @param aParam there is no such param in the method.
+         * The problem should be reported with correct line number.
+         */
+
+        void method25()
+        {
+        }
+}
+
+enum InputJavadocTypeTagsEnum // violation
+{
+    CONSTANT_A,
+
+    /**
+     *
+     */
+    CONSTANT_B,
+
+    CONSTANT_C
+    {
+        /**
+         *
+         */
+        public void someMethod()
+        {
+        }
+
+        public void someOtherMethod()
+        {
+
+        }
+    }
+}
+
+@interface InputJavadocTypeTagsAnnotation // violation
+{
+    String someField();
+    int A_CONSTANT = 0;
+    /** Some javadoc. */
+    int B_CONSTANT = 1;
+    /** @return This tag is valid here and expected with Java 8 */
+    String someField2();
+}
+
+/**
+ * Some javadoc.
+ */
+public class InputMissingJavadocTypeTagsOne {
+
+    /**
+     * Constructor.
+     */
+    public InputMissingJavadocTypeTagsOne() {
+    }
+
+   /**
+    * Sample method.
+    * @param arg1   first argument
+    * @param arg2   second argument
+    * @return java.lang.String      the result string
+    * @throws java.lang.Exception   in case of problem
+    */
+    public final String myMethod(final String arg1,
+                                 final Object arg2)
+      throws Exception
+    {
+        return null;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsThree.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsThree.java
new file mode 100644
index 00000000000..d40c911a080
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsThree.java
@@ -0,0 +1,103 @@
+/*
+MissingJavadocType
+scope = PRIVATE
+excludeScope = (default)null
+skipAnnotations = (default)Generated
+tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
+import java.io.IOException;
+
+/**
+ * Some javadoc.
+ */
+public class InputMissingJavadocTypeTagsThree {}
+
+// Tests for Javadoc tags.
+class InputMissingJavadocTypeTags1Three // violation
+{
+
+    /**
+     * @see missing throws
+     * @see need to see tags to avoid shortcut logic
+     **/
+    void method6()
+        throws Exception
+    {
+    }
+
+    /** @throws WrongException problem **/
+    void method7()
+        throws Exception, NullPointerException
+    {
+    }
+
+    /** missing param **/
+    void method8(int aOne)
+    {
+    }
+
+    /**
+     * @see missing param
+     * @see need to see tags to avoid shortcut logic
+     **/
+    void method9(int aOne)
+    {
+    }
+
+    /** @param WrongParam problem **/
+    void method10(int aOne, int aTwo)
+    {
+    }
+
+    /**
+     * @param Unneeded parameter
+     * @return also unneeded
+     **/
+    void method11()
+    {
+    }
+
+    /**
+     * @return first one
+     * @return duplicate
+     **/
+    int method12()
+    {
+        return 0;
+    }
+
+    /**
+     * @param aOne
+     * @param aTwo
+     *
+     *     This is a multiline piece of javadoc
+     *     Unlike the previous one, it actually has content
+     * @param aThree
+     *
+     *
+     *     This also has content
+     * @param aFour
+
+     *
+     * @param aFive
+     **/
+    void method13(int aOne, int aTwo, int aThree, int aFour, int aFive)
+    {
+    }
+
+     /** @param aOne Perfectly legal **/
+    void method14(int aOne)
+    {
+    }
+
+    /** @throws java.io.IOException
+     *               just to see if this is also legal **/
+    void method14()
+       throws java.io.IOException
+    {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsTwo.java
new file mode 100644
index 00000000000..dfc9920c2de
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadoctype/InputMissingJavadocTypeTagsTwo.java
@@ -0,0 +1,117 @@
+/*
+MissingJavadocType
+scope = PRIVATE
+excludeScope = (default)null
+skipAnnotations = (default)Generated
+tokens = (default)INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadoctype;
+import java.io.IOException;
+
+/**
+ * Some javadoc.
+ */
+public class InputMissingJavadocTypeTagsTwo {}
+
+// Tests for Javadoc tags.
+class InputMissingJavadocTypeTags1Two // violation
+{
+    // Invalid - should be Javadoc
+    private int mMissingJavadoc;
+
+    // Invalid - should be Javadoc
+    void method1()
+    {
+    }
+
+    /** @param unused asd **/
+    void method2()
+    {
+    }
+
+    /** missing return **/
+    int method3()
+    {
+        return 3;
+    }
+
+    /**
+     * <p>missing return
+     * @param aOne ignored
+     **/
+    int method4(int aOne)
+    {
+        return aOne;
+    }
+
+    /** missing throws **/
+    void method5()
+        throws Exception
+    {
+    }
+
+    /** {@inheritDoc} */
+    int method26()
+    { return 0;
+    }
+
+     /**
+     * {@inheritDoc}
+     * @return something very important.
+     */
+    int method27(int aParam)
+    { return 0;
+    }
+
+    /**
+     * @return something very important.
+     * {@inheritDoc}
+     */
+    int method28(int aParam)
+    { return 0;
+    }
+
+    // Test static initialiser
+    static
+    {
+        int x = 1; // should not require any javadoc
+    }
+
+    // test initialiser
+    {
+        int z = 2; // should not require any javadoc
+    }
+
+    /** handle where variable declaration over several lines **/
+    private static final int
+        ON_SECOND_LINE = 2;
+
+    /** {@inheritDoc} **/
+    public String toString()
+    {
+        return super.toString();
+    }
+
+    /** getting code coverage up **/
+    static final int serialVersionUID = 666;
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return 1
+     */
+    public int foo(Object _arg) {
+
+        return 1;
+    }
+}
+
+/**
+ *  Added to make this file compilable.
+ */
+class WrongException extends RuntimeException
+{
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/InputNonEmptyAtclauseDescriptionDifferentCharset.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/InputNonEmptyAtclauseDescriptionDifferentCharset.java
new file mode 100644
index 00000000000..de597ffc75a
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/InputNonEmptyAtclauseDescriptionDifferentCharset.java
@@ -0,0 +1,10 @@
+package com.puppycrawl.tools.checkstyle.checks.javadoc.nonemptyatclausedescription;
+
+public class InputNonEmptyAtclauseDescriptionDifferentCharset {
+
+    /**
+     * @author ü
+     */
+    private void foo() {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/InputNonEmptyAtclauseDescriptionOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/InputNonEmptyAtclauseDescriptionOne.java
index b4e926296da..fc14587a57a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/InputNonEmptyAtclauseDescriptionOne.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/InputNonEmptyAtclauseDescriptionOne.java
@@ -23,7 +23,7 @@ public InputNonEmptyAtclauseDescriptionOne(String a, int b)
 
         /**
          * Some javadoc.
-         * @param a Some javadoc. // ok
+         * @param a Some javadoc.
          * @deprecated Some javadoc.
          */
         public InputNonEmptyAtclauseDescriptionOne(String a)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/requireemptylinebeforeblocktaggroup/InputRequireEmptyLineBeforeBlockTagGroupCorrect.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/requireemptylinebeforeblocktaggroup/InputRequireEmptyLineBeforeBlockTagGroupCorrect.java
index 504de4a3943..f6136d299cf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/requireemptylinebeforeblocktaggroup/InputRequireEmptyLineBeforeBlockTagGroupCorrect.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/requireemptylinebeforeblocktaggroup/InputRequireEmptyLineBeforeBlockTagGroupCorrect.java
@@ -10,7 +10,7 @@
 /**
  * Some Javadoc.
  *
- * @since 8.36 // ok
+ * @since 8.36
  */
 class InputRequireEmptyLineBeforeBlockTagGroupCorrect {
 
@@ -22,7 +22,7 @@ class InputRequireEmptyLineBeforeBlockTagGroupCorrect {
     /**
      * This Javadoc has one tag, with an empty line. There should be no violations.
      *
-     * @since 8.36 // ok
+     * @since 8.36
      */
     public static final byte ONE_TAG = 0;
 
@@ -31,7 +31,7 @@ class InputRequireEmptyLineBeforeBlockTagGroupCorrect {
      * Another independent check will verify if there is too much whitespace.
      *
      *
-     * @since 8.36 // ok
+     * @since 8.36
      */
     public static final byte TWO_BLANK_LINES = 0;
 
@@ -39,7 +39,7 @@ class InputRequireEmptyLineBeforeBlockTagGroupCorrect {
      * This Javadoc has multiple tags, with an empty line before them. There should be no
      * violations.
      *
-     * @param input this is the first tag. // ok
+     * @param input this is the first tag.
      * @return this is the second tag.
      */
     public static boolean test(boolean input) {
@@ -50,7 +50,7 @@ public static boolean test(boolean input) {
      * This javadoc has an empty line with no asterisks. There should be no violation because
      * a separate check ensures the asterisks are well-formed.
 
-     * @param input this is the first tag. // ok
+     * @param input this is the first tag.
      * @return this is the second tag.
      */
     public static boolean noAsterisks(boolean input) {
@@ -58,14 +58,14 @@ public static boolean noAsterisks(boolean input) {
     }
 
     /**
-     * @return this only has a tag. // ok
+     * @return this only has a tag.
      */
     public static boolean test() {
         return false;
     }
 
     /**
-     *@return this tag has no whitespace before it. // ok
+     *@return this tag has no whitespace before it.
      */
     public static boolean noWhiteSpace() {
         return false;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadoc1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadoc1.java
index 449150fb155..1f9ab5b4d0a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadoc1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadoc1.java
@@ -10,7 +10,6 @@
 
 public class InputSummaryJavadoc1 {
 
-    // violation 2 lines below 'Forbidden summary fragment'
     /**
      * {@summary Returns the customer ID.
      *  This method returns. }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadoc2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadoc2.java
new file mode 100644
index 00000000000..6f79c8b95dd
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadoc2.java
@@ -0,0 +1,20 @@
+/*
+SummaryJavadoc
+violateExecutionOnNonTightHtml = true
+forbiddenSummaryFragments = ^Returns the customer ID. This method returns. $
+period = .
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.summaryjavadoc;
+
+public class InputSummaryJavadoc2 {
+
+    // violation 2 lines below 'Forbidden summary fragment'
+    /**
+     * {@summary Returns the customer ID.
+     *  This method returns. }
+     */
+    public void foo() {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInheritDoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInheritDoc.java
new file mode 100644
index 00000000000..cde432b2be9
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/summaryjavadoc/InputSummaryJavadocInheritDoc.java
@@ -0,0 +1,16 @@
+/*
+SummaryJavadoc
+violateExecutionOnNonTightHtml = (default)false
+forbiddenSummaryFragments = (default)^$
+period = (default).
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.summaryjavadoc;
+
+public class InputSummaryJavadocInheritDoc {
+
+    /** <h1> Some header </h1> {@inheritDoc} {@code bar1} text*/
+    void bar2() {} // violation above 'First sentence of Javadoc is missing an ending period'
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexity2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexity2.java
index 23d564b4615..8fedf330814 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexity2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexity2.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
 
-public class InputBooleanExpressionComplexity2 { // ok
+public class InputBooleanExpressionComplexity2 {
     private boolean _a = false; //boolean field
     private boolean _b = false;
     private boolean _c = false;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityLeaves.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityLeaves.java
index 8a32eb9ed3a..8e250068835 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityLeaves.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityLeaves.java
@@ -11,7 +11,7 @@ public class InputBooleanExpressionComplexityLeaves {
     public InputBooleanExpressionComplexityLeaves() {
     }
 
-    public static final ConstructingObjectParser PARSER = new ConstructingObjectParser( // ok
+    public static final ConstructingObjectParser PARSER = new ConstructingObjectParser(
         "restore_snapshot",
         true,
         () -> {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityNPE.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityNPE.java
index 03fbd3d0e92..f6568620bd9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityNPE.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexityNPE.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
 
-public class InputBooleanExpressionComplexityNPE // ok
+public class InputBooleanExpressionComplexityNPE
 {
     static {
         try {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexitySmall.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexitySmall.java
index 1396d22c9df..43884ae27ad 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexitySmall.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/InputBooleanExpressionComplexitySmall.java
@@ -8,7 +8,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
 
-public class InputBooleanExpressionComplexitySmall { // ok
+public class InputBooleanExpressionComplexitySmall {
     public void method() {
         java.awt.EventQueue.invokeLater(() -> {
             try {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling2.java
index eb806d7f428..b56dfab8b73 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling2.java
@@ -29,7 +29,7 @@
 
 import javax.naming.NamingException;
 
-public class InputClassDataAbstractionCoupling2 { // ok
+public class InputClassDataAbstractionCoupling2 {
     private class InnerClass { //singleline comment
         public List _list = new ArrayList();
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling5.java
index 94eef52d442..14ffcde8b0a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCoupling5.java
@@ -18,7 +18,7 @@
 public class InputClassDataAbstractionCoupling5 {
     public void method(String... filenames) {
         final List<File> files = Arrays.stream(filenames)
-                .map(File::new) // ok
+                .map(File::new)
                 .collect(Collectors.toList());
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java
index 56932aeca03..0b9c4faff9e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java
@@ -13,33 +13,30 @@
                   UnsupportedOperationException, Void, boolean, byte, char, double, float, \
                   int, long, short, var, void
 excludeClassesRegexps = (default)^$
-excludedPackages = com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.\
-                   inputs.a.aa, com.puppycrawl.tools.checkstyle.checks.metrics.\
-                   classdataabstractioncoupling.inputs.a.ab, com.puppycrawl.tools.checkstyle.\
-                   checks.metrics.classdataabstractioncoupling.inputs.b, com.puppycrawl.tools.\
-                   checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c
+excludedPackages = org.apache.hc.core5.http.ssl, org.apache.hc.core5.http.protocol, \
+org.apache.hc.core5.http.nio.ssl, org.apache.hc.core5.http.nio.command
 
 
 */
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling;
 
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa.AAClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab.ABClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b.BClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c.CClass;
+import org.apache.hc.core5.http.ssl.TlsCiphers;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
+import org.apache.hc.core5.http.nio.command.CommandSupport;
 
-public class InputClassDataAbstractionCouplingExcludedPackagesAllIgnored { // ok
-    public AAClass aa = new AAClass(); // ok
-    public ABClass ab = new ABClass(); // ok
+public class InputClassDataAbstractionCouplingExcludedPackagesAllIgnored {
+    public TlsCiphers aa = new TlsCiphers();
+    public BasicHttpContext ab = new BasicHttpContext();
 
     class Inner { // total: ok
-        public BClass b = new BClass(); // ok
-        public CClass c = new CClass(); // ok
+        public BasicClientTlsStrategy b = new BasicClientTlsStrategy();
+        public CommandSupport c = new CommandSupport();
     }
 }
 
 class InputClassDataAbstractionCouplingExcludedPackagesAllIgnoredHidden { // total: ok
-    public CClass c = new CClass(); // ok
+    public CommandSupport c = new CommandSupport();
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java
index 555445605fa..9a61a9e0656 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java
@@ -13,28 +13,28 @@
                   UnsupportedOperationException, Void, boolean, byte, char, double, float, \
                   int, long, short, var, void
 excludeClassesRegexps = (default)^$
-excludedPackages = com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a
+excludedPackages = org.apache.hc.core5.http.support
 
 
 */
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling;
 
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa.AAClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab.ABClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b.BClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c.CClass;
+import org.apache.hc.core5.http.ssl.TlsCiphers;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
+import org.apache.hc.core5.http.nio.command.CommandSupport;
 
 public class InputClassDataAbstractionCouplingExcludedPackagesCommonPackage { // violation
-    public AAClass aa = new AAClass(); // ok
-    public ABClass ab = new ABClass(); // ok
+    public TlsCiphers aa = new TlsCiphers();
+    public BasicHttpContext ab = new BasicHttpContext();
 
     class Inner { // violation
-        public BClass b = new BClass();
-        public CClass c = new CClass();
+        public BasicClientTlsStrategy b = new BasicClientTlsStrategy();
+        public CommandSupport c = new CommandSupport();
     }
 }
 
 class InputClassDataAbstractionCouplingExcludedPackagesCommonPackageHidden { // violation
-    public CClass c = new CClass();
+    public CommandSupport c = new CommandSupport();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java
index e67bf89d3db..ee444ce3ce1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java
@@ -13,30 +13,28 @@
                   UnsupportedOperationException, Void, boolean, byte, char, double, float, \
                   int, long, short, var, void
 excludeClassesRegexps = (default)^$
-excludedPackages = com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.\
-                   inputs.c, com.puppycrawl.tools.checkstyle.checks.metrics.\
-                   classdataabstractioncoupling.inputs.b
+excludedPackages = org.apache.hc.core5.http.nio.ssl, org.apache.hc.core5.http.nio.command
 
 
 */
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling;
 
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa.AAClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab.ABClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b.BClass;
-import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c.CClass;
+import org.apache.hc.core5.http.ssl.TlsCiphers;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
+import org.apache.hc.core5.http.nio.command.CommandSupport;
 
 public class InputClassDataAbstractionCouplingExcludedPackagesDirectPackages { // violation
-    public AAClass aa = new AAClass();
-    public ABClass ab = new ABClass();
+    public TlsCiphers aa = new TlsCiphers();
+    public BasicHttpContext ab = new BasicHttpContext();
 
     class Inner { // total: ok
-        public BClass b = new BClass(); // ok
-        public CClass c = new CClass(); // ok
+        public BasicClientTlsStrategy b = new BasicClientTlsStrategy();
+        public CommandSupport c = new CommandSupport();
     }
 }
 
 class InputClassDataAbstractionCouplingExcludedPackagesDirectPackagesHidden { // total: ok
-    public CClass c = new CClass(); // ok
+    public CommandSupport c = new CommandSupport();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java
index ccc7bb51da4..b19a665c348 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa;
 
-public class AAClass { // ok
+public class AAClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java
index 32eacd91562..5c8fdf8baca 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab;
 
-public class ABClass { // ok
+public class ABClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java
index 385c5d26df8..239512ba7d2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b;
 
-public class BClass { // ok
+public class BClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java
index f5da390b952..19c2e1ae8b0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c;
 
-public class CClass { // ok
+public class CClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity.java
index 5466b9a388e..c81a4e308a9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity.java
@@ -70,22 +70,22 @@ public  Object[][] get() {
 }
 
 class InputCollectionsExt {
-    private Collection col; // ok
-    private EnumSet enumSet; // ok
-    private LinkedHashMap map; // ok
-    private LinkedHashSet set; // ok
+    private Collection col;
+    private EnumSet enumSet;
+    private LinkedHashMap map;
+    private LinkedHashSet set;
 }
 
 class InputOptionals {
-    private Optional<Long> op1; // ok
-    private OptionalInt op2; // ok
-    private OptionalLong op3; // ok
-    private OptionalDouble op4; // ok
+    private Optional<Long> op1;
+    private OptionalInt op2;
+    private OptionalLong op3;
+    private OptionalDouble op4;
 }
 
 class InputStreams {
-    private Stream s1; // ok
-    private IntStream s2; // ok
-    private LongStream s3; // ok
-    private DoubleStream s4; // ok
+    private Stream s1;
+    private IntStream s2;
+    private LongStream s3;
+    private DoubleStream s4;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity2.java
index 71d85185906..06bf6acf36e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity2.java
@@ -41,7 +41,7 @@
 
 import javax.naming.NamingException;
 
-public class InputClassFanOutComplexity2 { // ok
+public class InputClassFanOutComplexity2 {
     private class InnerClass { //singleline comment
         public List _list = new ArrayList();
     }
@@ -87,22 +87,22 @@ public  Object[][] get() {
 }
 
 class InputCollectionsExt2 {
-    private Collection col; // ok
-    private EnumSet enumSet; // ok
-    private LinkedHashMap map; // ok
-    private LinkedHashSet set; // ok
+    private Collection col;
+    private EnumSet enumSet;
+    private LinkedHashMap map;
+    private LinkedHashSet set;
 }
 
 class InputOptionals2 {
-    private Optional<Long> op1; // ok
-    private OptionalInt op2; // ok
-    private OptionalLong op3; // ok
-    private OptionalDouble op4; // ok
+    private Optional<Long> op1;
+    private OptionalInt op2;
+    private OptionalLong op3;
+    private OptionalDouble op4;
 }
 
 class InputStreams2 {
-    private Stream s1; // ok
-    private IntStream s2; // ok
-    private LongStream s3; // ok
-    private DoubleStream s4; // ok
+    private Stream s1;
+    private IntStream s2;
+    private LongStream s3;
+    private DoubleStream s4;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity3.java
index afcc7d5e638..7d00494649c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity3.java
@@ -87,22 +87,22 @@ public  Object[][] get() {
 }
 
 class InputCollectionsExt3 {
-    private Collection col; // ok
-    private EnumSet enumSet; // ok
-    private LinkedHashMap map; // ok
-    private LinkedHashSet set; // ok
+    private Collection col;
+    private EnumSet enumSet;
+    private LinkedHashMap map;
+    private LinkedHashSet set;
 }
 
 class InputOptionals3 {
-    private Optional<Long> op1; // ok
-    private OptionalInt op2; // ok
-    private OptionalLong op3; // ok
-    private OptionalDouble op4; // ok
+    private Optional<Long> op1;
+    private OptionalInt op2;
+    private OptionalLong op3;
+    private OptionalDouble op4;
 }
 
 class InputStreams3 {
-    private Stream s1; // ok
-    private IntStream s2; // ok
-    private LongStream s3; // ok
-    private DoubleStream s4; // ok
+    private Stream s1;
+    private IntStream s2;
+    private LongStream s3;
+    private DoubleStream s4;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity4.java
index 0eba892e1b3..7ec39126128 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexity4.java
@@ -87,22 +87,22 @@ public  Object[][] get() {
 }
 
 class InputCollectionsExt4 {
-    private Collection col; // ok
-    private EnumSet enumSet; // ok
-    private LinkedHashMap map; // ok
-    private LinkedHashSet set; // ok
+    private Collection col;
+    private EnumSet enumSet;
+    private LinkedHashMap map;
+    private LinkedHashSet set;
 }
 
 class InputOptionals4 {
-    private Optional<Long> op1; // ok
-    private OptionalInt op2; // ok
-    private OptionalLong op3; // ok
-    private OptionalDouble op4; // ok
+    private Optional<Long> op1;
+    private OptionalInt op2;
+    private OptionalLong op3;
+    private OptionalDouble op4;
 }
 
 class InputStreams4 {
-    private Stream s1; // ok
-    private IntStream s2; // ok
-    private LongStream s3; // ok
-    private DoubleStream s4; // ok
+    private Stream s1;
+    private IntStream s2;
+    private LongStream s3;
+    private DoubleStream s4;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java
index b3850f208cd..b5400036eef 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java
@@ -30,17 +30,17 @@
 import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c.CClass;
 
 public class InputClassFanOutComplexityExcludedPackagesAllIgnored { // total: ok
-    public AAClass aa; // ok
-    public ABClass ab; // ok
+    public AAClass aa;
+    public ABClass ab;
 
     class Inner { // total: ok
-        public BClass b; // ok
-        public CClass c; // ok
+        public BClass b;
+        public CClass c;
     }
 }
 
 class InputClassFanOutComplexityExcludedPackagesAllIgnoredHidden { // total: ok
-    public CClass c; // ok
+    public CClass c;
 }
 
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java
index 579d0842779..b858b6f9a93 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java
@@ -31,11 +31,11 @@ public class InputClassFanOutComplexityExcludedPackagesDirectPackages { // viola
     public ABClass ab;
 
     class Inner { // total: ok
-        public BClass b; // ok
-        public CClass c; // ok
+        public BClass b;
+        public CClass c;
     }
 }
 
 class InputClassFanOutComplexityExcludedPackagesDirectPackagesHidden { // total: ok
-    public CClass c; // ok
+    public CClass c;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityLambdaNew.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityLambdaNew.java
new file mode 100644
index 00000000000..3a3c1be0deb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityLambdaNew.java
@@ -0,0 +1,36 @@
+/*
+ClassFanOutComplexity
+max = 0
+excludedClasses = (default)ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, \
+                  Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, \
+                  EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, \
+                  IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, \
+                  IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, \
+                  LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, \
+                  OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, \
+                  SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, \
+                  StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, \
+                  UnsupportedOperationException, Void, boolean, byte, char, double, float, \
+                  int, long, short, var, void
+excludedPackages = (default)
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity;
+
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import java.io.File;
+
+public class InputClassFanOutComplexityLambdaNew {
+    public void testMethod(Map<String, List<String>> entry) {
+        List<File> files = new ArrayList<>();
+        String string = "";
+        entry.values().stream()
+                .flatMap(List::stream)
+                .map(File::new)
+                .forEach(files::add);
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityMultiDimensionalArray.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityMultiDimensionalArray.java
index 614a00f6823..b2bdd625452 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityMultiDimensionalArray.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityMultiDimensionalArray.java
@@ -20,7 +20,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity;
 
-public class InputClassFanOutComplexityMultiDimensionalArray { // ok
+public class InputClassFanOutComplexityMultiDimensionalArray {
     public Object[][] get() {
         return new Object[][]{};
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityPackageName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityPackageName.java
index 2aaa9315bad..8fdd95db18a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityPackageName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityPackageName.java
@@ -20,7 +20,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity;
 
-public interface InputClassFanOutComplexityPackageName { // ok
+public interface InputClassFanOutComplexityPackageName {
     public com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.
         InputClassFanOutComplexityPackageName method1();
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectAnnotationToken.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectAnnotationToken.java
index ef94f9b7ca5..b22e96d141a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectAnnotationToken.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectAnnotationToken.java
@@ -82,7 +82,7 @@
  */
 @MyAnnotation
 @GwtIncompatible
-public final class InputClassFanOutComplexityRemoveIncorrectAnnotationToken { // ok
+public final class InputClassFanOutComplexityRemoveIncorrectAnnotationToken {
     private static final Ordering<Invokable<?, ?>> BY_METHOD_NAME =
             new Ordering<Invokable<?, ?>>() {
                 @Override
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectTypeParameter.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectTypeParameter.java
index aa0aeade8c4..c4551c8550e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectTypeParameter.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityRemoveIncorrectTypeParameter.java
@@ -25,7 +25,7 @@
 
 import javax.annotation.Nullable;
 
-public class InputClassFanOutComplexityRemoveIncorrectTypeParameter<E> { // ok
+public class InputClassFanOutComplexityRemoveIncorrectTypeParameter<E> {
   private static <E> Collection<E> typePreservingCollection(
       Collection<E> collection, @Nullable Object mutex) {
     if (collection instanceof SortedSet) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java
index 161f1e246d5..22bd747170d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Set;
 
-class InputClassFanOutComplexityVar { // ok
+class InputClassFanOutComplexityVar {
     void method() {
         var x = 1;
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java
index 7ec65275975..d0cda3ea060 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.aa;
 
-public class AAClass { // ok
+public class AAClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java
index 72159d0a636..baa23645aa7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.ab;
 
-public class ABClass { // ok
+public class ABClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java
index b14d3688e55..9cec739b170 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.b;
 
-public class BClass { // ok
+public class BClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java
index 6be7b689686..62214f21f69 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java
@@ -6,5 +6,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c;
 
-public class CClass { // ok
+public class CClass {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks3.java
index 1de5e950b30..67aabaf4f53 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks3.java
@@ -10,7 +10,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.cyclomaticcomplexity;
 
-public class InputCyclomaticComplexitySwitchBlocks3 { // ok
+public class InputCyclomaticComplexitySwitchBlocks3 {
     public void foo2() {
         String programmingLanguage = "Java";
         switch (programmingLanguage) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks4.java
index 932e973f4c9..d08f1a61ded 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/cyclomaticcomplexity/InputCyclomaticComplexitySwitchBlocks4.java
@@ -10,7 +10,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.cyclomaticcomplexity;
 
-public class InputCyclomaticComplexitySwitchBlocks4 { // ok
+public class InputCyclomaticComplexitySwitchBlocks4 {
     public void foo2() {
         String programmingLanguage = "Java";
         switch (programmingLanguage) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS2.java
index 16acdaf65eb..8ad8e048aca 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS2.java
@@ -16,7 +16,7 @@
 
 
 //should give an ncss of 22
-public class InputJavaNCSS2 { // ok
+public class InputJavaNCSS2 {
 
     private Object mObject;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS3.java
index 40f70a3fdff..17cb8258cee 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSS3.java
@@ -16,7 +16,7 @@
 
 
 //should give an ncss of 22
-public class InputJavaNCSS3 { // ok
+public class InputJavaNCSS3 {
 
     private Object mObject;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSResolveMutation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSResolveMutation.java
index f3fe5749726..bf00e31d8d6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSResolveMutation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/javancss/InputJavaNCSSResolveMutation.java
@@ -83,10 +83,10 @@ private int getSmth(int num) {
                 case 1:
                     counter++;
                     break;
-                case 2: // ok
+                case 2:
                     counter += 2;
                     break;
-                case 3: // ok
+                case 3:
                     counter += 3;
                     break;
                 case 6:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityDefault2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityDefault2.java
index 6ed9fc8a937..a9cce2e8f3f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityDefault2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityDefault2.java
@@ -7,7 +7,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics.npathcomplexity;
 
-public class InputNPathComplexityDefault2 { // ok
+public class InputNPathComplexityDefault2 {
     // NP = 2
     public void foo() {
         //NP(while-statement) = (while-range=1) + (expr=0) + 1 = 2
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierOnClassNoViolations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierOnClassNoViolations.java
index 30e2e3db7b6..9c2af977177 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierOnClassNoViolations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/classmemberimpliedmodifier/InputClassMemberImpliedModifierOnClassNoViolations.java
@@ -18,7 +18,7 @@
  *  </module>
  * </pre>
  */
-public class InputClassMemberImpliedModifierOnClassNoViolations { // ok
+public class InputClassMemberImpliedModifierOnClassNoViolations {
 
     public static final int fieldPublicStaticFinal = 1;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnClass.java
index f1a38b5a8a0..a2885e27873 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnClass.java
@@ -13,7 +13,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.modifier.interfacememberimpliedmodifier;
 
-public class InputInterfaceMemberImpliedModifierFieldsOnClass { // ok
+public class InputInterfaceMemberImpliedModifierFieldsOnClass {
 
     public static final int fieldPublicStaticFinal = 1;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnInterface5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnInterface5.java
index dc9322ff9fe..790ecca2971 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnInterface5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierFieldsOnInterface5.java
@@ -13,7 +13,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.modifier.interfacememberimpliedmodifier;
 
-public interface InputInterfaceMemberImpliedModifierFieldsOnInterface5 { // ok
+public interface InputInterfaceMemberImpliedModifierFieldsOnInterface5 {
 
     public static final int fieldPublicStaticFinal = 1;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnClass.java
index be6d3eca5eb..b3b4fffb652 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnClass.java
@@ -13,7 +13,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.modifier.interfacememberimpliedmodifier;
 
-public abstract class InputInterfaceMemberImpliedModifierMethodsOnClass { // ok
+public abstract class InputInterfaceMemberImpliedModifierMethodsOnClass {
 
     public static void methodPublicStatic() {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnInterface4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnInterface4.java
index b9af37023b0..effed7677a5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnInterface4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierMethodsOnInterface4.java
@@ -13,7 +13,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.modifier.interfacememberimpliedmodifier;
 
-public interface InputInterfaceMemberImpliedModifierMethodsOnInterface4 { // ok
+public interface InputInterfaceMemberImpliedModifierMethodsOnInterface4 {
 
     public static void methodPublicStatic() {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnClass.java
index 4968a03d280..0bf6d738d31 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnClass.java
@@ -13,7 +13,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.modifier.interfacememberimpliedmodifier;
 
-public class InputInterfaceMemberImpliedModifierNestedOnClass { // ok
+public class InputInterfaceMemberImpliedModifierNestedOnClass {
 
     interface NestedInterface {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnInterface4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnInterface4.java
index 820871f0dac..44be096edd9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnInterface4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierNestedOnInterface4.java
@@ -13,7 +13,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.modifier.interfacememberimpliedmodifier;
 
-public interface InputInterfaceMemberImpliedModifierNestedOnInterface4 { // ok
+public interface InputInterfaceMemberImpliedModifierNestedOnInterface4 {
 
     public static interface NestedInterfacePublicStatic {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java
index 601c2c259fb..c0849b1a7ba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java
@@ -16,7 +16,7 @@
 /**
  * Input for Java 9 private methods in interfaces.
  */
-public interface InputInterfaceMemberImpliedModifierPrivateMethods { // ok
+public interface InputInterfaceMemberImpliedModifierPrivateMethods {
 
     private static void methodPrivateStatic() {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderDefaultMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderDefaultMethods.java
index bf59ad3fcaf..1fdbe8e1802 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderDefaultMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderDefaultMethods.java
@@ -7,7 +7,7 @@
 package com.puppycrawl.tools.checkstyle.checks.modifier.modifierorder;
 import java.util.Comparator;
 
-public interface InputModifierOrderDefaultMethods extends Comparator<Integer> { // ok
+public interface InputModifierOrderDefaultMethods extends Comparator<Integer> {
     @Override
     default int compare(Integer a, Integer b) {
      return 0;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInInt.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInInt.java
new file mode 100644
index 00000000000..bafe3ca16bf
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInInt.java
@@ -0,0 +1,54 @@
+/*
+RedundantModifier
+tokens = (default)METHOD_DEF, VARIABLE_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, \
+         CTOR_DEF, CLASS_DEF, ENUM_DEF, RESOURCE
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier;
+
+public interface InputRedundantModifierNestedClassInInt {
+    interface PublicInnerInterface {
+        interface PublicInnerInnerInterface {
+            class PublicInnerClassInNestedPublicInterfaces {
+                public PublicInnerClassInNestedPublicInterfaces() { } // OK in public class
+            }
+        }
+    }
+    class PublicClassInsideInt {
+        private interface PrivateNestedInt {
+            class ClassInPrivateNestedInt {
+                public ClassInPrivateNestedInt() { } // violation
+            }
+            public interface PrivateNestedIntWithPublicModifier { // violation
+                class ClassInPrivateNestedInt {
+                    public ClassInPrivateNestedInt() { } // violation
+                }
+            }
+        }
+        public interface PublicInnerInnerPublicInterface {
+            class PublicInnerClassInNestedPublicInterfaces {
+                public PublicInnerClassInNestedPublicInterfaces() { } // OK in public class
+            }
+        }
+        protected interface PublicInnerInnerProtectedInterface {
+          class PublicInnerClassInNestedProtectedInt {
+           public PublicInnerClassInNestedProtectedInt() { } // violation
+          }
+        }
+    }
+    class PublicNestedClassInInterfaceWithPublicConst {
+        public PublicNestedClassInInterfaceWithPublicConst() { } // OK in public class
+        private class PrivateClassInPublicNestedClass {
+            public class PublicInPrivateClass {
+                public PublicInPrivateClass() { } // violation
+            }
+        }
+    }
+    final class FinalNestedClassInInterface {
+        interface InnerInterface {
+            final class FinalNestedClassInNestedInterface {}
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java
deleted file mode 100644
index 03a0cb906b3..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-RedundantModifier
-tokens = (default)METHOD_DEF, VARIABLE_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, \
-         CTOR_DEF, CLASS_DEF, ENUM_DEF, RESOURCE
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier;
-
-public interface InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers {
-    interface PublicInnerInterface {
-        interface PublicInnerInnerInterface {
-            class PublicInnerClassInNestedPublicInterfaces {
-                public PublicInnerClassInNestedPublicInterfaces() { } // OK in public class
-            }
-        }
-    }
-    class PublicClassInsideInterface {
-        private interface PrivateNestedInterface {
-            class ClassInPrivateNestedInterface {
-                public ClassInPrivateNestedInterface() { } // violation
-            }
-            public interface PrivateNestedInterfaceWithPublicModifier { // violation
-                class ClassInPrivateNestedInterface {
-                    public ClassInPrivateNestedInterface() { } // violation
-                }
-            }
-        }
-        public interface PublicInnerInnerPublicInterface {
-            class PublicInnerClassInNestedPublicInterfaces {
-                public PublicInnerClassInNestedPublicInterfaces() { } // OK in public class
-            }
-        }
-        protected interface PublicInnerInnerProtectedInterface {
-          class PublicInnerClassInNestedProtectedInterfaces {
-           public PublicInnerClassInNestedProtectedInterfaces() { } // violation
-          }
-        }
-    }
-    class PublicNestedClassInInterfaceWithPublicConstructor {
-        public PublicNestedClassInInterfaceWithPublicConstructor() { } // OK in public class
-        private class PrivateClassInPublicNestedClass {
-            public class PublicInPrivateClass {
-                public PublicInPrivateClass() { } // violation
-            }
-        }
-    }
-    final class FinalNestedClassInInterface {
-        interface InnerInterface {
-            final class FinalNestedClassInNestedInterface {}
-        }
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierStaticMethodInInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierStaticMethodInInterface.java
index 8ce15d9b6c7..ae496ed7729 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierStaticMethodInInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierStaticMethodInInterface.java
@@ -9,7 +9,7 @@
 package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier;
 
 
-public interface InputRedundantModifierStaticMethodInInterface // ok
+public interface InputRedundantModifierStaticMethodInInterface
 {
     static int f()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java
index 8f8c1df1604..c2eb4487316 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-public abstract class InputAbbreviationAsWordInNameAbstractMultisetSetCount<E> { // ok
+public abstract class InputAbbreviationAsWordInNameAbstractMultisetSetCount<E> {
 
   private static final String SUPPORTS_REMOVE = "";
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java
index 55d31ef73a4..30ca225d5f5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java
@@ -15,7 +15,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-public class InputAbbreviationAsWordInNameReceiver { // ok
+public class InputAbbreviationAsWordInNameReceiver {
   public void foo4(InputAbbreviationAsWordInNameReceiver this) {}
 
   private class Inner {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameTypeSnakeStyle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameTypeSnakeStyle.java
index 9e451d323eb..6cbb5d463ab 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameTypeSnakeStyle.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameTypeSnakeStyle.java
@@ -41,32 +41,32 @@ public class InputAbbreviationAsWordInNameTypeSnakeStyle {
     public int VIOLATION23456 = 50;
 
     void getTEST() {
-    } // ok
+    }
 
-    void getORDER_OBSERVATION() {} // ok
+    void getORDER_OBSERVATION() {}
 
     void getNONE_Test() {}
 
-    void getCLR_Test() {} // ok
+    void getCLR_Test() {}
 
-    void getUNDERSCORE() {} // ok
+    void getUNDERSCORE() {}
 
-    void getTEST_OBSERVATION() {} // ok
+    void getTEST_OBSERVATION() {}
 
-    void getTEST_UNDERSCORE() {} // ok
+    void getTEST_UNDERSCORE() {}
 
-    void getORDER() {} // ok
+    void getORDER() {}
 
-    void getOBSERVATION() {} // ok
+    void getOBSERVATION() {}
 
-    void getORDER_UNDERSCORE() {} // ok
+    void getORDER_UNDERSCORE() {}
 
-    int getCLRTest() { // ok
+    int getCLRTest() {
         int LINE_SEP = 1;
         return LINE_SEP;
     }
 
-    void getNON_ETest() {} // OK
+    void getNON_ETest() {}
 
     // violation below 'name 'getIsFIRST_Run' must contain no more than '4' .* cap.*.'
     private boolean getIsFIRST_Run() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassName.java
index 69de4d9e5b2..10fc3ad441e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassName.java
@@ -17,20 +17,20 @@ abstract public class InputAbstractClassName {
 abstract class NonAbstractClassName {
 }
 
-abstract class AbstractClassOther { // ok
+abstract class AbstractClassOther {
     // violation below 'Name 'NonAbstractInnerClass' must match pattern '\^Abstract\.\+\$'.'
     abstract class NonAbstractInnerClass {
     }
 }
 
-class NonAbstractClass { // ok
+class NonAbstractClass {
 }
 
 
-class AbstractClass { // ok
+class AbstractClass {
 }
 
-abstract class AbstractClassName2 { // ok
-    class AbstractInnerClass { // ok
+abstract class AbstractClassName2 {
+    class AbstractInnerClass {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameCustom.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameCustom.java
index 312a5e8db77..11a292606a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameCustom.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameCustom.java
@@ -13,16 +13,16 @@
 abstract public class InputAbstractClassNameCustom {
 }
 
-abstract class NonAbstractClassNameCustom { // ok
+abstract class NonAbstractClassNameCustom {
 }
 
 // violation below 'Name 'AbstractClassOtherCustom' must match pattern '\^NonAbstract\.\+\$'.'
 abstract class AbstractClassOtherCustom {
-    abstract class NonAbstractInnerClass { // ok
+    abstract class NonAbstractInnerClass {
     }
 }
 
-class NonAbstractClassCustom { // ok
+class NonAbstractClassCustom {
 }
 
 class AbstractClassCustom {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameFormerFalsePositive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameFormerFalsePositive.java
index fde9944f0aa..fa157ecb980 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameFormerFalsePositive.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameFormerFalsePositive.java
@@ -16,7 +16,7 @@ abstract public class InputAbstractClassNameFormerFalsePositive {
 abstract class AbstractClassFP {
 }
 
-abstract class AbstractClassOtherFP { // ok
+abstract class AbstractClassOtherFP {
     // violation below 'Name 'NonAbstractInnerClassFP' must match pattern '\^Abstract\.\+\$'.'
     abstract class NonAbstractInnerClassFP {
     }
@@ -29,7 +29,7 @@ class NonAbstractClassFP {
 class AbstractClassNameFP {
 }
 
-abstract class AbstractClassName2FP { // ok
+abstract class AbstractClassName2FP {
     // violation below 'Class 'AbstractInnerClassFP' must be declared as 'abstract'.'
     class AbstractInnerClassFP {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameType.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameType.java
index 9ebaf451ec2..b317067325c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameType.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameType.java
@@ -9,25 +9,25 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming.abstractclassname;
 
-abstract public class InputAbstractClassNameType { // ok
+abstract public class InputAbstractClassNameType {
 }
 
-abstract class NonAbstractClassNameType { // ok
+abstract class NonAbstractClassNameType {
 }
 
 class AbstractClassType { // violation 'Class 'AbstractClassType' must be declared as 'abstract'.'
-    abstract class NonAbstractInnerClass { // ok
+    abstract class NonAbstractInnerClass {
     }
 }
 
-abstract class NonAbstractClassType { // ok
+abstract class NonAbstractClassType {
 }
 
 
 class AbstractClassTypes { // violation 'Class 'AbstractClassTypes' must be declared as 'abstract'.'
 }
 
-abstract class AbstractClassName2Type { // ok
-    abstract class AbstractInnerClassType { // ok
+abstract class AbstractClassName2Type {
+    abstract class AbstractInnerClassType {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameVariants.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameVariants.java
index 8def09810bf..bd6870ca8c9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameVariants.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameVariants.java
@@ -17,7 +17,7 @@ abstract public class InputAbstractClassNameVariants {
 abstract class NonAbstractClassNameVa {
 }
 
-abstract class AbstractClassOtherVa { // ok
+abstract class AbstractClassOtherVa {
     // violation below 'Name 'NonAbstractInnerClassVa' must match pattern '\^Abstract\.\+\$'.'
     abstract class NonAbstractInnerClassVa {
     }
@@ -30,7 +30,7 @@ class NonAbstractClassVa {
 class AbstractClassVa { // violation 'Class 'AbstractClassVa' must be declared as 'abstract'.'
 }
 
-abstract class AbstractClassName2Va { // ok
+abstract class AbstractClassName2Va {
     // violation below 'Class 'AbstractInnerClassVa' must be declared as 'abstract'.'
     class AbstractInnerClassVa {
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName2.java
index 44a2d1f9dcc..2ffbdf941ec 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName2.java
@@ -32,10 +32,10 @@ public class InputCatchParameterName2 {
         }
         try {
             throw new InterruptedException("interruptedException");
-        } catch (InterruptedException ie) { // ok
+        } catch (InterruptedException ie) {
         }
         try {
-        } catch (Exception iException) { // ok
+        } catch (Exception iException) {
         }
         try {
         } catch (Exception ok) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName3.java
index 05564d697dc..b028453b226 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterName3.java
@@ -10,10 +10,10 @@
 public class InputCatchParameterName3 {
     {
         try {
-        } catch (Exception e) { // ok
+        } catch (Exception e) {
         }
         try {
-        } catch (Exception ex) { // ok
+        } catch (Exception ex) {
         }
         try {
         } catch (Error | Exception err) {
@@ -32,10 +32,10 @@ public class InputCatchParameterName3 {
         }
         try {
             throw new InterruptedException("interruptedException");
-        } catch (InterruptedException ie) { // ok
+        } catch (InterruptedException ie) {
         }
         try {
-        } catch (Exception iException) { // ok
+        } catch (Exception iException) {
         }
         try {
         } catch (Exception ok) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterNameSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterNameSimple.java
index 578356cfe58..e557621b4d3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterNameSimple.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/InputCatchParameterNameSimple.java
@@ -16,7 +16,7 @@
  * - Order of modifiers
  * @author Oliver Burn
  **/
-final class InputCatchParameterNameSimple // ok
+final class InputCatchParameterNameSimple
 {
     /** Invalid format **/
     public static final int badConstant = 2;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantName.java
index 4a94a0ed72b..cd117ae7fe9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantName.java
@@ -13,7 +13,7 @@
 
 import java.io.ObjectStreamField;
 
-public class InputConstantName // ok
+public class InputConstantName
 {
     private static final long serialVersionUID = 1L; //should be ignored
     private static final ObjectStreamField[] serialPersistentFields = {}; // should be ignored too
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameInterfaceIgnorePublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameInterfaceIgnorePublic.java
index c868d235eaf..24b35b2ea2e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameInterfaceIgnorePublic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameInterfaceIgnorePublic.java
@@ -12,11 +12,11 @@
 package com.puppycrawl.tools.checkstyle.checks.naming.constantname;
 
 public interface InputConstantNameInterfaceIgnorePublic {
-    int __MAX_SIZE = 1024; // ok
-    public int __MAX_SIZE2 = 1024; // ok
+    int __MAX_SIZE = 1024;
+    public int __MAX_SIZE2 = 1024;
 }
 
 @interface Anno {
-    int __MAX_SIZ1E = 1024; // ok
-    public int __MAX_SIZE2 = 1024; // ok
+    int __MAX_SIZ1E = 1024;
+    public int __MAX_SIZE2 = 1024;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameStaticModifierInInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameStaticModifierInInterface.java
index e4d4bf75350..31c93ff14c4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameStaticModifierInInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/constantname/InputConstantNameStaticModifierInInterface.java
@@ -12,7 +12,7 @@
 package com.puppycrawl.tools.checkstyle.checks.naming.constantname;
 
 
-public interface InputConstantNameStaticModifierInInterface // ok
+public interface InputConstantNameStaticModifierInInterface
 {
     static int f()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameInnerClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameInnerClass.java
index c33071b00c5..810ee95c9da 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameInnerClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameInnerClass.java
@@ -18,7 +18,7 @@ class InputLocalFinalVariableNameInnerClass
     class InnerInner2
     {
         // Ignore
-        public int fData; // ok
+        public int fData;
     }
 
     // Ignore - 2 vilations
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java
index 751a1326c4b..d6fa151c04a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java
@@ -13,7 +13,7 @@ public class InputLocalFinalVariableNameTryResourcesJava9 {
 
     public void foo() {
         LOCK.lock();
-        try (LOCK) { // ok
+        try (LOCK) {
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/InputLocalVariableNameInnerClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/InputLocalVariableNameInnerClass.java
index b3c2c75d17b..8a8cfb3a38f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/InputLocalVariableNameInnerClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/InputLocalVariableNameInnerClass.java
@@ -18,7 +18,7 @@ class InputLocalVariableNameInnerClass
     class InnerInner2
     {
         // Ignore
-        public int fData; // ok
+        public int fData;
     }
 
     // Ignore - 2 violations
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameExtra.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameExtra.java
index 63a9fe84cf9..88285596b23 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameExtra.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameExtra.java
@@ -12,7 +12,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming.methodname;
 
-public class InputMethodNameExtra // ok
+public class InputMethodNameExtra
 {
     public void doit()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java
index 9a717fcdf30..29546f74fee 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java
@@ -15,9 +15,9 @@
 
 public interface InputMethodNamePrivateMethodsInInterfaces {
 
-    private void PrivateMethod() {} // ok
+    private void PrivateMethod() {}
 
-    private static void PrivateMethod2() {} // ok
+    private static void PrivateMethod2() {}
 
     default void DefaultMethod() { // violation
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java
index 21795ba3429..e6b8c7f9304 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java
@@ -19,14 +19,14 @@ private void PrivateMethod() {} // violation
 
     private static void PrivateMethod2() {} // violation
 
-    default void DefaultMethod() { // ok
+    default void DefaultMethod() {
     }
 
-    public default void DefaultMethod2() { // ok
+    public default void DefaultMethod2() {
     }
 
-    void PublicMethod(); // ok
+    void PublicMethod();
 
-    public void PublicMethod2(); // ok
+    public void PublicMethod2();
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/packagename/InputPackageNameSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/packagename/InputPackageNameSimple.java
index 4d7be0dbb45..74defd6eec9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/packagename/InputPackageNameSimple.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/packagename/InputPackageNameSimple.java
@@ -5,7 +5,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.naming.packagename; // ok
+package com.puppycrawl.tools.checkstyle.checks.naming.packagename;
 import java.io.*;
 /**
  * Contains simple mistakes:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterName.java
index 9881192215b..d03f0395117 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterName.java
@@ -65,15 +65,15 @@ final class InputParameterName
      * @param badFormat3 bad format
      * @throws java.lang.Exception abc
      **/
-    int test1(int badFormat1,int badFormat2, // ok
-              final int badFormat3)          // ok
+    int test1(int badFormat1,int badFormat2,
+              final int badFormat3)
         throws java.lang.Exception
     {
         return 0;
     }
 
     /** method that is 20 lines long **/
-    private void longMethod() // ok
+    private void longMethod()
     {
         // a line
         // a line
@@ -96,7 +96,7 @@ private void longMethod() // ok
     }
 
     /** constructor that is 10 lines long **/
-    private InputParameterName()  // ok
+    private InputParameterName()
     {
         // a line
         // a line
@@ -109,7 +109,7 @@ private InputParameterName()  // ok
     }
 
     /** test local variables */
-    private void localVariables() // ok
+    private void localVariables()
     {
         // normal decl
         int abc = 0;
@@ -131,7 +131,7 @@ private void localVariables() // ok
     }
 
     /** test method pattern */
-    void ALL_UPPERCASE_METHOD()  // ok
+    void ALL_UPPERCASE_METHOD()
     {
     }
 
@@ -143,7 +143,7 @@ void ALL_UPPERCASE_METHOD()  // ok
     // tabs that count as one char because of their position ->        <-   ->        <-, OK
 
     /** some lines to test the violation column after tabs */
-    void errorColumnAfterTabs()  // ok
+    void errorColumnAfterTabs()
     {
         // with tab-width 8 all statements below start at the same column,
         // with different combinations of ' ' and '\t' before the statement
@@ -164,7 +164,7 @@ void errorColumnAfterTabs()  // ok
     /* YES */ /* MEMME: x */ /* YES!! */
 
     /** test long comments **/
-    void veryLong()  // ok
+    void veryLong()
     {
         /*
           blah blah blah blah
@@ -188,8 +188,8 @@ void veryLong()  // ok
     /**
      * @see to lazy to document all args. Testing excessive # args
      **/
-    void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,  // ok
-                    int aArg6, int aArg7, int aArg8, int aArg9)  // ok
+    void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,
+                    int aArg6, int aArg7, int aArg8, int aArg9)
     {
     }
 }
@@ -198,7 +198,7 @@ void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,  // ok
 class InputParameterName2
 {
     /** Some more Javadoc. */
-    public void doSomething()  // ok
+    public void doSomething()
     {
         //"O" should be named "o"
         for (Object O : new java.util.ArrayList())
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameAccessModifier.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameAccessModifier.java
index d40f7edcfd7..639dc66927c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameAccessModifier.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameAccessModifier.java
@@ -13,25 +13,25 @@ public class InputParameterNameAccessModifier {
 
     public InputParameterNameAccessModifier(int pubconstr) {} // violation
 
-    public void v1(int h) { // ok
+    public void v1(int h) {
         new Object () {
             public void i(int inner) {} // violation
         };
     }
 
-    protected void v4(int h) {} // ok
+    protected void v4(int h) {}
 
-    void v2(int h) {} // ok
+    void v2(int h) {}
 
-    private void v3(int h) {} // ok
+    private void v3(int h) {}
 
     public void i1(int pubpub) {} // violation
 
-    protected void i4(int pubprot) {} // ok
+    protected void i4(int pubprot) {}
 
-    void i2(int pubpack) {} // ok
+    void i2(int pubpack) {}
 
-    private void i3(int pubpriv) {} // ok
+    private void i3(int pubpriv) {}
 
     public interface InterfaceScope {
         void v1(int h);
@@ -42,21 +42,21 @@ public interface InterfaceScope {
 
 class PrivateScope {
 
-    public void v1(int h) {} // ok
+    public void v1(int h) {}
 
-    protected void v4(int h) {} // ok
+    protected void v4(int h) {}
 
-    void v2(int h) {} // ok
+    void v2(int h) {}
 
-    private void v3(int h) {} // ok
+    private void v3(int h) {}
 
     public void i1(int packpub) {} // violation
 
-    protected void i4(int packprot) {} // ok
+    protected void i4(int packprot) {}
 
-    void i2(int packpack) {} // ok
+    void i2(int packpack) {}
 
-    private void i3(int packpriv) { // ok
+    private void i3(int packpriv) {
         try {
             /* Make sure catch var is ignored */
         } catch (Exception exc) {
@@ -64,20 +64,18 @@ private void i3(int packpriv) { // ok
     }
 
     interface InterfaceScope {
-        void v1(int h); // ok
+        void v1(int h);
 
         void i1(int packifc); // violation
     }
 
     interface FuncIfc {
-        void a(int h); // ok
+        void a(int h);
     }
 
-    public void l() { // ok
+    public void l() {
         FuncIfc l1 = (int lexp)->{};
 
         FuncIfc l2 = (limp)->{};
     }
 }
-
-
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameCatchOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameCatchOnly.java
index 369553a3b87..4a28fd9f527 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameCatchOnly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameCatchOnly.java
@@ -26,14 +26,14 @@ int foo() {
         }
     }
 
-    public InputParameterNameCatchOnly() // ok
+    public InputParameterNameCatchOnly()
     {
         return;
     }
 
     class InnerFoo
     {
-        public void fooInnerMethod () // ok
+        public void fooInnerMethod ()
         {
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameLambda.java
index c48ed5ea41a..71f194773e1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameLambda.java
@@ -25,17 +25,17 @@ public class InputParameterNameLambda {
 
     Function<String, String> badNamedParameterWithParenthesis = (st) -> st.trim().toLowerCase();
 
-    BiFunction<String, String, String> twoBadNamedParameters = (s1, s2) -> s1 + s2; // ok
+    BiFunction<String, String, String> twoBadNamedParameters = (s1, s2) -> s1 + s2;
 
     BiFunction<String, String, String> badNamedParameterInBiFunction = (first, s) -> first + s;
 
-    Function<String, Integer> goodNamedParameterWithoutParenthesis = // ok
-            notTrimmedString -> notTrimmedString.trim().length(); // ok
+    Function<String, Integer> goodNamedParameterWithoutParenthesis =
+            notTrimmedString -> notTrimmedString.trim().length();
 
-    Function<String, Integer> goodNamedParameterWithParenthesis = // ok
-            (notTrimmedString) -> notTrimmedString.trim().length(); // ok
+    Function<String, Integer> goodNamedParameterWithParenthesis =
+            (notTrimmedString) -> notTrimmedString.trim().length();
 
-    BiFunction<String, String, Integer> goodNamedParameters = // ok
-            (first, second) -> (first + second).length(); // ok
+    BiFunction<String, String, Integer> goodNamedParameters =
+            (first, second) -> (first + second).length();
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOne.java
index 287c1857bb5..de50567fc3d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOne.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOne.java
@@ -73,7 +73,7 @@ int test1(int badFormat1,int badFormat2, // 2 violations
     }
 
     /** method that is 20 lines long **/
-    private void longMethod() // ok
+    private void longMethod()
     {
         // a line
         // a line
@@ -96,7 +96,7 @@ private void longMethod() // ok
     }
 
     /** constructor that is 10 lines long **/
-    private InputParameterNameOne() // ok
+    private InputParameterNameOne()
     {
         // a line
         // a line
@@ -109,7 +109,7 @@ private InputParameterNameOne() // ok
     }
 
     /** test local variables */
-    private void localVariables() // ok
+    private void localVariables()
     {
         // normal decl
         int abc = 0;
@@ -164,7 +164,7 @@ void errorColumnAfterTabs()
     /* YES */ /* MEMME: x */ /* YES!! */
 
     /** test long comments **/
-    void veryLong() // ok
+    void veryLong()
     {
         /*
           blah blah blah blah
@@ -188,8 +188,8 @@ void veryLong() // ok
     /**
      * @see to lazy to document all args. Testing excessive # args
      **/
-    void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,   // ok
-                    int aArg6, int aArg7, int aArg8, int aArg9)              // ok
+    void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,
+                    int aArg6, int aArg7, int aArg8, int aArg9)
     {
     }
 }
@@ -198,7 +198,7 @@ void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,   // ok
 class InputParameterNameOne2
 {
     /** Some more Javadoc. */
-    public void doSomething() // ok
+    public void doSomething()
     {
         //"O" should be named "o"
         for (Object O : new java.util.ArrayList())
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotation.java
index b3b9f3498b2..b5278d1e9b1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotation.java
@@ -23,7 +23,7 @@ public void foo(Object object) { // violation
 
     public void foo2(Integer aaaa) {} // violation
 
-    void foo3() {} // No NPE here! // ok
+    void foo3() {} // No NPE here!
 
     void foo4(int abc, int bd) {} // 2 violations
 
@@ -32,7 +32,7 @@ void foo4(int abc, int bd) {} // 2 violations
     private int field;
     private java.util.Set<String> packageNames;
 
-    InputParameterNameOverrideAnnotation() {} // No NPE here! // ok
+    InputParameterNameOverrideAnnotation() {} // No NPE here!
 
     InputParameterNameOverrideAnnotation(int fie, java.util.Set<String> pkgNames) {} // 2 violations
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationNoNPE.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationNoNPE.java
index 074ff876586..916d3bad938 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationNoNPE.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationNoNPE.java
@@ -12,12 +12,12 @@
 class InputParameterNameOverrideAnnotationNoNPE
 {
     /* method with many parameters*/
-    void InputParameterNameOverrideAnnotationNoNPEMethod(int a, int b) { // ok
+    void InputParameterNameOverrideAnnotationNoNPEMethod(int a, int b) {
 
     }
 
     /* method with many parameters */
-    void InputParameterNameOverrideAnnotationNoNPEMethod2(int a, int b) { // ok
+    void InputParameterNameOverrideAnnotationNoNPEMethod2(int a, int b) {
 
     }
 }
@@ -25,12 +25,12 @@ void InputParameterNameOverrideAnnotationNoNPEMethod2(int a, int b) { // ok
 class Test extends InputParameterNameOverrideAnnotationNoNPE
 {
     @Override
-    void InputParameterNameOverrideAnnotationNoNPEMethod(int a, int b) { // ok
+    void InputParameterNameOverrideAnnotationNoNPEMethod(int a, int b) {
 
     }
 
     @java.lang.Override
-    void InputParameterNameOverrideAnnotationNoNPEMethod2(int a, int b) { // ok
+    void InputParameterNameOverrideAnnotationNoNPEMethod2(int a, int b) {
 
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationOne.java
index 613c64656fe..7136563b8af 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationOne.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationOne.java
@@ -23,7 +23,7 @@ public void foo(Object object) { // violation
 
     public void foo2(Integer aaaa) {} // violation
 
-    void foo3() {} // No NPE here! // ok
+    void foo3() {} // No NPE here!
 
     void foo4(int abc, int bd) {} // 2 violations
 
@@ -32,7 +32,7 @@ void foo4(int abc, int bd) {} // 2 violations
     private int field;
     private java.util.Set<String> packageNames;
 
-    InputParameterNameOverrideAnnotationOne() {} // No NPE here! // ok
+    InputParameterNameOverrideAnnotationOne() {} // No NPE here!
     // 2 violations below
     InputParameterNameOverrideAnnotationOne(int fie, java.util.Set<String> pkgNames) {}
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameReceiver.java
index 814e68de9b6..a5ee1c372fe 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameReceiver.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameReceiver.java
@@ -13,6 +13,6 @@ public class InputParameterNameReceiver {
     public void foo4(InputParameterNameReceiver this) {}
 
     private class Inner {
-        public Inner(InputParameterNameReceiver InputParameterNameReceiver.this) {} // ok
+        public Inner(InputParameterNameReceiver InputParameterNameReceiver.this) {}
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInAccessModifierProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInAccessModifierProperty.java
index d9b0d29adb6..c0103b2e83a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInAccessModifierProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInAccessModifierProperty.java
@@ -13,7 +13,7 @@ public class InputParameterNameWhitespaceInAccessModifierProperty {
 
     public InputParameterNameWhitespaceInAccessModifierProperty(int parameter1) {} // violation
 
-    public void v1(int h) { // ok
+    public void v1(int h) {
         new Object () {
             public void i(int parameter2) {} // violation
         };
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInConfig.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInConfig.java
index b0397160fbd..e54591468fa 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInConfig.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameWhitespaceInConfig.java
@@ -10,5 +10,5 @@
 package com.puppycrawl.tools.checkstyle.checks.naming.parametername;
 
 public class InputParameterNameWhitespaceInConfig {
-    int method(){return 1;} // ok
+    int method(){return 1;}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java
index 1608c6f0607..503081be245 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java
@@ -11,7 +11,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming.staticvariablename;
 
-public class InputStaticVariableName { // ok
+public class InputStaticVariableName {
 
         /** Interface fields should be skipped */
         interface A {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName2.java
index beda72bc89b..173f98e69e5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName2.java
@@ -19,7 +19,7 @@
  * - Order of modifiers
  * @author Oliver Burn
  **/
-final class InputStaticVariableName2 // ok
+final class InputStaticVariableName2
 {
     // Long line ----------------------------------------------------------------
     // Contains a tab ->        <-
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr.java
index 17f68efd98f..d643f7f845b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr.java
@@ -1 +1 @@
-/*
NewlineAtEndOfFile
lineSeparator = CR
fileExtensions = (default)all files


*/

package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;

/**
 * Test case for detection of an existing CR newline at EOF, using the
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineAtEndOfFileCr // ok
{
/** Test with ending with CR newline
*/
}
\ No newline at end of file
+/*
NewlineAtEndOfFile
lineSeparator = CR
fileExtensions = (default)all files


*/

package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;

/**
 * Test case for detection of an existing CR newline at EOF, using the
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineAtEndOfFileCr
{
/** Test with ending with CR newline
*/
}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr2.java
index 3bc5f90ed43..5112535feab 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCr2.java
@@ -1 +1 @@
-/*
NewlineAtEndOfFile
lineSeparator = (default)LF_CR_CRLF
fileExtensions = (default)all files


*/

package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;

/**
 * Test case for detection of an existing CR newline at EOF, using the
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineAtEndOfFileCr2 // ok
{
/** Test with ending with CR newline
*/
}
\ No newline at end of file
+/*
NewlineAtEndOfFile
lineSeparator = (default)LF_CR_CRLF
fileExtensions = (default)all files


*/

package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;

/**
 * Test case for detection of an existing CR newline at EOF, using the
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineAtEndOfFileCr2
{
/** Test with ending with CR newline
*/
}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf2.java
index fbf46a2ecbe..b1139366eab 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf2.java
@@ -13,6 +13,6 @@
  * NewlineAtEndOfFileCheck.
  * @author Martin Steiger
  **/
-public interface InputNewlineAtEndOfFileCrlf2 // ok
+public interface InputNewlineAtEndOfFileCrlf2
 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf3.java
index 4a66bd22d73..5d910e2a170 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileCrlf3.java
@@ -13,6 +13,6 @@
  * NewlineAtEndOfFileCheck.
  * @author Martin Steiger
  **/
-public interface InputNewlineAtEndOfFileCrlf3 // ok
+public interface InputNewlineAtEndOfFileCrlf3
 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf.java
index 39b0decc4e9..3cca7112dfd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf.java
@@ -13,6 +13,6 @@
  * NewlineAtEndOfFileCheck.
  * @author Martin Steiger
  **/
-public interface InputNewlineAtEndOfFileLf // ok
+public interface InputNewlineAtEndOfFileLf
 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf2.java
index 8d7b77c1f2c..e0528879286 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileLf2.java
@@ -13,6 +13,6 @@
  * NewlineAtEndOfFileCheck.
  * @author Martin Steiger
  **/
-public interface InputNewlineAtEndOfFileLf2 // ok
+public interface InputNewlineAtEndOfFileLf2
 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileTestTrimProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileTestTrimProperty.java
index ecebfd084f3..61f20a98f20 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileTestTrimProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/InputNewlineAtEndOfFileTestTrimProperty.java
@@ -13,6 +13,6 @@
  * NewlineAtEndOfFileCheck.
  * @author Martin Steiger
  **/
-public interface InputNewlineAtEndOfFileTestTrimProperty // ok
+public interface InputNewlineAtEndOfFileTestTrimProperty
 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/InputNoCodeInFile4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/InputNoCodeInFile4.java
index ede1fed85de..98593af7374 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/InputNoCodeInFile4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/InputNoCodeInFile4.java
@@ -6,6 +6,6 @@
 
 package com.puppycrawl.tools.checkstyle.checks.nocodeinfile;
 
-public class InputNoCodeInFile4 { // ok
+public class InputNoCodeInFile4 {
     // some methods here
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java
index 091449c362b..0b4dc2888de 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java
@@ -7,7 +7,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-public class InputOuterTypeFilename1 { // ok
+public class InputOuterTypeFilename1 {
 
     public class UnicClassName {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java
index c5861669088..829ea6039b0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java
@@ -7,7 +7,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-@interface MyAnnotation1 { // ok
+@interface MyAnnotation1 {
     String name();
     int version();
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java
index 6e332089c40..d3b22a407d5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java
@@ -7,7 +7,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-public class InputOuterTypeFilename2 { // ok
+public class InputOuterTypeFilename2 {
 
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java
index f10a168aa96..cb446929428 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java
@@ -7,7 +7,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-class InputOuterTypeFilename3 { // ok
+class InputOuterTypeFilename3 {
 
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree1.java
index eb39610a730..c00d1ce7d37 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree1.java
@@ -11,7 +11,7 @@ public class InputOuterTypeFilenameBeginTree1
 
 }
 
-enum Enum2 //ok
+enum Enum2
 {
     A, B, C;
     Enum2() {}
@@ -19,7 +19,7 @@ public String toString() {
         return ""; //some custom implementation
     }
 }
-// ok
+
 interface TestRequireThisEnum2
 {
     enum DAY_OF_WEEK
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree2.java
index f1d8ffc37a1..4071de7d927 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameBeginTree2.java
@@ -4,5 +4,5 @@
  * Test for Begin Tree
  */
 public class InputOuterTypeFilenameBeginTree2 {
-// ok
+
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java
index a2c6f4f2960..11b78dc9810 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java
@@ -7,7 +7,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-class UnicClassName { // ok
+class UnicClassName {
 
 }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java
index 0db8314ca9f..e6dbb77c900 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-public class InputOuterTypeFilenameIllegalTokens // ok
+public class InputOuterTypeFilenameIllegalTokens
 {
     public void methodWithPreviouslyIllegalTokens()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpCheckDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpCheckDefault.java
new file mode 100644
index 00000000000..e27d74e943f
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpCheckDefault.java
@@ -0,0 +1,16 @@
+/*
+Regexp
+duplicateLimit = (default)0
+errorLimit = (default)100
+format = (default)^$
+ignoreComments = (default)false
+illegalPattern = (default)false
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.regexp.regexp;
+
+public class InputRegexpCheckDefault {
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic10.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic10.java
index cfbd145b233..11627cc4728 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic10.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic10.java
@@ -74,7 +74,8 @@ void exHandlerTest()
             // can never happen, empty compound statement is another workaround
         }
         catch (UnsupportedOperationException handledException) {
-            System.out.println(handledException.getMessage()); // violation
+            // violation below 'Line matches the illegal pattern'
+            System.out.println(handledException.getMessage());
         }
         catch (SecurityException ex) { /* hello */ }
         catch (StringIndexOutOfBoundsException ex) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic11.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic11.java
index 7a1d9a7550e..d4321722a93 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic11.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic11.java
@@ -74,7 +74,8 @@ void exHandlerTest()
             // can never happen, empty compound statement is another workaround
         }
         catch (UnsupportedOperationException handledException) {
-            System.out.println(handledException.getMessage()); // violation
+            // violation below 'Line matches the illegal pattern'
+            System.out.println(handledException.getMessage());
         }
         catch (SecurityException ex) { /* hello */ }
         catch (StringIndexOutOfBoundsException ex) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic12.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic12.java
index eff6c872fa4..5014619e661 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic12.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic12.java
@@ -74,7 +74,8 @@ void exHandlerTest()
             // can never happen, empty compound statement is another workaround
         }
         catch (UnsupportedOperationException handledException) {
-            System.out.println(handledException.getMessage()); // violation
+            // violation below 'Line matches the illegal pattern'
+            System.out.println(handledException.getMessage());
         }
         catch (SecurityException ex) { /* hello */ }
         catch (StringIndexOutOfBoundsException ex) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic13.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic13.java
index 8efccb83174..b5a5216a4f4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic13.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic13.java
@@ -74,7 +74,8 @@ void exHandlerTest()
             // can never happen, empty compound statement is another workaround
         }
         catch (UnsupportedOperationException handledException) {
-            System.out.println(handledException.getMessage()); // violation
+            // violation below 'Line matches the illegal pattern'
+            System.out.println(handledException.getMessage());
         }
         catch (SecurityException ex) { /* hello */ }
         catch (StringIndexOutOfBoundsException ex) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic2.java
index 518b45dae71..dd184280e01 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic2.java
@@ -9,7 +9,8 @@
 
 
 */
-
+// violation 11 lines above 'Required pattern .* missing in file.'
+// location of violation is first line of file
 package com.puppycrawl.tools.checkstyle.checks.regexp.regexp;
 
 import java.awt.*;
@@ -20,7 +21,7 @@
  * Test case for detecting simple semantic violations.
  * @author Lars Kühne
  **/
-class InputRegexpSemantic2 // violation
+class InputRegexpSemantic2
 {
     /* Boolean instantiation in a static initializer */
     static {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic5.java
index 9b19881cfdc..7122540980e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic5.java
@@ -23,13 +23,13 @@
 class InputRegexpSemantic5
 {
     /* Boolean instantiation in a static initializer */
-    static { // violation below
-        Boolean x = new Boolean(true);
+    static {
+        Boolean x = new Boolean(true); // violation 'Found duplicate pattern'
     }
 
     /* Boolean instantiation in a non-static initializer */
-    { // violation below
-        Boolean x = new Boolean(true);
+    {
+        Boolean x = new Boolean(true); // violation 'Found duplicate pattern'
         Boolean[] y = new Boolean[]{Boolean.TRUE, Boolean.FALSE};
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic7.java
index 35deae91f69..f268ced05b8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic7.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic7.java
@@ -12,9 +12,9 @@
 
 package com.puppycrawl.tools.checkstyle.checks.regexp.regexp;
 
-import java.awt.*; // violation
-import java.io.ByteArrayOutputStream; // violation
-import java.io.File; // violation
+import java.awt.*; // violation 'Line matches the illegal pattern'
+import java.io.ByteArrayOutputStream; // violation 'Line matches the illegal pattern'
+import java.io.File; // violation 'Line matches the illegal pattern'
 
 /**
  * Test case for detecting simple semantic violations.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic8.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic8.java
index cdb3a4ca214..12635bc9b00 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic8.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic8.java
@@ -12,8 +12,8 @@
 
 package com.puppycrawl.tools.checkstyle.checks.regexp.regexp;
 
-import java.awt.*; // violation
-import java.io.ByteArrayOutputStream; // violation
+import java.awt.*; // violation 'Line matches the illegal pattern'
+import java.io.ByteArrayOutputStream; // violation 'Line matches the illegal pattern'
 import java.io.File;
 
 /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic9.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic9.java
index 0e00c72ff05..32069eef650 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic9.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpSemantic9.java
@@ -74,7 +74,8 @@ void exHandlerTest()
             // can never happen, empty compound statement is another workaround
         }
         catch (UnsupportedOperationException handledException) {
-            System.out.println(handledException.getMessage()); // violation
+            // violation below 'Line matches the illegal pattern 'Bad line :('.'
+            System.out.println(handledException.getMessage());
         }
         catch (SecurityException ex) { /* hello */ }
         catch (StringIndexOutOfBoundsException ex) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpStartingWithEmptyLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpStartingWithEmptyLine.java
index d19372f5c91..d123914c303 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpStartingWithEmptyLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpStartingWithEmptyLine.java
@@ -1,2 +1,12 @@
+/*
+Regexp
+duplicateLimit = (default)0
+errorLimit = (default)100
+format = (default)^$
+ignoreComments = (default)false
+illegalPattern = (default)false
+
+
+*/
 
 package com.puppycrawl.tools.checkstyle.checks.regexp.regexp; // ok
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment11.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment11.java
index 0de87ae5120..5bff0fd7724 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment11.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment11.java
@@ -9,10 +9,11 @@
 
 
 */
-
+// violation 11 lines above 'Required pattern .* missing'
+// violation due to ignoreComments=true
 package com.puppycrawl.tools.checkstyle.checks.regexp.regexp;
 
-public class InputRegexpTrailingComment11 { // violation
+public class InputRegexpTrailingComment11 {
     int i; // don't use trailing comments :)
     // it fine to have comment w/o any statement
     /* good c-style comment. */
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment2.java
index 760ab4b91ec..792ea45e7ce 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment2.java
@@ -13,7 +13,7 @@
 package com.puppycrawl.tools.checkstyle.checks.regexp.regexp;
 
 public class InputRegexpTrailingComment2 {
-    int i; // don't use trailing comments :) // violation
+    int i; // don't use trailing comments :) // violation 'Line matches the illegal pattern'
     // it fine to have comment w/o any statement
     /* good c-style comment. */
     int j; /* bad c-style comment. */
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment4.java
index 64872ac1086..764ec7431bb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment4.java
@@ -28,7 +28,7 @@ public void run() {
       Let's check multi-line comments.
     */
     /* c-style */ // cpp-style
-    /* c-style 1 */ /*c-style 2 */ // violation
+    /* c-style 1 */ /*c-style 2 */ // violation 'Line matches the illegal pattern'
 
     void method2(long ms /* we should ignore this */) {
         /* comment before text */int z;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment8.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment8.java
index 5e5d837dccd..046dfd65da5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment8.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment8.java
@@ -31,7 +31,7 @@ public void run() {
     /* c-style 1 */ /*c-style 2 */
 
     void method2(long ms /* we should ignore this */) {
-        /* comment before text */int z; // violation
+        /* comment before text */int z; // violation 'Line matches the illegal pattern'
         /* int y */int y/**/;
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment9.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment9.java
index 1626f6aedf1..ea18031f746 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment9.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/regexp/regexp/InputRegexpTrailingComment9.java
@@ -32,7 +32,7 @@ public void run() {
 
     void method2(long ms /* we should ignore this */) {
         /* comment before text */int z;
-        /* int y */int y/**/; // violation
+        /* int y */int y/**/; // violation 'Line matches the illegal pattern'
     }
 
     /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength2.java
index 038da411bc0..b3b6408211d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength2.java
@@ -16,7 +16,7 @@
  * - Order of modifiers
  * @author Oliver Burn
  **/
-final class InputFileLength2 // ok
+final class InputFileLength2
 {
     // Long line ----------------------------------------------------------------
     // Contains a tab ->        <-
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength3.java
index c16afb12e66..918d4fe04cf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength3.java
@@ -16,7 +16,7 @@
  * - Order of modifiers
  * @author Oliver Burn
  **/
-final class InputFileLength3 // ok
+final class InputFileLength3
 {
     // Long line ----------------------------------------------------------------
     // Contains a tab ->        <-
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength4.java
index 59373fac26d..ef0d4791e58 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLength4.java
@@ -16,7 +16,7 @@
  * - Order of modifiers
  * @author Oliver Burn
  **/
-final class InputFileLength4 // ok
+final class InputFileLength4
 {
     // Long line ----------------------------------------------------------------
     // Contains a tab ->        <-
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLengthDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLengthDefault.java
index 6156a21f8b7..21ff3448993 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLengthDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/InputFileLengthDefault.java
@@ -1,7 +1,9 @@
-/* // ok
+/*
 FileLength
 
 
+
+
 */
 
 package com.puppycrawl.tools.checkstyle.checks.sizes.filelength;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthMax.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthMax.java
index 28957a651e5..7de3d417e24 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthMax.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/lambdabodylength/InputLambdaBodyLengthMax.java
@@ -39,7 +39,7 @@ public class InputLambdaBodyLengthMax {
                 + "3"
                 + "4"
             ;
-        Supplier<String> s2 = () -> // ok
+        Supplier<String> s2 = () ->
             "1"
                 + "2"
                 + "3"
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthLongImportStatements.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthLongImportStatements.java
index d366ad95ffd..dd8404d3258 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthLongImportStatements.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthLongImportStatements.java
@@ -9,8 +9,8 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes.linelength;
 
-import com.puppycrawl.tools.checkstyle.grammar.comments.InputFullOfSinglelineComments;
-import static com.puppycrawl.tools.checkstyle.grammar.comments.InputFullOfSinglelineComments.main;
+import java.util.                                                                 HashMap;
+import java.util.                                                                 HashSet;
 
 public class InputLineLengthLongImportStatements {
     @Override
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthUnmappableCharacters.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthUnmappableCharacters.java
new file mode 100644
index 00000000000..9468f6b5c1c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/linelength/InputLineLengthUnmappableCharacters.java
@@ -0,0 +1,5 @@
+package com.puppycrawl.tools.checkstyle.checks.sizes.linelength;
+
+public class InputLineLengthUnmappableCharacters {
+    String a = "ᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀᾀ"; // violation
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount.java
index 2a639dde7a4..db232cf56a7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount.java
@@ -12,7 +12,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodcount;
 
-public class InputMethodCount { // ok
+public class InputMethodCount {
 
   /**
    * Dummy inner class to check that the inner-classes methods are not counted
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1.java
deleted file mode 100644
index 658c6df9ed9..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-MethodCount
-maxTotal = 3
-maxPrivate = 3
-maxPackage = 3
-maxProtected = 3
-maxPublic = 3
-tokens = (default)CLASS_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, ANNOTATION_DEF, RECORD_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.sizes.methodcount;
-
-public class InputMethodCount1 { // 5 violations
-
-  /**
-   * Dummy inner class to check that the inner-classes methods are not counted
-   * for the outer class.
-   */
-  public class PublicMethodsInnerclassInnerclass { // 2 violations
-    /**
-     * Dummy method doing nothing
-     */
-    public void doNothing50() {
-    }
-
-    /**
-     * Dummy method doing nothing
-     */
-    public void doNothing51() {
-    }
-
-    /**
-     * Dummy method doing nothing
-     */
-    public void doNothing52() {
-    }
-
-    /**
-     * Dummy method doing nothing
-     */
-    public void doNothing53() {
-    }
-
-    /**
-     * Dummy method doing nothing
-     */
-    public void doNothing54() {
-    }
-  }
-
-  /**
-   * Dummy inner class to check that the inner-classes methods are not counted
-   * for the outer class.
-   */
-  public interface PublicMethodsInnerInterface { // 2 violations
-    /**
-     * Dummy method doing nothing
-     */
-    public void doNothing60();
-
-    /**
-     * Dummy method doing nothing
-     */
-    public void doNothing61();
-
-    /**
-     * Dummy method doing nothing
-     */
-    public abstract void doNothing62();
-
-    /**
-     * Dummy method doing nothing
-     */
-    abstract void doNothing63();
-
-    /**
-     * Dummy method doing nothing
-     */
-    void doNothing64();
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  public void doNothing00() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  public void doNothing01() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  public void doNothing02() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  public void doNothing03() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  public void doNothing04() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  protected void doNothing10() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  protected void doNothing11() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  protected void doNothing12() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  protected void doNothing13() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  protected void doNothing14() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  void doNothing20() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  void doNothing21() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  void doNothing22() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  void doNothing23() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  void doNothing24() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  private void doNothing30() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  private void doNothing31() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  private void doNothing32() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  private void doNothing33() {
-  }
-
-  /**
-   * Dummy method doing nothing
-   */
-  private void doNothing34() {
-  }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1One.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1One.java
new file mode 100644
index 00000000000..b469fd881bb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1One.java
@@ -0,0 +1,112 @@
+/*
+MethodCount
+maxTotal = 3
+maxPrivate = 3
+maxPackage = 3
+maxProtected = 3
+maxPublic = 3
+tokens = (default)CLASS_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, ANNOTATION_DEF, RECORD_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodcount;
+
+public class InputMethodCount1One { // 5 violations
+
+  /**
+   * Dummy method doing nothing
+   */
+  public void doNothing00() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  public void doNothing01() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  public void doNothing02() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  public void doNothing03() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  protected void doNothing10() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  protected void doNothing11() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  protected void doNothing12() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  protected void doNothing13() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing20() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing21() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing22() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing23() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing30() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing31() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing32() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing33() {
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1Two.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1Two.java
new file mode 100644
index 00000000000..7087744499e
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount1Two.java
@@ -0,0 +1,119 @@
+/*
+MethodCount
+maxTotal = 3
+maxPrivate = 3
+maxPackage = 3
+maxProtected = 3
+maxPublic = 3
+tokens = (default)CLASS_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, ANNOTATION_DEF, RECORD_DEF
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodcount;
+
+public class InputMethodCount1Two { // 3 violations
+
+  /**
+   * Dummy inner class to check that the inner-classes methods are not counted
+   * for the outer class.
+   */
+  protected class PublicMethodsInnerclassInnerclass { // 2 violations
+    /**
+     * Dummy method doing nothing
+     */
+    protected void doNothing50() {
+    }
+
+    /**
+     * Dummy method doing nothing
+     */
+    protected void doNothing51() {
+    }
+
+    /**
+     * Dummy method doing nothing
+     */
+    protected void doNothing52() {
+    }
+
+    /**
+     * Dummy method doing nothing
+     */
+    protected void doNothing53() {
+    }
+  }
+
+  /**
+   * Dummy inner class to check that the inner-classes methods are not counted
+   * for the outer class.
+   */
+  public interface PublicMethodsInnerInterface { // 2 violations
+
+    /**
+     * Dummy method doing nothing
+     */
+    public void doNothing61();
+
+    /**
+     * Dummy method doing nothing
+     */
+    public abstract void doNothing62();
+
+    /**
+     * Dummy method doing nothing
+     */
+    abstract void doNothing63();
+
+    /**
+     * Dummy method doing nothing
+     */
+    void doNothing64();
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing31() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing32() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing33() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  private void doNothing34() {
+  }
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing20() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing21() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing22() {
+  }
+
+  /**
+   * Dummy method doing nothing
+   */
+  void doNothing23() {
+  }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount4.java
index 61c875c6945..eb31d990c7d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount4.java
@@ -12,7 +12,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodcount;
 
-@interface InputMethodCount4 { // ok
+@interface InputMethodCount4 {
   Object object = new Object(){
     @Override
     public String toString() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount6.java
index b292bc17d52..51dbb9ffda2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount6.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodcount/InputMethodCount6.java
@@ -12,7 +12,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodcount;
 
-public class InputMethodCount6 { // ok
+public class InputMethodCount6 {
     void method1() {
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptyIsFalse.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptyIsFalse.java
index 7cb1b1bb145..508690cae09 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptyIsFalse.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptyIsFalse.java
@@ -10,7 +10,7 @@
 package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
 import java.io.*;
 
-final class InputMethodLengthCountEmptyIsFalse // ok
+final class InputMethodLengthCountEmptyIsFalse
 {
     // Long line ----------------------------------------------------------------
     // Contains a tab ->        <-
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptySmallSize.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptySmallSize.java
index 16ad5c8a7ba..faa063a5a08 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptySmallSize.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthCountEmptySmallSize.java
@@ -25,18 +25,18 @@ class AA {
         oneLine();
     }
 
-    void twoLines() { // ok
+    void twoLines() {
 
     }
 
-    void twoLines2() { // ok
+    void twoLines2() {
         oneLine();}
 
-    void twoLinesAndComment() { // ok
+    void twoLinesAndComment() {
         // some comment
     }
 
-    void oneLine() { oneLine();/* ok */ }
+    void oneLine() { oneLine();}
 
     void threeLines() { // violation 'Method threeLines length is 3 lines (max allowed is 2).'
         oneLine();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifier.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifier.java
deleted file mode 100644
index 4cdbf7e8acc..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifier.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-MethodLength
-max = (default)150
-countEmpty = (default)true
-tokens = (default)METHOD_DEF , CTOR_DEF , COMPACT_CTOR_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
-
-strictfp final class InputMethodLengthModifier // ok
-{
-
-    /** Illegal order of modifiers for variables */
-    static private boolean sModifierOrderVar = false;
-
-    /**
-     * Illegal order of modifiers for methods. Make sure that the
-     * first and last modifier from the JLS sequence is used.
-     */
-    strictfp private void doStuff()
-    {
-    }
-
-    /** Single annotation without other modifiers */
-    @MyAnnotation2 void someMethod()
-    {
-    }
-
-    /** Illegal order of annotation - must come first */
-    private @MyAnnotation2 void someMethod2()
-    {
-    }
-
-    /** Annotation in middle of other modifiers otherwise in correct order */
-    private @MyAnnotation2 strictfp void someMethod3()
-    {
-    }
-
-    /** Correct order */
-    @MyAnnotation2 private strictfp void someMethod4()
-    {
-    }
-
-    /** Annotation in middle of other modifiers otherwise in correct order */
-    @MyAnnotation2 private static @MyAnnotation4 strictfp void someMethod5()
-    {
-    }
-
-    /** holder for redundant 'public' modifier check. */
-    public static interface InputRedundantPublicModifier
-    {
-        /** redundant 'public' modifier */
-        public void a();
-
-        /** all OK */
-        void b();
-
-        /** redundant abstract modifier */
-        abstract void c();
-
-        /** redundant 'public' modifier */
-        public float PI_PUBLIC = (float) 3.14;
-
-        /** redundant 'abstract' modifier (field can not be abstract) */
-//        abstract float PI_ABSTRACT = (float) 3.14;
-
-        /** redundant 'final' modifier */
-        final float PI_FINAL = (float) 3.14;
-
-        /** all OK */
-        float PI_OK = (float) 3.14;
-    }
-
-    /** redundant 'final' modifier */
-    private final void method()
-    {
-    }
-}
-
-/** Holder for redundant 'final' check. */
-final class RedundantFinalClass
-{
-    /** redundant 'final' modifier */
-    public final void finalMethod()
-    {
-    }
-
-    /** OK */
-    public void method()
-    {
-    }
-}
-
-/** Holder for redundant modifiers of inner implementation */
-abstract interface InnerImplementation
-{
-    InnerImplementation inner =
-        new InnerImplementation()
-        {
-            /** compiler requires 'public' modifier */
-            public void method()
-            {
-            }
-        };
-
-    void method();
-}
-
-/** Holder for redundant modifiers of annotation fields/variables */
-@interface Annotation
-{
-    public String s1 = "";
-    final String s2 = "";
-    static String s3 = "";
-    String s4 = "";
-    public String blah();
-    abstract String blah2();
-}
-
-@interface MyAnnotation2 {
-}
-
-@interface MyAnnotation4 {
-}
-
-class SafeVarargsUsage {
-    @Deprecated
-    @SafeVarargs
-    private final void foo(int... k) {}
-
-    @Deprecated
-    @SafeVarargs
-    @SuppressWarnings("")
-    private final void foo1(Object... obj) {}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifierOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifierOne.java
new file mode 100644
index 00000000000..63f51f28217
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifierOne.java
@@ -0,0 +1,80 @@
+/*
+MethodLength
+max = (default)150
+countEmpty = (default)true
+tokens = (default)METHOD_DEF , CTOR_DEF , COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
+
+strictfp final class InputMethodLengthModifierOne
+{
+
+    /** Illegal order of modifiers for variables */
+    static private boolean sModifierOrderVar = false;
+
+    /**
+     * Illegal order of modifiers for methods. Make sure that the
+     * first and last modifier from the JLS sequence is used.
+     */
+    strictfp private void doStuff()
+    {
+    }
+
+    /** Single annotation without other modifiers */
+    @MyAnnotation2 void someMethod()
+    {
+    }
+
+    /** Illegal order of annotation - must come first */
+    private @MyAnnotation2 void someMethod2()
+    {
+    }
+
+    /** Annotation in middle of other modifiers otherwise in correct order */
+    private @MyAnnotation2 strictfp void someMethod3()
+    {
+    }
+
+    /** Correct order */
+    @MyAnnotation2 private strictfp void someMethod4()
+    {
+    }
+
+    /** Annotation in middle of other modifiers otherwise in correct order */
+    @MyAnnotation2 private static @MyAnnotation4 strictfp void someMethod5()
+    {
+    }
+
+    /** holder for redundant 'public' modifier check. */
+    public static interface InputRedundantPublicModifier
+    {
+        /** redundant 'public' modifier */
+        public void a();
+
+        /** all OK */
+        void b();
+
+        /** redundant abstract modifier */
+        abstract void c();
+
+        /** redundant 'public' modifier */
+        public float PI_PUBLIC = (float) 3.14;
+
+        /** redundant 'abstract' modifier (field can not be abstract) */
+//        abstract float PI_ABSTRACT = (float) 3.14;
+
+        /** redundant 'final' modifier */
+        final float PI_FINAL = (float) 3.14;
+
+        /** all OK */
+        float PI_OK = (float) 3.14;
+    }
+
+    /** redundant 'final' modifier */
+    private final void method()
+    {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifierTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifierTwo.java
new file mode 100644
index 00000000000..54fbb94d0ae
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthModifierTwo.java
@@ -0,0 +1,69 @@
+/*
+MethodLength
+max = (default)150
+countEmpty = (default)true
+tokens = (default)METHOD_DEF , CTOR_DEF , COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
+
+strictfp final class InputMethodLengthModifierTwo {}
+
+/** Holder for redundant 'final' check. */
+final class RedundantFinalClass
+{
+    /** redundant 'final' modifier */
+    public final void finalMethod()
+    {
+    }
+
+    /** OK */
+    public void method()
+    {
+    }
+}
+
+/** Holder for redundant modifiers of inner implementation */
+abstract interface InnerImplementation
+{
+    InnerImplementation inner =
+        new InnerImplementation()
+        {
+            /** compiler requires 'public' modifier */
+            public void method()
+            {
+            }
+        };
+
+    void method();
+}
+
+/** Holder for redundant modifiers of annotation fields/variables */
+@interface Annotation
+{
+    public String s1 = "";
+    final String s2 = "";
+    static String s3 = "";
+    String s4 = "";
+    public String blah();
+    abstract String blah2();
+}
+
+@interface MyAnnotation2 {
+}
+
+@interface MyAnnotation4 {
+}
+
+class SafeVarargsUsage {
+    @Deprecated
+    @SafeVarargs
+    private final void foo(int... k) {}
+
+    @Deprecated
+    @SafeVarargs
+    @SuppressWarnings("")
+    private final void foo1(Object... obj) {}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimple.java
deleted file mode 100644
index 604cdf71715..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimple.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-MethodLength
-max = 19
-countEmpty = (default)true
-tokens = (default)METHOD_DEF , CTOR_DEF , COMPACT_CTOR_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
-import java.io.*;
-
-final class InputMethodLengthSimple
-{
-    // Long line ----------------------------------------------------------------
-    // Contains a tab ->        <-
-    // Contains trailing whitespace ->
-
-    // Name format tests
-    //
-    /** Invalid format **/
-    public static final int badConstant = 2;
-    /** Valid format **/
-    public static final int MAX_ROWS = 2;
-
-    /** Invalid format **/
-    private static int badStatic = 2;
-    /** Valid format **/
-    private static int sNumCreated = 0;
-
-    /** Invalid format **/
-    private int badMember = 2;
-    /** Valid format **/
-    private int mNumCreated1 = 0;
-    /** Valid format **/
-    protected int mNumCreated2 = 0;
-
-    /** commas are wrong **/
-    private int[] mInts = new int[] {1,2, 3,
-                                     4};
-
-    //
-    // Accessor tests
-    //
-    /** should be private **/
-    public static int sTest1;
-    /** should be private **/
-    protected static int sTest3;
-    /** should be private **/
-    static int sTest2;
-
-    /** should be private **/
-    int mTest1;
-    /** should be private **/
-    public int mTest2;
-
-    //
-    // Parameter name format tests
-    //
-
-    /**
-     * @return hack
-     * @param badFormat1 bad format
-     * @param badFormat2 bad format
-     * @param badFormat3 bad format
-     * @throws java.lang.Exception abc
-     **/
-    int test1(int badFormat1,int badFormat2,
-              final int badFormat3)
-        throws java.lang.Exception
-    {
-        return 0;
-    }
-
-    /** method that is 20 lines long **/
-    private void longMethod() // violation
-    {
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-    }
-
-    /** constructor that is 10 lines long **/
-    private InputMethodLengthSimple()
-    {
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-        // a line
-    }
-
-    /** test local variables */
-    private void localVariables()
-    {
-        // normal decl
-        int abc = 0;
-        int ABC = 0;
-
-        // final decls
-        final int cde = 0;
-        final int CDE = 0;
-
-        // decl in for loop init statement
-        for (int k = 0; k < 1; k++)
-        {
-            String innerBlockVariable = "";
-        }
-        for (int I = 0; I < 1; I++)
-        {
-            String InnerBlockVariable = "";
-        }
-    }
-
-    /** test method pattern */
-    void ALL_UPPERCASE_METHOD()
-    {
-    }
-
-    /** test illegal constant **/
-    private static final int BAD__NAME = 3;
-
-    // A very, very long line that is OK because it matches the regexp "^.*is OK.*regexp.*$"
-    // long line that has a tab ->        <- and would be OK if tab counted as 1 char
-    // tabs that count as one char because of their position ->        <-   ->        <-, OK
-
-    /** some lines to test the violation column after tabs */
-    void errorColumnAfterTabs()
-    {
-        // with tab-width 8 all statements below start at the same column,
-        // with different combinations of ' ' and '\t' before the statement
-                int tab0 =1;
-                int tab1 =1;
-                 int tab2 =1;
-                int tab3 =1;
-                    int tab4 =1;
-                  int tab5 =1;
-    }
-
-    // MEMME:
-    /* MEMME: a
-     * MEMME:
-     * OOOO
-     */
-    /* NOTHING */
-    /* YES */ /* MEMME: x */ /* YES!! */
-
-    /** test long comments **/
-    void veryLong()
-    {
-        /*
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          blah blah blah blah
-          enough talk */
-    }
-
-    /**
-     * @see to lazy to document all args. Testing excessive # args
-     **/
-    void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,
-                    int aArg6, int aArg7, int aArg8, int aArg9)
-    {
-    }
-}
-
-/** Test class for variable naming in for each clause. */
-class InputSimple2
-{
-    /** Some more Javadoc. */
-    public void doSomething()
-    {
-        //"O" should be named "o"
-        for (Object O : new java.util.ArrayList())
-        {
-
-        }
-    }
-}
-
-/** Test enum for member naming check */
-enum MyEnum1
-{
-    /** ABC constant */
-    ABC,
-
-    /** XYZ constant */
-    XYZ;
-
-    /** Should be mSomeMember */
-    private int someMember;
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimpleOne.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimpleOne.java
new file mode 100644
index 00000000000..a05fa53e9dd
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimpleOne.java
@@ -0,0 +1,119 @@
+/*
+MethodLength
+max = 19
+countEmpty = (default)true
+tokens = (default)METHOD_DEF , CTOR_DEF , COMPACT_CTOR_DEF
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
+import java.io.*;
+
+final class InputMethodLengthSimpleOne
+{
+    // Long line ----------------------------------------------------------------
+    // Contains a tab ->        <-
+    // Contains trailing whitespace ->
+
+    // Name format tests
+    //
+    /** Invalid format **/
+    public static final int badConstant = 2;
+    /** Valid format **/
+    public static final int MAX_ROWS = 2;
+
+    /** Invalid format **/
+    private static int badStatic = 2;
+    /** Valid format **/
+    private static int sNumCreated = 0;
+
+    /** Invalid format **/
+    private int badMember = 2;
+    /** Valid format **/
+    private int mNumCreated1 = 0;
+    /** Valid format **/
+    protected int mNumCreated2 = 0;
+
+    /** commas are wrong **/
+    private int[] mInts = new int[] {1,2, 3,
+                                     4};
+
+    //
+    // Accessor tests
+    //
+    /** should be private **/
+    public static int sTest1;
+    /** should be private **/
+    protected static int sTest3;
+    /** should be private **/
+    static int sTest2;
+
+    /** should be private **/
+    int mTest1;
+    /** should be private **/
+    public int mTest2;
+
+    // Parameter name format tests
+
+    /**
+     * @return hack
+     * @param badFormat1 bad format
+     * @param badFormat2 bad format
+     * @param badFormat3 bad format
+     * @throws java.lang.Exception abc
+     **/
+    int test1(int badFormat1,int badFormat2,
+              final int badFormat3)
+        throws java.lang.Exception
+    {
+        return 0;
+    }
+
+/** constructor that is 10 lines long **/
+    private InputMethodLengthSimpleOne()
+    {
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+    }
+
+    /** test local variables */
+    private void localVariables()
+    {
+        // normal decl
+        int abc = 0;
+        int ABC = 0;
+
+        // final decls
+        final int cde = 0;
+        final int CDE = 0;
+
+        // decl in for loop init statement
+        for (int k = 0; k < 1; k++)
+        {
+            String innerBlockVariable = "";
+        }
+        for (int I = 0; I < 1; I++)
+        {
+            String InnerBlockVariable = "";
+        }
+    }
+}
+
+/** Test class for variable naming in for each clause. */
+class InputSimple2
+{
+    /** Some more Javadoc. */
+    public void doSomething()
+    {
+        //"O" should be named "o"
+        for (Object O : new java.util.ArrayList())
+        {
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimpleTwo.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimpleTwo.java
new file mode 100644
index 00000000000..e9beabc8c85
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/InputMethodLengthSimpleTwo.java
@@ -0,0 +1,113 @@
+/*
+MethodLength
+max = 19
+countEmpty = (default)true
+tokens = (default)METHOD_DEF , CTOR_DEF , COMPACT_CTOR_DEF
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
+import java.io.*;
+
+final class InputMethodLengthSimpleTwo
+{
+    /** method that is 20 lines long **/
+    private void longMethod() // violation
+    {
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+    }
+
+    /** test method pattern */
+    void ALL_UPPERCASE_METHOD()
+    {
+    }
+
+    /** test illegal constant **/
+    private static final int BAD__NAME = 3;
+
+    // A very, very long line that is OK because it matches the regexp "^.*is OK.*regexp.*$"
+    // long line that has a tab ->        <- and would be OK if tab counted as 1 char
+    // tabs that count as one char because of their position ->        <-   ->        <-, OK
+
+    /** some lines to test the violation column after tabs */
+    void errorColumnAfterTabs()
+    {
+        // with tab-width 8 all statements below start at the same column,
+        // with different combinations of ' ' and '\t' before the statement
+                int tab0 =1;
+                int tab1 =1;
+                 int tab2 =1;
+                int tab3 =1;
+                    int tab4 =1;
+                  int tab5 =1;
+    }
+
+    // MEMME:
+    /* MEMME: a
+     * MEMME:
+     * OOOO
+     */
+    /* NOTHING */
+    /* YES */ /* MEMME: x */ /* YES!! */
+
+    /** test long comments **/
+    void veryLong()
+    {
+        /*
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          enough talk */
+    }
+
+    /**
+     * @see to lazy to document all args. Testing excessive # args
+     **/
+    void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,
+                    int aArg6, int aArg7, int aArg8, int aArg9)
+    {
+    }
+}
+
+/** Test enum for member naming check */
+enum MyEnum1
+{
+    /** ABC constant */
+    ABC,
+
+    /** XYZ constant */
+    XYZ;
+
+    /** Should be mSomeMember */
+    private int someMember;
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedBy.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedBy.java
new file mode 100644
index 00000000000..ceabfd2a60c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedBy.java
@@ -0,0 +1,115 @@
+/*
+ParameterNumber
+max = 2
+ignoreAnnotatedBy = MyAnno, Session
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber;
+
+public class InputParameterNumberIgnoreAnnotatedBy {
+    @MyAnno
+    InputParameterNumberIgnoreAnnotatedBy(int a, int b, int c) {}
+
+    void method1(int a, int b) {}
+
+    @MyAnno
+    void method2(int a, int b, int c) {}
+
+    @Session(uid = "Y2K")
+    void method3(int a, int b, int c, int d) {}
+
+    @Wawa
+    void method5(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).'
+    }
+
+    @Wawa
+    void method6(int a, int b) {}
+
+
+    void method7(int a, int b, int c, int d) { // violation, 'More than 2 parameters (found 4).'
+    }
+
+    class InnerClass extends InputParameterNumberIgnoreAnnotatedBy {
+        @Override
+        void method2(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).'
+            int d = a + c;
+        }
+
+        InnerClass(int a, int b) {
+            super(1, 2, 3);
+        }
+
+        InnerClass(int a, int b, int c, int d) { // violation, 'More than 2 parameters (found 4).'
+            super(1, 2, 3);
+        }
+    }
+
+    static class Very {
+        static class Deep {
+            static class Rabbit {
+                enum Colors {
+                    GOLDEN(1, 2, 3) {
+                        void jump(int a, int b) {}
+                        @MyAnno
+                        void roll(int a, int b, int c) {}
+
+                        // violation below, 'More than 2 parameters (found 3).'
+                        void loaf(int a, int b, int c) {}
+                    };
+
+                    @Wawa
+                    private Colors(@MyAnno int a, int b, int c) {}
+                    // violation above, 'More than 2 parameters (found 3).'
+
+                    @Session(uid = ":D")
+                    private Colors(@Wawa int a, @Wawa int b, @Wawa int c, @Wawa int d) {}
+
+                    private Colors(int a) {}
+                }
+                static class Hole {
+                    static {
+                        new Object() {
+                            @MyAnno @Session(uid = "G0F")
+                            void method1(int a, int b, int c) {}
+
+                            // violation below, 'More than 2 parameters (found 4).'
+                            void method3(@MyAnno int a, @MyAnno int b, @MyAnno int c, int d) {}
+                        };
+                    }
+                }
+            }
+        }
+    }
+
+    @Wawa
+    @MyAnno
+    void method8(int a, int b, int c) {
+    }
+
+    @Session(uid = "H1") @Bit
+    @Wawa
+    void method9(int a, int b, int c) {
+    }
+
+    @Bit
+    @Wawa
+    void method10(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).'
+    }
+
+    interface Reader {
+        void method1 (int a, int b);
+
+        @MyAnno
+        void method2 (int a, int b, int c);
+
+        void method3 (int a, int b, int c); // violation, 'More than 2 parameters (found 3).'
+    }
+
+    @interface Wawa {}
+    @interface Bit {}
+    @interface MyAnno {}
+    @interface Session {
+        String uid();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java
new file mode 100644
index 00000000000..9a678fb3624
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.java
@@ -0,0 +1,62 @@
+/*
+ParameterNumber
+max = 2
+ignoreAnnotatedBy = java.lang.Deprecated, InnerClass.InnerAnno, Session
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber;
+
+public class InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName {
+    @java.lang.Deprecated
+    void method3(int a, int b, int c) {}
+
+    @Deprecated
+    void method4(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).'
+
+    void method5(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).'
+
+    @Session
+    void method6(int a, int b, int c) {}
+
+    @InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.Session
+    void method7(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).'
+
+    @com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber
+            .InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.Session
+    void method8(int a, int b, int c) {} // violation, 'More than 2 parameters (found 3).'
+
+    @com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber
+            .InputParameterNumberIgnoreAnnotatedByFullyQualifiedClassName.Session
+    void method8(int a, int b) {}
+
+    private static class InnerClass {
+        private @interface InnerAnno {}
+
+        @InnerClass.InnerAnno
+        void method1(int a, int b, int c) {
+        }
+
+        @InnerAnno
+        void method2(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).'
+        }
+
+        @Bit
+        void method3(int a, int b, int c) { // violation, 'More than 2 parameters (found 3).'
+        }
+
+        @InnerAnno
+        void method2(int a, int b) {
+        }
+
+        @Bit
+        void method3(int a, int b) {
+        }
+
+        void method4(int a, int b) {
+        }
+    }
+
+    @interface Session {}
+    @interface Bit{}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain2.java
index eb38ef42d72..1d8527f419d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain2.java
@@ -13,7 +13,7 @@ public class InputUncommentedMain2
     private class PC {
 
         // uncommented main with depth 2
-        public void main(String[] args) // ok
+        public void main(String[] args)
         {
             System.identityHashCode("InputUncommentedMain.main()");
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain3.java
index f0222a6ae7d..2555f2cacd8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain3.java
@@ -9,7 +9,7 @@
 
 class InputUncommentedMain3 {
 
-    public static void anyWrongMethodName(String[] args) // ok
+    public static void anyWrongMethodName(String[] args)
     {
         System.identityHashCode("InputUncommentedMain.main()");
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain4.java
index b078fbf05f6..5ef2f257250 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMain4.java
@@ -10,7 +10,7 @@
 class InputUncommentedMain4
 {
     // one more uncommented main
-    public static void main(int[] args) // ok
+    public static void main(int[] args)
     {
         System.identityHashCode("test1.main()");
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTreePackage1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTreePackage1.java
index b1129daa079..a80cb9369f8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTreePackage1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/uncommentedmain/InputUncommentedMainBeginTreePackage1.java
@@ -1,5 +1,5 @@
 package com.puppycrawl.tools.checkstyle.checks.uncommentedmain;
 
-// ok
+
 public class InputUncommentedMainBeginTreePackage1 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/upperell/InputUpperEllSemantic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/upperell/InputUpperEllSemantic.java
index a9d0cc76323..37d7b571a40 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/upperell/InputUpperEllSemantic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/upperell/InputUpperEllSemantic.java
@@ -206,7 +206,7 @@ private class InputModifier {
 
     synchronized void foo() {
         synchronized (this) {} // not OK
-        synchronized (Class.class) { // OK
+        synchronized (Class.class) {
             synchronized (new Object()) {
                 // not OK if checking statements
             }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPad2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPad2.java
index b81a7ec19e9..b457f526c85 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPad2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforinitializerpad/InputEmptyForInitializerPad2.java
@@ -7,5 +7,5 @@
 
 package com.puppycrawl.tools.checkstyle.checks.whitespace.emptyforinitializerpad;
 
-class InputEmptyForInitializerPad2 // violation
+class InputEmptyForInitializerPad2
 { }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java
index 190e70d185b..8391313df04 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java
@@ -20,7 +20,7 @@
 import java.util.Collections;
 /* no violation: block comment after token*/
 
-import com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator.InputEmptyLineSeparator;
+import java.io.PrintWriter;
 //no violation: single-line comment after token
 
 import javax.swing.AbstractAction; /* no violation: no trailing comment
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator2.java
index 57c1ec708c6..1d7f4e2611c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator2.java
@@ -20,7 +20,7 @@
 import java.util.Collections;
 /* no violation: block comment after token*/
 
-import com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator.InputEmptyLineSeparator;
+import java.io.PrintWriter;
 //no violation: single-line comment after token
 
 import javax.swing.AbstractAction; /* no violation: no trailing comment
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceAfterNew.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceAfterNew.java
new file mode 100644
index 00000000000..8b5ed42a6a0
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceAfterNew.java
@@ -0,0 +1,65 @@
+/*
+GenericWhitespace
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
+
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE_USE;
+
+public class InputGenericWhitespaceAfterNew {
+    public class Inner<T> { }
+
+    Object obj1 = new <String>Object();
+    Object obj2 = new <String> Object(); // violation, ''>' is followed by whitespace.'
+
+    void method() {
+        new <@A Inner>Inner();
+        new< @A Inner > Inner ();
+        // 4 violations above:
+        //                    ''<' is followed by whitespace.'
+        //                    ''<' is not preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+        //                    ''>' is preceded with whitespace.'
+
+        new <@A Inner> @A Inner<@A Inner>(); // violation, ''>' is followed by whitespace.'
+    }
+
+    void popCan() {
+        Can.Pop cannot = new <String>Can.Pop();
+        Can.Pop burstCan = new< String > Can.Pop();
+        // 4 violations above:
+        //                    ''<' is followed by whitespace.'
+        //                    ''<' is not preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+        //                    ''>' is preceded with whitespace.'
+
+        //                 +       +                   +    + + ++                  +      +
+        Can.must("idk", new<Can<Can< @A Inner<Can<Can<?> [] >>> >> Can.Pop.But.Wont <String> ());
+        // 9 violations above:
+        //                    ''<' is not preceded with whitespace.'
+        //                    ''<' is followed by whitespace.'
+        //                    ''>' is followed by whitespace.'
+        //                    ''>' is preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+        //                    ''>' is preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+        //                    ''<' is preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+    }
+
+    @Target({TYPE_USE}) @interface A {}
+}
+
+class Can<T> {
+    static <T> void must(String why, T whatever) {}
+    static class Pop {
+        static class But {
+            static class Wont<T> {
+            }
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeCtorInvocation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeCtorInvocation.java
new file mode 100644
index 00000000000..f0bdf6aea14
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceBeforeCtorInvocation.java
@@ -0,0 +1,73 @@
+/*
+GenericWhitespace
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
+
+import java.lang.annotation.Target;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.lang.annotation.ElementType.TYPE_USE;
+
+public class InputGenericWhitespaceBeforeCtorInvocation {
+    List<String> music = new ArrayList<>();
+    List todo = new ArrayList<> (); // violation, ''>' is followed by whitespace.'
+
+    Gen<String, Integer> eel = new Gen<String, Integer > ();
+    // 2 violations above:
+    //                    ''>' is followed by whitespace.'
+    //                    ''>' is preceded with whitespace.'
+
+    Pipe pipe = new Pipe< String>() { // violation, ''<' is followed by whitespace.'
+    };
+
+    Class<?>[] classy = new Class<?> []{}; // violation, ''>' is followed by whitespace.'
+
+    void method() {
+        new Very.Deep<Integer>();
+        new Very.Deep.Rabbit.Hole <  Integer  > ();
+        // 4 violations above:
+        //                    ''<' is followed by whitespace.'
+        //                    ''<' is preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+        //                    ''>' is preceded with whitespace.'
+
+        new @A Gen<@A Gen, @A Gen> (); // violation, ''>' is followed by whitespace.'
+        new java.util.HashMap<Integer, Integer> (); // violation, ''>' is followed by whitespace.'
+        new ArrayList<Very <Gen<String,String>>> ();
+        // 2 violations above:
+        //                    ''<' is preceded with whitespace.'
+        //                    ''>' is followed by whitespace.'
+    }
+
+    static final Very<Gen<String, String>> veryGen =
+            new Very<Gen<String, String>> () {}; // violation, ''>' is followed by whitespace.'
+
+    <T> void mustPatTheCroc(boolean mustPat, T[] crocs) {
+        Very.swampPuppy(new Gen<String, String> ()); // violation, ''>' is followed by whitespace.'
+        if (!mustPat) {
+            mustPatTheCroc(true, new Very<?> []{}); // violation, ''>' is followed by whitespace.'
+        }
+    }
+
+    class Gen<T, U> {}
+
+    static class Very<Q> {
+        static void swampPuppy(Gen<String, String> croc) {}
+        static class Deep<D> {
+            static class Rabbit<R> {
+                static class Hole<H> {
+
+                }
+            }
+        }
+    }
+
+    interface Pipe<T> {
+    }
+
+    @Target({TYPE_USE}) @interface A {}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java
index 73237ce41f5..b1655c3a973 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceDefault.java
@@ -19,8 +19,8 @@ void meth()
     {
         List<Integer> x = new ArrayList<Integer>();
         List<List<Integer>> y = new ArrayList<List<Integer>>();
-        List < Integer > a = new ArrayList < Integer > (); // 6 violations
-        List < List < Integer > > b = new ArrayList < List < Integer > > (); // 14 violations
+        List < Integer > a = new ArrayList < Integer > (); // 7 violations
+        List < List < Integer > > b = new ArrayList < List < Integer > > (); // 15 violations
     }
     //always 0
     public int compareTo(Object aObject)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceEndsTheLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceEndsTheLine.java
index a0787cd4fc6..7077644989d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceEndsTheLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceEndsTheLine.java
@@ -6,7 +6,7 @@
 
 package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
 
-public class InputGenericWhitespaceEndsTheLine { // ok
+public class InputGenericWhitespaceEndsTheLine {
     public boolean returnsGenericObjectAtEndOfLine(Object otherObject) {
         return otherObject instanceof Enum<?>;
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceInnerClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceInnerClass.java
index 79e501fb164..edb2c5566f3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceInnerClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceInnerClass.java
@@ -4,7 +4,7 @@
 
 */
 
-package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace; // ok
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
 
 import java.util.List;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceList.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceList.java
index b1c0af92527..0e40ecf450c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceList.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceList.java
@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-public class InputGenericWhitespaceList // ok
+public class InputGenericWhitespaceList
 {
     public List<List<String>[]> listOfListOFArrays;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceMethodRef1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceMethodRef1.java
index d4b88100cdf..5deeb60de3c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceMethodRef1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceMethodRef1.java
@@ -8,7 +8,7 @@
 import java.util.function.Supplier;
 public class InputGenericWhitespaceMethodRef1
 {
-  public static class SomeClass { // ok
+  public static class SomeClass {
     public static class Nested<V> {
       private Nested() {
       }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceWithEmoji.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceWithEmoji.java
index b51622c8bcd..e8a941f3207 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceWithEmoji.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceWithEmoji.java
@@ -12,7 +12,7 @@
 
 public class InputGenericWhitespaceWithEmoji {
 
-    /* 👇🏻dsad */public static class SomeClass { /* 😂 */ // ok
+    /* 👇🏻dsad */public static class SomeClass { /* 😂 */
 
         public static class Nested<V> {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPad4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPad4.java
index d08eeaca5e0..dcc8096295f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPad4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPad4.java
@@ -11,7 +11,7 @@
 package com.puppycrawl.tools.checkstyle.checks.whitespace.methodparampad;
 import java.util.Vector;
 /** Test input for MethodDefPadCheck */
-public class InputMethodParamPad4 // ok
+public class InputMethodParamPad4
 {
     public InputMethodParamPad4()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadSetOptionTrim.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadSetOptionTrim.java
index 77f04273c02..8b44a726b3c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadSetOptionTrim.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadSetOptionTrim.java
@@ -19,7 +19,7 @@ public void method1() { // violation ''(' is not preceded with whitespace'
         }
     }
 
-    public int method2 () { // ok
+    public int method2 () {
         return 1;
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadWhitespaceAround.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadWhitespaceAround.java
index 524a7ac5515..837e592b5f7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadWhitespaceAround.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadWhitespaceAround.java
@@ -11,11 +11,11 @@
 package com.puppycrawl.tools.checkstyle.checks.whitespace.methodparampad;
 
 @SuppressWarnings({"this", "that"})
-public class InputMethodParamPadWhitespaceAround // ok
+public class InputMethodParamPadWhitespaceAround
 {
     protected InputMethodParamPadWhitespaceAround ( int i )
     {
-        this (); //whitespace
+        this (); // ok, whitespace between 'this' and ()
         toString ();
     }
     protected InputMethodParamPadWhitespaceAround ()
@@ -23,6 +23,12 @@ protected InputMethodParamPadWhitespaceAround ()
         super ();
     }
 
+    protected InputMethodParamPadWhitespaceAround ( String s)
+    {
+        // ok, until https://github.com/checkstyle/checkstyle/issues/13675
+        this();
+    }
+
     public void enhancedFor ()
     {
         int[] i = new int[2];
@@ -33,9 +39,11 @@ public void enhancedFor ()
 }
 
 @interface CronExpression {
+    // annotation type elements are not checked
     Class<?>[] groups() default {};
 }
 
 @interface CronExpression1 {
-    Class<?>[] groups() default { }; // extra space
+    // annotation type elements are not checked
+    Class<?>[] groups() default { };
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapGood.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapGood.java
index 6d78a998cba..c945eaf7a89 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapGood.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nolinewrap/InputNoLineWrapGood.java
@@ -14,9 +14,9 @@
 
 import static java.math.BigInteger.ZERO;
 
-public class InputNoLineWrapGood { // ok
+public class InputNoLineWrapGood {
 
-    public void fooMethod() { // ok
+    public void fooMethod() {
         //
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrap6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrap6.java
index a2b5f8700cb..2d75b679e92 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrap6.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrap6.java
@@ -16,7 +16,7 @@
  * Test case for detecting operator wrapping.
  * @author Lars K�hne
  **/
-class InputOperatorWrap6 // ok
+class InputOperatorWrap6
 {
     void test()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapArrayAssign.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapArrayAssign.java
index ba5a0048ba0..2597fe32a1c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapArrayAssign.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapArrayAssign.java
@@ -11,7 +11,7 @@
 import java.lang.annotation.Repeatable;
 import java.util.Arrays;
 
-@Annotation1(example = { // ok
+@Annotation1(example = {
     "foo",
     "bar"
 })
@@ -21,15 +21,15 @@
     "bar"
 })
 @Nested(
-    nestedAnn = { // ok
-        @Annotation1(example = { // ok
+    nestedAnn = {
+        @Annotation1(example = {
             "foo",
             "bar"
         })
     }
 )
 public class InputOperatorWrapArrayAssign {
-    public String[] array = { // ok
+    public String[] array = {
         "foo",
         "bar"
     };
@@ -42,7 +42,7 @@ public class InputOperatorWrapArrayAssign {
 
 @Annotation1(
     value = "1",
-    example = { // ok
+    example = {
         "foo",
         "bar"
     },
@@ -51,11 +51,11 @@ public class InputOperatorWrapArrayAssign {
 class Second {}
 
 @Annotation1(
-    example = { // ok
+    example = {
         "foo",
         "bar"
     },
-    arr = { // ok
+    arr = {
         "1"
     }
 )
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java
index ab4e8caa45a..07eaae59737 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java
@@ -13,8 +13,8 @@
 class InputOperatorWrapEol
 {
     {
-        int x1 = // ok
-                1 * // ok
+        int x1 =
+                1 *
                 2;
 
         int x2
@@ -26,34 +26,34 @@ class InputOperatorWrapEol
     }
 
     public InputOperatorWrapEol() throws IOException {
-        label: try (Reader r = // ok
+        label: try (Reader r =
                  null) {
         }
         try (Reader r
                  = null) { // violation ''=' should be on the previous line.'
         }
-        int x = (1 < 2) ? // ok
+        int x = (1 < 2) ?
                 false ? "".substring(0,
                         0).length()
                     : false // violation '':' should be on the previous line.'
                     ? 2 : 3 : 4; // violation ''?' should be on the previous line.'
 
-        for (int value : // ok
+        for (int value :
                 new int[0]) {}
         for (int value
                 : new int[0]) {} // violation '':' should be on the previous line.'
 
-        int[] a1 = // ok
+        int[] a1 =
                 {};
         int[] a2
                 = {}; // violation ''=' should be on the previous line.'
-        int[] a3 = { // ok
+        int[] a3 = {
         };
     }
 
     void comment(int magic) {
-        if (magic != 0x31 && // '1' // ok
-                magic != 0x41 && // ')' // ok
+        if (magic != 0x31 && // '1'
+                magic != 0x41 && // ')'
                 magic != 0x59 // 'Y'
             ) {
         }
@@ -66,8 +66,8 @@ void comment(int magic) {
 
     int a;
     void shortName(int oa) {
-        a=oa; // ok
-        a+=2; // ok
+        a=oa;
+        a+=2;
     }
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapNl.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapNl.java
index 308f2ed93ea..f809c141912 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapNl.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapNl.java
@@ -14,12 +14,12 @@ class InputOperatorWrapNl
 {
     {
         int x1
-                = (1 // ok
-                * 2) * (1 // ok
-                    * 2); // ok
+                = (1
+                * 2) * (1
+                    * 2);
         int x2 = // violation ''=' should be on a new line.'
                 1 * // violation ''*' should be on a new line.'
-                2 * "" // ok
+                2 * ""
                     .length();
         int x3 = (2 * 1) * 0 * ( // ok, parens
                 1 * 2) * 0;
@@ -27,7 +27,7 @@ class InputOperatorWrapNl
 
     public InputOperatorWrapNl() throws IOException {
         label: try (Reader r
-                     = null) { // ok
+                     = null) {
         }
         try (Reader r = // violation ''=' should be on a new line.'
                      null) {
@@ -35,26 +35,26 @@ public InputOperatorWrapNl() throws IOException {
         int x = (1 < 2) ? // violation ''?' should be on a new line.'
             false ? "".substring(0,
                     0).length() : false
-                ? 1 // ok
-                : 2 : 3; // ok
+                ? 1
+                : 2 : 3;
 
         for (int value
-                : new int[0]) {} // ok
+                : new int[0]) {}
         for (int value : // violation '':' should be on a new line.'
                 new int[0]) {}
 
         int[] a1
-                = {}; // ok
+                = {};
         int[] a2 = // violation ''=' should be on a new line.'
                 {};
-        int[] a3 = { // ok
+        int[] a3 = {
         };
     }
 
     void comment(int magic) {
         if (magic == 0x32 // '2'
-                || magic == 0x41 // ')' // ok
-                || magic == 0x58 // 'X' // ok
+                || magic == 0x41 // ')'
+                || magic == 0x58 // 'X'
         ) {
         }
         if (magic != 0x31 && // violation ''&&' should be on a new line.'
@@ -66,8 +66,8 @@ void comment(int magic) {
 
     int a;
     void shortName(int oa) {
-        a=oa; // ok
-        a+=2; // ok
+        a=oa;
+        a+=2;
     }
 
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java
index 08fd6d3680e..f5a4e904b68 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java
@@ -21,7 +21,7 @@ public static void main(String[] args) throws Exception {
         }
 
         try ((args.length > 0 ? v
-                : new InputOperatorWrapTryWithResources()).finalWrapper.finalField) { // ok
+                : new InputOperatorWrapTryWithResources()).finalWrapper.finalField) {
         }
 
         //More than one resource
@@ -30,7 +30,7 @@ public static void main(String[] args) throws Exception {
         }
 
         InputOperatorWrapTryWithResources m1 = new InputOperatorWrapTryWithResources();
-        try (m1; InputOperatorWrapTryWithResources m2 = m1; // ok
+        try (m1; InputOperatorWrapTryWithResources m2 = m1;
              InputOperatorWrapTryWithResources m3 = m2;) {
         }
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java
index d2d40db59e8..0fbfad77ba4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java
@@ -12,7 +12,7 @@
 
 public class InputOperatorWrapWithTrimOptionProperty {
 
-        int x = (1 < 2) ? // ok
+        int x = (1 < 2) ?
                 false ? "".substring(0,
                         0).length()
                     : false // violation '':' should be on the previous line.'
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/InputConfigurationLoaderDefaultProperty.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/InputConfigurationLoaderDefaultProperty.xml
new file mode 100644
index 00000000000..3afb95ea818
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/InputConfigurationLoaderDefaultProperty.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+    <property name="tabWidth" value="${checkstyle.tabsize}" default="2"/>
+    <property name="basedir" value="src/${checkstyle.baseDirectory}" default="."/>
+    <property name="charset"
+              value="${checkstyle.charset.base}-${checkstyle.charset.number}" default="ASCII"/>
+
+</module>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/InputConfigurationLoaderSystemDoctype.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/InputConfigurationLoaderSystemDoctype.xml
new file mode 100644
index 00000000000..8f6cb3bd02c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/InputConfigurationLoaderSystemDoctype.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE module SYSTEM
+    "../../../../../../../main/resources/com/puppycrawl/tools/checkstyle/configuration_1_1.dtd">
+
+<module name="Checker">
+    <property name="tabWidth" value="4" />
+</module>
diff --git "a/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/\303\246\302\243\302\265\302\245/InputConfigurationLoaderDefaultProperty.xml" "b/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/\303\246\302\243\302\265\302\245/InputConfigurationLoaderDefaultProperty.xml"
new file mode 100644
index 00000000000..3afb95ea818
--- /dev/null
+++ "b/src/test/resources/com/puppycrawl/tools/checkstyle/configurationloader/\303\246\302\243\302\265\302\245/InputConfigurationLoaderDefaultProperty.xml"
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+    <property name="tabWidth" value="${checkstyle.tabsize}" default="2"/>
+    <property name="basedir" value="src/${checkstyle.baseDirectory}" default="."/>
+    <property name="charset"
+              value="${checkstyle.charset.base}-${checkstyle.charset.number}" default="ASCII"/>
+
+</module>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/InputSuppressionCommentFilterSuppressById6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/InputSuppressionCommentFilterSuppressById6.java
new file mode 100644
index 00000000000..83f3effa163
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/InputSuppressionCommentFilterSuppressById6.java
@@ -0,0 +1,29 @@
+/*
+SuppressionCommentFilter
+offCommentFormat = CSOFF
+onCommentFormat = CSON
+checkFormat = MemberNameCheck
+messageFormat = (default)(null)
+idFormat = (default)(null)
+checkCPP = (default)true
+checkC = (default)true
+
+
+com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck
+id = ignore
+format = (default)^[a-z][a-zA-Z0-9]*$
+applyToPublic = (default)true
+applyToProtected = (default)true
+applyToPackage = (default)true
+applyToPrivate = (default)true
+
+*/
+
+package com.puppycrawl.tools.checkstyle.filters.suppressioncommentfilter;
+
+public class InputSuppressionCommentFilterSuppressById6 {
+
+    // CSOFF
+    int line_length = 100; // filtered violation
+    //CSON
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter7.java
new file mode 100644
index 00000000000..3fdc1f57060
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter7.java
@@ -0,0 +1,20 @@
+/*
+SuppressionFilter
+file = (file)InputSuppressionFilter7.xml
+optional = true
+
+com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck
+format = (default)^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$
+applyToPublic = (default)true
+applyToProtected = (default)true
+applyToPackage = (default)true
+applyToPrivate = (default)true
+
+
+*/
+package com.puppycrawl.tools.checkstyle.filters.suppressionfilter;
+
+public class InputSuppressionFilter7 {
+
+    public final static int bad_name = 1; // filtered violation
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter7.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter7.xml
new file mode 100644
index 00000000000..09cd92143a7
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "com/puppycrawl/tools/checkstyle/suppressions_1_2.dtd">
+
+<suppressions>
+  <suppress checks="ConstantNameCheck"
+    files="InputSuppressionFilter7.java"
+    lines="19"/>
+</suppressions>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter8.java b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter8.java
new file mode 100644
index 00000000000..b6d3f3b9578
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionfilter/InputSuppressionFilter8.java
@@ -0,0 +1,21 @@
+/*
+SuppressionFilter
+file = (file)NonExistence.xml
+optional = true
+
+com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck
+format = (default)^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$
+applyToPublic = (default)true
+applyToProtected = (default)true
+applyToPackage = (default)true
+applyToPrivate = (default)true
+
+
+*/
+package com.puppycrawl.tools.checkstyle.filters.suppressionfilter;
+
+public class InputSuppressionFilter8 {
+
+    public final static int bad_name = 1;
+    // violation above
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter5.java
new file mode 100644
index 00000000000..e429a78093c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter5.java
@@ -0,0 +1,19 @@
+/*
+com.puppycrawl.tools.checkstyle.filters.SuppressionXpathFilter
+file = (file)InputSuppressionXpathFilter5.xml
+optional = (default)false
+
+com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenTextCheck
+format = [^a-zA-z0-9]*
+ignoreCase = (default)false
+message = (default)
+tokens = CHAR_LITERAL
+
+*/
+
+package com.puppycrawl.tools.checkstyle.filters.suppressionxpathfilter;
+
+public class InputSuppressionXpathFilter5 {
+
+    char a = '&'; // filtered violation
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter5.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter5.xml
new file mode 100644
index 00000000000..479aaf1ba66
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter5.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
+<suppressions>
+    <suppress-xpath
+            files="InputSuppressionXpathFilter5.java"
+            checks="IllegalTokenTextCheck"
+            query="/descendant-or-self::*"/>
+</suppressions>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter6.java b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter6.java
new file mode 100644
index 00000000000..3320f41bbb6
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter6.java
@@ -0,0 +1,19 @@
+/*
+com.puppycrawl.tools.checkstyle.filters.SuppressionXpathFilter
+file = (file)InputSuppressionXpathFilter6.xml
+optional = (default)false
+
+com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenTextCheck
+format = [^a-zA-z0-9]*
+ignoreCase = (default)false
+message = (default)
+tokens = CHAR_LITERAL
+
+*/
+
+package com.puppycrawl.tools.checkstyle.filters.suppressionxpathfilter;
+
+public class InputSuppressionXpathFilter6 {
+
+    char a = '&'; // filtered violation
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter6.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter6.xml
new file mode 100644
index 00000000000..e321d89ada7
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter6.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
+<suppressions>
+    <suppress-xpath
+            files="InputSuppressionXpathFilter6.java"
+            checks="IllegalTokenTextCheck"
+            query="//ancestor-or-self::*"/>
+</suppressions>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter7.java
new file mode 100644
index 00000000000..da020d14a52
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter7.java
@@ -0,0 +1,21 @@
+/*
+SuppressionXpathFilter
+file = (file)InputSuppressionXpathFilter7.xml
+optional = true
+
+com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck
+id = uniqueId
+format = (default)^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$
+applyToPublic = (default)true
+applyToProtected = (default)true
+applyToPackage = (default)true
+applyToPrivate = (default)true
+
+
+*/
+package com.puppycrawl.tools.checkstyle.filters.suppressionxpathfilter;
+
+public class InputSuppressionXpathFilter7 {
+
+    public final static int bad_name = 1; // filtered violation
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter7.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter7.xml
new file mode 100644
index 00000000000..4568c3ccdd7
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathfilter/InputSuppressionXpathFilter7.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.1//EN"
+    "https://checkstyle.org/dtds/suppressions_1_1_xpath_experimental.dtd">
+<suppressions>
+  <suppress-xpath id="uniqueId"
+                  query="/COMPILATION_UNIT/CLASS_DEF[./IDENT
+                  [@text='InputSuppressionXpathFilter7']]/
+                  OBJBLOCK/VARIABLE_DEF/IDENT[@text='bad_name']"
+                  files="InputSuppressionXpathFilter.*\.java"/>
+</suppressions>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionJava15FinalLocalRecord.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionJava15FinalLocalRecord.txt
index d0a03346386..491161b0c0e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionJava15FinalLocalRecord.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionJava15FinalLocalRecord.txt
@@ -1,6 +1,6 @@
 COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
 |--SINGLE_LINE_COMMENT -> // [1:0]
-|   `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java15\n [1:2]
+|   `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java17\n [1:2]
 |--PACKAGE_DEF -> package [2:0]
 |   |--ANNOTATIONS -> ANNOTATIONS [2:47]
 |   |--DOT -> . [2:47]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon.txt
index fcfccba1dc2..ed8ee5be8de 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon.txt
@@ -1,6 +1,6 @@
 COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
 |--SINGLE_LINE_COMMENT -> // [1:0]
-|   `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java16\n [1:2]
+|   `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java17\n [1:2]
 |--PACKAGE_DEF -> package [2:0]
 |   |--ANNOTATIONS -> ANNOTATIONS [2:47]
 |   |--DOT -> . [2:47]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon3.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon3.txt
index f635bd0cb39..84b46af1fd7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon3.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/antlr4/ExpectedAntlr4AstRegressionUncommon3.txt
@@ -1,6 +1,6 @@
 COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
 |--SINGLE_LINE_COMMENT -> // [1:0]
-|   `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java16\n [1:2]
+|   `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java17\n [1:2]
 |--PACKAGE_DEF -> package [2:0]
 |   |--ANNOTATIONS -> ANNOTATIONS [2:47]
 |   |--DOT -> . [2:47]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/comments/InputFullOfBlockCommentsAst.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/comments/InputFullOfBlockCommentsAst.txt
new file mode 100644
index 00000000000..5b5e8438702
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/comments/InputFullOfBlockCommentsAst.txt
@@ -0,0 +1,278 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [1:10]
+|--BLOCK_COMMENT_BEGIN -> /* [1:0]
+|   |--COMMENT_CONTENT -> 0 [1:2]
+|   `--BLOCK_COMMENT_END -> */ [1:2]
+|--BLOCK_COMMENT_BEGIN -> /* [1:5]
+|   |--COMMENT_CONTENT -> 1 [1:7]
+|   `--BLOCK_COMMENT_END -> */ [1:7]
+|--PACKAGE_DEF -> package [1:10]
+|   |--ANNOTATIONS -> ANNOTATIONS [1:97]
+|   |--BLOCK_COMMENT_BEGIN -> /* [1:92]
+|   |   |--COMMENT_CONTENT -> 9 [1:94]
+|   |   `--BLOCK_COMMENT_END -> */ [1:94]
+|   |--DOT -> . [1:97]
+|   |   |--DOT -> . [1:84]
+|   |   |   |--BLOCK_COMMENT_BEGIN -> /* [1:63]
+|   |   |   |   |--COMMENT_CONTENT -> 7 [1:65]
+|   |   |   |   `--BLOCK_COMMENT_END -> */ [1:65]
+|   |   |   |--DOT -> . [1:68]
+|   |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [1:47]
+|   |   |   |   |   |--COMMENT_CONTENT -> 5 [1:49]
+|   |   |   |   |   `--BLOCK_COMMENT_END -> */ [1:49]
+|   |   |   |   |--DOT -> . [1:52]
+|   |   |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [1:26]
+|   |   |   |   |   |   |--COMMENT_CONTENT -> 3 [1:28]
+|   |   |   |   |   |   `--BLOCK_COMMENT_END -> */ [1:28]
+|   |   |   |   |   |--DOT -> . [1:31]
+|   |   |   |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [1:17]
+|   |   |   |   |   |   |   |--COMMENT_CONTENT -> 2 [1:19]
+|   |   |   |   |   |   |   `--BLOCK_COMMENT_END -> */ [1:19]
+|   |   |   |   |   |   |--IDENT -> com [1:23]
+|   |   |   |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [1:32]
+|   |   |   |   |   |   |   |--COMMENT_CONTENT -> 4 [1:34]
+|   |   |   |   |   |   |   `--BLOCK_COMMENT_END -> */ [1:34]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [1:37]
+|   |   |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [1:53]
+|   |   |   |   |   |   |--COMMENT_CONTENT -> 6 [1:55]
+|   |   |   |   |   |   `--BLOCK_COMMENT_END -> */ [1:55]
+|   |   |   |   |   `--IDENT -> tools [1:58]
+|   |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [1:69]
+|   |   |   |   |   |--COMMENT_CONTENT -> 8 [1:71]
+|   |   |   |   |   `--BLOCK_COMMENT_END -> */ [1:71]
+|   |   |   |   `--IDENT -> checkstyle [1:74]
+|   |   |   `--IDENT -> grammar [1:85]
+|   |   |--BLOCK_COMMENT_BEGIN -> /* [1:98]
+|   |   |   |--COMMENT_CONTENT -> 10 [1:100]
+|   |   |   `--BLOCK_COMMENT_END -> */ [1:101]
+|   |   `--IDENT -> comments [1:104]
+|   |--BLOCK_COMMENT_BEGIN -> /* [1:112]
+|   |   |--COMMENT_CONTENT -> 11 [1:114]
+|   |   `--BLOCK_COMMENT_END -> */ [1:115]
+|   `--SEMI -> ; [1:118]
+`--CLASS_DEF -> CLASS_DEF [3:6]
+    |--MODIFIERS -> MODIFIERS [3:6]
+    |   |--BLOCK_COMMENT_BEGIN -> /* [1:119]
+    |   |   |--COMMENT_CONTENT -> 12 [1:121]
+    |   |   `--BLOCK_COMMENT_END -> */ [1:122]
+    |   |--BLOCK_COMMENT_BEGIN -> /* [2:0]
+    |   |   |--COMMENT_CONTENT -> 13 [2:2]
+    |   |   `--BLOCK_COMMENT_END -> */ [2:3]
+    |   |--BLOCK_COMMENT_BEGIN -> /* [3:0]
+    |   |   |--COMMENT_CONTENT -> 14 [3:2]
+    |   |   `--BLOCK_COMMENT_END -> */ [3:3]
+    |   `--LITERAL_PUBLIC -> public [3:6]
+    |--BLOCK_COMMENT_BEGIN -> /* [3:12]
+    |   |--COMMENT_CONTENT -> 15 [3:14]
+    |   `--BLOCK_COMMENT_END -> */ [3:15]
+    |--LITERAL_CLASS -> class [3:19]
+    |--BLOCK_COMMENT_BEGIN -> /* [3:25]
+    |   |--COMMENT_CONTENT -> 16 [3:27]
+    |   `--BLOCK_COMMENT_END -> */ [3:28]
+    |--IDENT -> InputFullOfBlockComments [3:31]
+    `--OBJBLOCK -> OBJBLOCK [3:62]
+        |--BLOCK_COMMENT_BEGIN -> /* [3:56]
+        |   |--COMMENT_CONTENT -> 49 [3:58]
+        |   `--BLOCK_COMMENT_END -> */ [3:59]
+        |--LCURLY -> { [3:62]
+        |--METHOD_DEF -> METHOD_DEF [5:10]
+        |   |--MODIFIERS -> MODIFIERS [5:10]
+        |   |   |--BLOCK_COMMENT_BEGIN -> /* [3:63]
+        |   |   |   |--COMMENT_CONTENT -> 17 [3:65]
+        |   |   |   `--BLOCK_COMMENT_END -> */ [3:66]
+        |   |   |--BLOCK_COMMENT_BEGIN -> /* [4:4]
+        |   |   |   |--COMMENT_CONTENT -> 18 [4:6]
+        |   |   |   `--BLOCK_COMMENT_END -> */ [4:7]
+        |   |   |--BLOCK_COMMENT_BEGIN -> /* [5:4]
+        |   |   |   |--COMMENT_CONTENT -> 19 [5:6]
+        |   |   |   `--BLOCK_COMMENT_END -> */ [5:7]
+        |   |   |--LITERAL_PUBLIC -> public [5:10]
+        |   |   |--BLOCK_COMMENT_BEGIN -> /* [5:16]
+        |   |   |   |--COMMENT_CONTENT -> 20 [5:18]
+        |   |   |   `--BLOCK_COMMENT_END -> */ [5:19]
+        |   |   `--LITERAL_STATIC -> static [5:23]
+        |   |--TYPE -> TYPE [7:3]
+        |   |   |--BLOCK_COMMENT_BEGIN -> /* [5:29]
+        |   |   |   |--COMMENT_CONTENT -> \r\n21\r\n [5:31]
+        |   |   |   `--BLOCK_COMMENT_END -> */ [7:0]
+        |   |   `--IDENT -> String [7:3]
+        |   |--BLOCK_COMMENT_BEGIN -> /* [7:9]
+        |   |   |--COMMENT_CONTENT -> 22 [7:11]
+        |   |   `--BLOCK_COMMENT_END -> */ [7:12]
+        |   |--IDENT -> main [7:16]
+        |   |--BLOCK_COMMENT_BEGIN -> /* [7:20]
+        |   |   |--COMMENT_CONTENT -> 23 [7:22]
+        |   |   `--BLOCK_COMMENT_END -> */ [7:23]
+        |   |--LPAREN -> ( [7:26]
+        |   |--PARAMETERS -> PARAMETERS [7:33]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [7:33]
+        |   |       |--MODIFIERS -> MODIFIERS [7:33]
+        |   |       |--TYPE -> TYPE [7:33]
+        |   |       |   |--BLOCK_COMMENT_BEGIN -> /* [7:27]
+        |   |       |   |   |--COMMENT_CONTENT -> 24 [7:29]
+        |   |       |   |   `--BLOCK_COMMENT_END -> */ [7:30]
+        |   |       |   |--IDENT -> String [7:33]
+        |   |       |   |--BLOCK_COMMENT_BEGIN -> /* [7:39]
+        |   |       |   |   |--COMMENT_CONTENT -> 25 [7:41]
+        |   |       |   |   `--BLOCK_COMMENT_END -> */ [7:42]
+        |   |       |   `--ARRAY_DECLARATOR -> [ [7:45]
+        |   |       |       |--BLOCK_COMMENT_BEGIN -> /* [7:46]
+        |   |       |       |   |--COMMENT_CONTENT -> 26 [7:48]
+        |   |       |       |   `--BLOCK_COMMENT_END -> */ [7:49]
+        |   |       |       `--RBRACK -> ] [7:52]
+        |   |       |--BLOCK_COMMENT_BEGIN -> /* [7:53]
+        |   |       |   |--COMMENT_CONTENT -> 27 [7:55]
+        |   |       |   `--BLOCK_COMMENT_END -> */ [7:56]
+        |   |       `--IDENT -> args [7:60]
+        |   |--BLOCK_COMMENT_BEGIN -> /* [7:64]
+        |   |   |--COMMENT_CONTENT -> 28 [7:66]
+        |   |   `--BLOCK_COMMENT_END -> */ [7:67]
+        |   |--RPAREN -> ) [7:70]
+        |   |--BLOCK_COMMENT_BEGIN -> /* [7:71]
+        |   |   |--COMMENT_CONTENT -> 29 [7:73]
+        |   |   `--BLOCK_COMMENT_END -> */ [7:74]
+        |   `--SLIST -> { [7:78]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [8:14]
+        |       |   |--MODIFIERS -> MODIFIERS [8:14]
+        |       |   |--TYPE -> TYPE [8:14]
+        |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [7:79]
+        |       |   |   |   |--COMMENT_CONTENT -> 30 [7:81]
+        |       |   |   |   `--BLOCK_COMMENT_END -> */ [7:82]
+        |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [8:8]
+        |       |   |   |   |--COMMENT_CONTENT -> 31 [8:10]
+        |       |   |   |   `--BLOCK_COMMENT_END -> */ [8:11]
+        |       |   |   `--IDENT -> String [8:14]
+        |       |   |--BLOCK_COMMENT_BEGIN -> /* [8:21]
+        |       |   |   |--COMMENT_CONTENT -> 32 [8:23]
+        |       |   |   `--BLOCK_COMMENT_END -> */ [8:24]
+        |       |   |--IDENT -> line [8:27]
+        |       |   |--BLOCK_COMMENT_BEGIN -> /* [8:32]
+        |       |   |   |--COMMENT_CONTENT -> 33 [8:34]
+        |       |   |   `--BLOCK_COMMENT_END -> */ [8:35]
+        |       |   `--ASSIGN -> = [8:38]
+        |       |       `--EXPR -> EXPR [8:46]
+        |       |           |--BLOCK_COMMENT_BEGIN -> /* [8:40]
+        |       |           |   |--COMMENT_CONTENT -> 34 [8:42]
+        |       |           |   `--BLOCK_COMMENT_END -> */ [8:43]
+        |       |           `--STRING_LITERAL -> "/*I'm NOT comment*/blabla" [8:46]
+        |       |--BLOCK_COMMENT_BEGIN -> /* [8:73]
+        |       |   |--COMMENT_CONTENT -> 35 [8:75]
+        |       |   `--BLOCK_COMMENT_END -> */ [8:76]
+        |       |--SEMI -> ; [8:79]
+        |       |--EXPR -> EXPR [9:84]
+        |       |   |--BLOCK_COMMENT_BEGIN -> /* [9:78]
+        |       |   |   |--COMMENT_CONTENT -> 42 [9:80]
+        |       |   |   `--BLOCK_COMMENT_END -> */ [9:81]
+        |       |   `--METHOD_CALL -> ( [9:84]
+        |       |       |--BLOCK_COMMENT_BEGIN -> /* [9:59]
+        |       |       |   |--COMMENT_CONTENT -> 40 [9:61]
+        |       |       |   `--BLOCK_COMMENT_END -> */ [9:62]
+        |       |       |--DOT -> . [9:65]
+        |       |       |   |--BLOCK_COMMENT_BEGIN -> /* [9:20]
+        |       |       |   |   |--COMMENT_CONTENT -> 38 [9:22]
+        |       |       |   |   `--BLOCK_COMMENT_END -> */ [9:23]
+        |       |       |   |--DOT -> . [9:26]
+        |       |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [8:80]
+        |       |       |   |   |   |--COMMENT_CONTENT -> 36 [8:82]
+        |       |       |   |   |   `--BLOCK_COMMENT_END -> */ [8:83]
+        |       |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [9:8]
+        |       |       |   |   |   |--COMMENT_CONTENT -> 37 [9:10]
+        |       |       |   |   |   `--BLOCK_COMMENT_END -> */ [9:11]
+        |       |       |   |   |--IDENT -> String [9:14]
+        |       |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [9:27]
+        |       |       |   |   |   |--COMMENT_CONTENT ->   39   [9:29]
+        |       |       |   |   |   `--BLOCK_COMMENT_END -> */ [9:34]
+        |       |       |   |   `--IDENT -> CASE_INSENSITIVE_ORDER [9:37]
+        |       |       |   |--BLOCK_COMMENT_BEGIN -> /* [9:66]
+        |       |       |   |   |--COMMENT_CONTENT -> 41 [9:68]
+        |       |       |   |   `--BLOCK_COMMENT_END -> */ [9:69]
+        |       |       |   `--IDENT -> equals [9:72]
+        |       |       |--ELIST -> ELIST [9:91]
+        |       |       |   `--EXPR -> EXPR [9:91]
+        |       |       |       |--BLOCK_COMMENT_BEGIN -> /* [9:85]
+        |       |       |       |   |--COMMENT_CONTENT -> 43 [9:87]
+        |       |       |       |   `--BLOCK_COMMENT_END -> */ [9:88]
+        |       |       |       `--IDENT -> line [9:91]
+        |       |       |--BLOCK_COMMENT_BEGIN -> /* [9:95]
+        |       |       |   |--COMMENT_CONTENT -> 44 [9:97]
+        |       |       |   `--BLOCK_COMMENT_END -> */ [9:98]
+        |       |       `--RPAREN -> ) [9:101]
+        |       |--BLOCK_COMMENT_BEGIN -> /* [9:102]
+        |       |   |--COMMENT_CONTENT -> 45 [9:104]
+        |       |   `--BLOCK_COMMENT_END -> */ [9:105]
+        |       |--SEMI -> ; [9:108]
+        |       |--VARIABLE_DEF -> VARIABLE_DEF [10:8]
+        |       |   |--MODIFIERS -> MODIFIERS [10:8]
+        |       |   |--TYPE -> TYPE [10:8]
+        |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [9:109]
+        |       |   |   |   |--COMMENT_CONTENT -> 46 [9:111]
+        |       |   |   |   `--BLOCK_COMMENT_END -> */ [9:112]
+        |       |   |   |--IDENT -> Integer [10:8]
+        |       |   |   `--ARRAY_DECLARATOR -> [ [10:15]
+        |       |   |       `--RBRACK -> ] [10:16]
+        |       |   |--IDENT -> array [10:18]
+        |       |   `--ASSIGN -> = [10:24]
+        |       |       `--EXPR -> EXPR [10:26]
+        |       |           `--LITERAL_NULL -> null [10:26]
+        |       |--SEMI -> ; [10:30]
+        |       |--BLOCK_COMMENT_BEGIN -> /* [11:8]
+        |       |   |--COMMENT_CONTENT -> 50 [11:10]
+        |       |   `--BLOCK_COMMENT_END -> */ [11:11]
+        |       |--LITERAL_FOR -> for [11:14]
+        |       |   |--BLOCK_COMMENT_BEGIN -> /* [11:17]
+        |       |   |   |--COMMENT_CONTENT -> 51 [11:19]
+        |       |   |   `--BLOCK_COMMENT_END -> */ [11:20]
+        |       |   |--LPAREN -> ( [11:24]
+        |       |   |--FOR_EACH_CLAUSE -> FOR_EACH_CLAUSE [11:31]
+        |       |   |   |--VARIABLE_DEF -> VARIABLE_DEF [11:31]
+        |       |   |   |   |--MODIFIERS -> MODIFIERS [11:31]
+        |       |   |   |   |--TYPE -> TYPE [11:31]
+        |       |   |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [11:25]
+        |       |   |   |   |   |   |--COMMENT_CONTENT -> 52 [11:27]
+        |       |   |   |   |   |   `--BLOCK_COMMENT_END -> */ [11:28]
+        |       |   |   |   |   `--IDENT -> Integer [11:31]
+        |       |   |   |   |--BLOCK_COMMENT_BEGIN -> /* [11:38]
+        |       |   |   |   |   |--COMMENT_CONTENT -> 53 [11:40]
+        |       |   |   |   |   `--BLOCK_COMMENT_END -> */ [11:41]
+        |       |   |   |   `--IDENT -> i [11:45]
+        |       |   |   |--BLOCK_COMMENT_BEGIN -> /* [11:46]
+        |       |   |   |   |--COMMENT_CONTENT -> 54 [11:48]
+        |       |   |   |   `--BLOCK_COMMENT_END -> */ [11:49]
+        |       |   |   |--COLON -> : [11:52]
+        |       |   |   `--EXPR -> EXPR [11:60]
+        |       |   |       |--BLOCK_COMMENT_BEGIN -> /* [11:53]
+        |       |   |       |   |--COMMENT_CONTENT -> 55 [11:55]
+        |       |   |       |   `--BLOCK_COMMENT_END -> */ [11:56]
+        |       |   |       `--IDENT -> array [11:60]
+        |       |   |--BLOCK_COMMENT_BEGIN -> /* [11:65]
+        |       |   |   |--COMMENT_CONTENT -> 56 [11:67]
+        |       |   |   `--BLOCK_COMMENT_END -> */ [11:68]
+        |       |   |--RPAREN -> ) [11:71]
+        |       |   |--BLOCK_COMMENT_BEGIN -> /* [11:72]
+        |       |   |   |--COMMENT_CONTENT -> 57 [11:74]
+        |       |   |   `--BLOCK_COMMENT_END -> */ [11:75]
+        |       |   `--SLIST -> { [11:79]
+        |       |       |--BLOCK_COMMENT_BEGIN -> /* [11:80]
+        |       |       |   |--COMMENT_CONTENT -> 58 [11:82]
+        |       |       |   `--BLOCK_COMMENT_END -> */ [11:83]
+        |       |       |--BLOCK_COMMENT_BEGIN -> /* [12:12]
+        |       |       |   |--COMMENT_CONTENT -> 59 [12:14]
+        |       |       |   `--BLOCK_COMMENT_END -> */ [12:15]
+        |       |       `--RCURLY -> } [13:8]
+        |       |--BLOCK_COMMENT_BEGIN -> /* [13:9]
+        |       |   |--COMMENT_CONTENT -> 60 [13:11]
+        |       |   `--BLOCK_COMMENT_END -> */ [13:12]
+        |       |--LITERAL_RETURN -> return [14:8]
+        |       |   |--EXPR -> EXPR [14:15]
+        |       |   |   `--IDENT -> line [14:15]
+        |       |   `--SEMI -> ; [14:19]
+        |       `--RCURLY -> } [15:4]
+        |--BLOCK_COMMENT_BEGIN -> /* [15:5]
+        |   |--COMMENT_CONTENT -> 47 [15:7]
+        |   `--BLOCK_COMMENT_END -> */ [15:8]
+        |--RCURLY -> } [16:0]
+        |--BLOCK_COMMENT_BEGIN -> /* [16:1]
+        |   |--COMMENT_CONTENT -> 48 [16:3]
+        |   `--BLOCK_COMMENT_END -> */ [16:4]
+        `--BLOCK_COMMENT_BEGIN -> /* [17:0]
+            |--COMMENT_CONTENT -> 61 [17:2]
+            `--BLOCK_COMMENT_END -> */ [17:3]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/comments/InputFullOfSinglelineCommentsAst.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/comments/InputFullOfSinglelineCommentsAst.txt
new file mode 100644
index 00000000000..9b0cd773955
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/comments/InputFullOfSinglelineCommentsAst.txt
@@ -0,0 +1,219 @@
+COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
+|--SINGLE_LINE_COMMENT -> // [1:0]
+|   `--COMMENT_CONTENT -> 0\r\n [1:2]
+|--PACKAGE_DEF -> package [2:0]
+|   |--ANNOTATIONS -> ANNOTATIONS [10:0]
+|   |--SINGLE_LINE_COMMENT -> // [9:18]
+|   |   `--COMMENT_CONTENT -> 8\r\n [9:20]
+|   |--DOT -> . [10:0]
+|   |   |--DOT -> . [9:10]
+|   |   |   |--SINGLE_LINE_COMMENT -> // [7:5]
+|   |   |   |   `--COMMENT_CONTENT -> 6\r\n [7:7]
+|   |   |   |--DOT -> . [8:0]
+|   |   |   |   |--SINGLE_LINE_COMMENT -> // [5:10]
+|   |   |   |   |   `--COMMENT_CONTENT -> 4\r\n [5:12]
+|   |   |   |   |--DOT -> . [6:0]
+|   |   |   |   |   |--SINGLE_LINE_COMMENT -> // [3:3]
+|   |   |   |   |   |   `--COMMENT_CONTENT -> 2\r\n [3:5]
+|   |   |   |   |   |--DOT -> . [4:0]
+|   |   |   |   |   |   |--SINGLE_LINE_COMMENT -> // [2:7]
+|   |   |   |   |   |   |   `--COMMENT_CONTENT -> 1\r\n [2:9]
+|   |   |   |   |   |   |--IDENT -> com [3:0]
+|   |   |   |   |   |   |--SINGLE_LINE_COMMENT -> // [4:1]
+|   |   |   |   |   |   |   `--COMMENT_CONTENT -> 3\r\n [4:3]
+|   |   |   |   |   |   `--IDENT -> puppycrawl [5:0]
+|   |   |   |   |   |--SINGLE_LINE_COMMENT -> // [6:1]
+|   |   |   |   |   |   `--COMMENT_CONTENT -> 5\r\n [6:3]
+|   |   |   |   |   `--IDENT -> tools [7:0]
+|   |   |   |   |--SINGLE_LINE_COMMENT -> // [8:1]
+|   |   |   |   |   `--COMMENT_CONTENT -> 7\r\n [8:3]
+|   |   |   |   `--IDENT -> checkstyle [9:0]
+|   |   |   `--IDENT -> grammar [9:11]
+|   |   |--SINGLE_LINE_COMMENT -> // [10:1]
+|   |   |   `--COMMENT_CONTENT -> 9\r\n [10:3]
+|   |   `--IDENT -> comments [11:0]
+|   |--SINGLE_LINE_COMMENT -> // [11:8]
+|   |   `--COMMENT_CONTENT -> 10\r\n [11:10]
+|   |--SINGLE_LINE_COMMENT -> // [12:0]
+|   |   `--COMMENT_CONTENT -> 11\r\n [12:2]
+|   |--SINGLE_LINE_COMMENT -> // [13:0]
+|   |   `--COMMENT_CONTENT -> 12\r\n [13:2]
+|   `--SEMI -> ; [14:0]
+`--CLASS_DEF -> CLASS_DEF [16:0]
+    |--MODIFIERS -> MODIFIERS [16:0]
+    |   |--SINGLE_LINE_COMMENT -> // [14:1]
+    |   |   `--COMMENT_CONTENT -> 13\r\n [14:3]
+    |   |--SINGLE_LINE_COMMENT -> // [15:0]
+    |   |   `--COMMENT_CONTENT -> 14\r\n [15:2]
+    |   `--LITERAL_PUBLIC -> public [16:0]
+    |--SINGLE_LINE_COMMENT -> // [16:6]
+    |   `--COMMENT_CONTENT -> 15\r\n [16:8]
+    |--LITERAL_CLASS -> class [17:0]
+    |--SINGLE_LINE_COMMENT -> // [17:5]
+    |   `--COMMENT_CONTENT -> 16\r\n [17:7]
+    |--IDENT -> InputFullOfSinglelineComments [18:0]
+    `--OBJBLOCK -> OBJBLOCK [19:0]
+        |--SINGLE_LINE_COMMENT -> // [18:29]
+        |   `--COMMENT_CONTENT -> 17\r\n [18:31]
+        |--LCURLY -> { [19:0]
+        |--METHOD_DEF -> METHOD_DEF [20:0]
+        |   |--MODIFIERS -> MODIFIERS [20:0]
+        |   |   |--SINGLE_LINE_COMMENT -> // [19:1]
+        |   |   |   `--COMMENT_CONTENT -> 18\r\n [19:3]
+        |   |   |--LITERAL_PUBLIC -> public [20:0]
+        |   |   |--SINGLE_LINE_COMMENT -> // [20:6]
+        |   |   |   `--COMMENT_CONTENT -> 19\r\n [20:8]
+        |   |   `--LITERAL_STATIC -> static [21:0]
+        |   |--TYPE -> TYPE [22:0]
+        |   |   |--SINGLE_LINE_COMMENT -> // [21:6]
+        |   |   |   `--COMMENT_CONTENT -> 20\r\n [21:8]
+        |   |   `--LITERAL_VOID -> void [22:0]
+        |   |--SINGLE_LINE_COMMENT -> // [22:4]
+        |   |   `--COMMENT_CONTENT -> 21\r\n [22:6]
+        |   |--IDENT -> main [23:0]
+        |   |--SINGLE_LINE_COMMENT -> // [23:4]
+        |   |   `--COMMENT_CONTENT -> 22\r\n [23:6]
+        |   |--LPAREN -> ( [24:0]
+        |   |--PARAMETERS -> PARAMETERS [25:0]
+        |   |   `--PARAMETER_DEF -> PARAMETER_DEF [25:0]
+        |   |       |--MODIFIERS -> MODIFIERS [25:0]
+        |   |       |--TYPE -> TYPE [25:0]
+        |   |       |   |--SINGLE_LINE_COMMENT -> // [24:1]
+        |   |       |   |   `--COMMENT_CONTENT -> 23\r\n [24:3]
+        |   |       |   |--IDENT -> String [25:0]
+        |   |       |   |--SINGLE_LINE_COMMENT -> // [25:6]
+        |   |       |   |   `--COMMENT_CONTENT -> 24\r\n [25:8]
+        |   |       |   `--ARRAY_DECLARATOR -> [ [26:0]
+        |   |       |       |--SINGLE_LINE_COMMENT -> // [26:1]
+        |   |       |       |   `--COMMENT_CONTENT -> 25\r\n [26:3]
+        |   |       |       `--RBRACK -> ] [27:0]
+        |   |       |--SINGLE_LINE_COMMENT -> // [27:1]
+        |   |       |   `--COMMENT_CONTENT -> 26\r\n [27:3]
+        |   |       `--IDENT -> args [28:0]
+        |   |--SINGLE_LINE_COMMENT -> // [28:4]
+        |   |   `--COMMENT_CONTENT -> 27\r\n [28:6]
+        |   |--RPAREN -> ) [29:0]
+        |   |--SINGLE_LINE_COMMENT -> // [29:1]
+        |   |   `--COMMENT_CONTENT -> 28\r\n [29:3]
+        |   `--SLIST -> { [30:0]
+        |       |--SINGLE_LINE_COMMENT -> // [30:1]
+        |       |   `--COMMENT_CONTENT -> 29\r\n [30:3]
+        |       |--LITERAL_FOR -> for [31:0]
+        |       |   |--SINGLE_LINE_COMMENT -> // [31:3]
+        |       |   |   `--COMMENT_CONTENT -> 30\r\n [31:5]
+        |       |   |--LPAREN -> ( [32:0]
+        |       |   |--FOR_INIT -> FOR_INIT [33:0]
+        |       |   |   `--VARIABLE_DEF -> VARIABLE_DEF [33:0]
+        |       |   |       |--MODIFIERS -> MODIFIERS [33:0]
+        |       |   |       |--TYPE -> TYPE [33:0]
+        |       |   |       |   |--SINGLE_LINE_COMMENT -> // [32:1]
+        |       |   |       |   |   `--COMMENT_CONTENT -> 31\r\n [32:3]
+        |       |   |       |   `--LITERAL_INT -> int [33:0]
+        |       |   |       |--SINGLE_LINE_COMMENT -> // [33:3]
+        |       |   |       |   `--COMMENT_CONTENT -> 32\r\n [33:5]
+        |       |   |       |--IDENT -> i [34:0]
+        |       |   |       |--SINGLE_LINE_COMMENT -> // [34:1]
+        |       |   |       |   `--COMMENT_CONTENT -> 33\r\n [34:3]
+        |       |   |       `--ASSIGN -> = [35:0]
+        |       |   |           `--EXPR -> EXPR [36:0]
+        |       |   |               |--SINGLE_LINE_COMMENT -> // [35:1]
+        |       |   |               |   `--COMMENT_CONTENT -> 34\r\n [35:3]
+        |       |   |               `--NUM_INT -> 0 [36:0]
+        |       |   |--SINGLE_LINE_COMMENT -> // [36:1]
+        |       |   |   `--COMMENT_CONTENT -> 35\r\n [36:3]
+        |       |   |--SEMI -> ; [37:0]
+        |       |   |--FOR_CONDITION -> FOR_CONDITION [39:0]
+        |       |   |   `--EXPR -> EXPR [39:0]
+        |       |   |       |--SINGLE_LINE_COMMENT -> // [38:1]
+        |       |   |       |   `--COMMENT_CONTENT -> 37\r\n [38:3]
+        |       |   |       `--LE -> <= [39:0]
+        |       |   |           |--SINGLE_LINE_COMMENT -> // [37:1]
+        |       |   |           |   `--COMMENT_CONTENT -> 36\r\n [37:3]
+        |       |   |           |--IDENT -> i [38:0]
+        |       |   |           |--SINGLE_LINE_COMMENT -> // [39:2]
+        |       |   |           |   `--COMMENT_CONTENT -> 38\r\n [39:4]
+        |       |   |           `--NUM_INT -> 10 [40:0]
+        |       |   |--SINGLE_LINE_COMMENT -> // [40:2]
+        |       |   |   `--COMMENT_CONTENT -> 39\r\n [40:4]
+        |       |   |--SEMI -> ; [41:0]
+        |       |   |--FOR_ITERATOR -> FOR_ITERATOR [42:1]
+        |       |   |   `--ELIST -> ELIST [42:1]
+        |       |   |       `--EXPR -> EXPR [42:1]
+        |       |   |           `--POST_INC -> ++ [42:1]
+        |       |   |               |--SINGLE_LINE_COMMENT -> // [41:1]
+        |       |   |               |   `--COMMENT_CONTENT -> 40\r\n [41:3]
+        |       |   |               `--IDENT -> i [42:0]
+        |       |   |--SINGLE_LINE_COMMENT -> // [42:3]
+        |       |   |   `--COMMENT_CONTENT -> 41\r\n [42:5]
+        |       |   |--RPAREN -> ) [43:0]
+        |       |   |--SINGLE_LINE_COMMENT -> // [43:1]
+        |       |   |   `--COMMENT_CONTENT -> 42\r\n [43:3]
+        |       |   `--SLIST -> { [44:0]
+        |       |       |--VARIABLE_DEF -> VARIABLE_DEF [45:0]
+        |       |       |   |--MODIFIERS -> MODIFIERS [45:0]
+        |       |       |   |--TYPE -> TYPE [45:0]
+        |       |       |   |   |--SINGLE_LINE_COMMENT -> // [44:1]
+        |       |       |   |   |   `--COMMENT_CONTENT -> 43\r\n [44:3]
+        |       |       |   |   `--IDENT -> String [45:0]
+        |       |       |   |--SINGLE_LINE_COMMENT -> // [45:6]
+        |       |       |   |   `--COMMENT_CONTENT -> 44\r\n [45:8]
+        |       |       |   |--IDENT -> line [46:0]
+        |       |       |   |--SINGLE_LINE_COMMENT -> // [46:4]
+        |       |       |   |   `--COMMENT_CONTENT -> 45\r\n [46:6]
+        |       |       |   `--ASSIGN -> = [47:0]
+        |       |       |       `--EXPR -> EXPR [49:0]
+        |       |       |           |--SINGLE_LINE_COMMENT -> // [48:1]
+        |       |       |           |   `--COMMENT_CONTENT -> 47\r\n [48:3]
+        |       |       |           `--PLUS -> + [49:0]
+        |       |       |               |--SINGLE_LINE_COMMENT -> // [47:1]
+        |       |       |               |   `--COMMENT_CONTENT -> 46\r\n [47:3]
+        |       |       |               |--IDENT -> i [48:0]
+        |       |       |               |--SINGLE_LINE_COMMENT -> // [49:1]
+        |       |       |               |   `--COMMENT_CONTENT -> 48\r\n [49:3]
+        |       |       |               `--STRING_LITERAL -> "" [50:0]
+        |       |       |--SINGLE_LINE_COMMENT -> // [50:2]
+        |       |       |   `--COMMENT_CONTENT -> 49\r\n [50:4]
+        |       |       |--SEMI -> ; [51:0]
+        |       |       |--EXPR -> EXPR [57:0]
+        |       |       |   |--SINGLE_LINE_COMMENT -> // [56:6]
+        |       |       |   |   `--COMMENT_CONTENT -> 55\r\n [56:8]
+        |       |       |   `--METHOD_CALL -> ( [57:0]
+        |       |       |       |--SINGLE_LINE_COMMENT -> // [54:22]
+        |       |       |       |   `--COMMENT_CONTENT -> 53\r\n [54:24]
+        |       |       |       |--DOT -> . [55:0]
+        |       |       |       |   |--SINGLE_LINE_COMMENT -> // [52:6]
+        |       |       |       |   |   `--COMMENT_CONTENT -> 51\r\n [52:8]
+        |       |       |       |   |--DOT -> . [53:0]
+        |       |       |       |   |   |--SINGLE_LINE_COMMENT -> // [51:1]
+        |       |       |       |   |   |   `--COMMENT_CONTENT -> 50\r\n [51:3]
+        |       |       |       |   |   |--IDENT -> String [52:0]
+        |       |       |       |   |   |--SINGLE_LINE_COMMENT -> // [53:1]
+        |       |       |       |   |   |   `--COMMENT_CONTENT -> 52\r\n [53:3]
+        |       |       |       |   |   `--IDENT -> CASE_INSENSITIVE_ORDER [54:0]
+        |       |       |       |   |--SINGLE_LINE_COMMENT -> // [55:1]
+        |       |       |       |   |   `--COMMENT_CONTENT -> 54\r\n [55:3]
+        |       |       |       |   `--IDENT -> equals [56:0]
+        |       |       |       |--ELIST -> ELIST [58:0]
+        |       |       |       |   `--EXPR -> EXPR [58:0]
+        |       |       |       |       |--SINGLE_LINE_COMMENT -> // [57:1]
+        |       |       |       |       |   `--COMMENT_CONTENT -> 56\r\n [57:3]
+        |       |       |       |       `--IDENT -> line [58:0]
+        |       |       |       |--SINGLE_LINE_COMMENT -> // [58:4]
+        |       |       |       |   `--COMMENT_CONTENT -> 57\r\n [58:6]
+        |       |       |       `--RPAREN -> ) [59:0]
+        |       |       |--SINGLE_LINE_COMMENT -> // [59:1]
+        |       |       |   `--COMMENT_CONTENT -> 58\r\n [59:3]
+        |       |       |--SEMI -> ; [60:0]
+        |       |       |--SINGLE_LINE_COMMENT -> // [60:1]
+        |       |       |   `--COMMENT_CONTENT -> 59\r\n [60:3]
+        |       |       `--RCURLY -> } [61:0]
+        |       |--SINGLE_LINE_COMMENT -> // [61:1]
+        |       |   `--COMMENT_CONTENT -> 60\r\n [61:3]
+        |       `--RCURLY -> } [62:0]
+        |--SINGLE_LINE_COMMENT -> // [62:1]
+        |   `--COMMENT_CONTENT -> 61\r\n [62:3]
+        |--RCURLY -> } [63:0]
+        |--SINGLE_LINE_COMMENT -> // [63:1]
+        |   `--COMMENT_CONTENT -> 62\r\n [63:3]
+        `--SINGLE_LINE_COMMENT -> // [64:0]
+            `--COMMENT_CONTENT -> 63 [64:2]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java14/ExpectedJava14InstanceofWithPatternMatchingAST.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java14/ExpectedJava14InstanceofWithPatternMatchingAST.txt
index f0ac17621da..900e8c31545 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java14/ExpectedJava14InstanceofWithPatternMatchingAST.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java14/ExpectedJava14InstanceofWithPatternMatchingAST.txt
@@ -18,8 +18,8 @@ COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
 |   |   |--DOT -> . [4:11]
 |   |   |   |--IDENT -> java [4:7]
 |   |   |   `--IDENT -> util [4:12]
-|   |   `--IDENT -> ArrayList [4:17]
-|   `--SEMI -> ; [4:26]
+|   |   `--STAR -> * [4:17]
+|   `--SEMI -> ; [4:18]
 |--IMPORT -> import [5:0]
 |   |--DOT -> . [5:16]
 |   |   |--DOT -> . [5:11]
@@ -605,26 +605,26 @@ COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
         |       |--VARIABLE_DEF -> VARIABLE_DEF [89:8]
         |       |   |--MODIFIERS -> MODIFIERS [89:8]
         |       |   |--TYPE -> TYPE [89:8]
-        |       |   |   |--IDENT -> ArrayList [89:8]
-        |       |   |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [89:17]
-        |       |   |       |--GENERIC_START -> < [89:17]
-        |       |   |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:18]
-        |       |   |       |   `--IDENT -> Integer [89:18]
-        |       |   |       `--GENERIC_END -> > [89:25]
-        |       |   |--IDENT -> arrayList [89:27]
-        |       |   `--ASSIGN -> = [89:37]
-        |       |       `--EXPR -> EXPR [89:39]
-        |       |           `--LITERAL_NEW -> new [89:39]
-        |       |               |--IDENT -> ArrayList [89:43]
-        |       |               |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [89:52]
-        |       |               |   |--GENERIC_START -> < [89:52]
-        |       |               |   |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:53]
-        |       |               |   |   `--IDENT -> Integer [89:53]
-        |       |               |   `--GENERIC_END -> > [89:60]
-        |       |               |--LPAREN -> ( [89:61]
-        |       |               |--ELIST -> ELIST [89:62]
-        |       |               `--RPAREN -> ) [89:62]
-        |       |--SEMI -> ; [89:63]
+        |       |   |   |--IDENT -> List [89:8]
+        |       |   |   `--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [89:12]
+        |       |   |       |--GENERIC_START -> < [89:12]
+        |       |   |       |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:13]
+        |       |   |       |   `--IDENT -> Integer [89:13]
+        |       |   |       `--GENERIC_END -> > [89:20]
+        |       |   |--IDENT -> arrayList [89:22]
+        |       |   `--ASSIGN -> = [89:32]
+        |       |       `--EXPR -> EXPR [89:34]
+        |       |           `--LITERAL_NEW -> new [89:34]
+        |       |               |--IDENT -> ArrayList [89:38]
+        |       |               |--TYPE_ARGUMENTS -> TYPE_ARGUMENTS [89:47]
+        |       |               |   |--GENERIC_START -> < [89:47]
+        |       |               |   |--TYPE_ARGUMENT -> TYPE_ARGUMENT [89:48]
+        |       |               |   |   `--IDENT -> Integer [89:48]
+        |       |               |   `--GENERIC_END -> > [89:55]
+        |       |               |--LPAREN -> ( [89:56]
+        |       |               |--ELIST -> ELIST [89:57]
+        |       |               `--RPAREN -> ) [89:57]
+        |       |--SEMI -> ; [89:58]
         |       |--LITERAL_IF -> if [90:8]
         |       |   |--LPAREN -> ( [90:11]
         |       |   |--EXPR -> EXPR [90:22]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadocpropertiesgenerator/InputJavadocPropertiesGeneratorGetFirstJavadocSentence.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadocpropertiesgenerator/InputJavadocPropertiesGeneratorGetFirstJavadocSentence.java
new file mode 100644
index 00000000000..81117eeaef2
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadocpropertiesgenerator/InputJavadocPropertiesGeneratorGetFirstJavadocSentence.java
@@ -0,0 +1,13 @@
+package com.puppycrawl.tools.checkstyle.javadocpropertiesgenerator;
+
+public class InputJavadocPropertiesGeneratorGetFirstJavadocSentence {
+
+    // Test getFirstJavadocSentence with SingleLineComment above javadoc.
+    // This test case will be helpful to test the loop.
+    // We can ensure that we print the correct javadoc no matter how many
+    // tokens are as a first child of MODIFIERS.
+    /**
+     * First Javadoc Sentence.
+     */
+    public static final int EOF1 = 1;
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserHiddenComments4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserHiddenComments4.java
new file mode 100644
index 00000000000..32eec94cd76
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserHiddenComments4.java
@@ -0,0 +1,14 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.javaparser;
+// violation below 'Javadoc content should start from the next line after /*'
+/**Summary.
+ *
+ *
+ */
+public interface InputJavaParserHiddenComments4 {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/ExpectedJavadocMetadataScraperNoCodeInFileCheck.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/ExpectedJavadocMetadataScraperNoCodeInFileCheck.txt
index ea5bdc1410d..09d05f950cf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/ExpectedJavadocMetadataScraperNoCodeInFileCheck.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/ExpectedJavadocMetadataScraperNoCodeInFileCheck.txt
@@ -5,7 +5,9 @@ FullQualifiedName: com.puppycrawl.tools.checkstyle.meta.javadocmetadatascraper.I
 ocMetadataScraperNoCodeInFileCheck
 Parent: com.puppycrawl.tools.checkstyle.TreeWalker
 Description: <p>
- Checks whether file contains code. Files which are considered to have no code:
+ Checks whether file contains code.
+ Java compiler is not raising errors on files with no code or all commented out.
+ Files which are considered to have no code:
  </p>
  <ul>
  <li>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperNoCodeInFileCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperNoCodeInFileCheck.java
index 97459828935..7e1cd354dde 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperNoCodeInFileCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/meta/javadocmetadatascraper/InputJavadocMetadataScraperNoCodeInFileCheck.java
@@ -14,7 +14,9 @@
 
 /**
  * <p>
- * Checks whether file contains code. Files which are considered to have no code:
+ * Checks whether file contains code.
+ * Java compiler is not raising errors on files with no code or all commented out.
+ * Files which are considered to have no code:
  * </p>
  * <ul>
  * <li>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/packageobjectfactory/abc/FooCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/packageobjectfactory/abc/FooCheck.java
new file mode 100644
index 00000000000..4ac6420c8ec
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/packageobjectfactory/abc/FooCheck.java
@@ -0,0 +1,20 @@
+package com.puppycrawl.tools.checkstyle.packageobjectfactory.abc;
+
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
+
+public class FooCheck extends AbstractCheck {
+    @Override
+    public int[] getDefaultTokens() {
+        return new int[] {0};
+    }
+
+    @Override
+    public int[] getAcceptableTokens() {
+        return getDefaultTokens();
+    }
+
+    @Override
+    public int[] getRequiredTokens() {
+        return getDefaultTokens();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/packageobjectfactory/zoo/FooCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/packageobjectfactory/zoo/FooCheck.java
new file mode 100644
index 00000000000..0cd7fe3e8bc
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/packageobjectfactory/zoo/FooCheck.java
@@ -0,0 +1,20 @@
+package com.puppycrawl.tools.checkstyle.packageobjectfactory.zoo;
+
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
+
+public class FooCheck extends AbstractCheck {
+    @Override
+    public int[] getDefaultTokens() {
+        return new int[] {0};
+    }
+
+    @Override
+    public int[] getAcceptableTokens() {
+        return getDefaultTokens();
+    }
+
+    @Override
+    public int[] getRequiredTokens() {
+        return getDefaultTokens();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalker.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalker.java
index 1309fde90cb..07cf0b64c2a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalker.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalker.java
@@ -1,6 +1,11 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck
+
+*/
 package com.puppycrawl.tools.checkstyle.treewalker;
 /*comment*/
 public class InputTreeWalker {
 }
+//violation below,'Top-level class InputTreeWalkerInner has to reside in its own source file'
 class InputTreeWalkerInner {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalker2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalker2.java
new file mode 100644
index 00000000000..04ad2d42ee8
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalker2.java
@@ -0,0 +1,4 @@
+package com.puppycrawl.tools.checkstyle.treewalker;
+
+public class InputTreeWalker2 {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerImproperFileExtension.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerImproperFileExtension.java
new file mode 100644
index 00000000000..f44f3fab0ca
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerImproperFileExtension.java
@@ -0,0 +1,12 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.treewalker;
+
+public class InputTreeWalkerImproperFileExtension {
+
+    public static final int k = 5 + 4;
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerJavadoc.java
index b04ad091866..e1251082ca8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerJavadoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerJavadoc.java
@@ -1,5 +1,9 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck
+
+*/
 package com.puppycrawl.tools.checkstyle.treewalker;
 
-/** <p>Javadoc comment. */ // violation
+/** <p>Javadoc comment. */ // violation, 'Redundant <p> tag'
 public class InputTreeWalkerJavadoc {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerMultiCheckOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerMultiCheckOrder.java
index 1f8ab2bc504..0960c13d4ff 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerMultiCheckOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerMultiCheckOrder.java
@@ -1,9 +1,17 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck
+
+
+com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck
+
+*/
 package com.puppycrawl.tools.checkstyle.treewalker;
 
 public class InputTreeWalkerMultiCheckOrder {
     public void method() {
         boolean test = true;
-        if(test) {
+        if(test) {  // 2 violations
+
         }
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerMultiCheckOrder2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerMultiCheckOrder2.java
new file mode 100644
index 00000000000..84649964994
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerMultiCheckOrder2.java
@@ -0,0 +1,18 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck
+format = ^[a-z]([a-z0-9][a-zA-Z0-9]*)?$
+accessModifiers =  protected, package, private
+
+com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck
+format = ^[a-z][a-z0-9][a-zA-Z0-9]*$
+accessModifiers = public
+
+*/
+package com.puppycrawl.tools.checkstyle.treewalker;
+
+public class InputTreeWalkerMultiCheckOrder2 {
+    void fn1(int v1) {}
+    protected void fn2(int V2) {} // violation  "Name 'V2' must match pattern"
+    private void fn3(int a) {}
+    public void fn4(int b) {} // violation  "Name 'b' must match pattern"
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerProperFileExtension.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerProperFileExtension.java
new file mode 100644
index 00000000000..851e1fda448
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerProperFileExtension.java
@@ -0,0 +1,12 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.treewalker;
+
+public class InputTreeWalkerProperFileExtension {
+
+  public static final int k = 5 + 4;
+  // violation above, "Name 'k' must match pattern"
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionCommentFilter.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionCommentFilter.java
index 69dd15ac809..8b75cf8a403 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionCommentFilter.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionCommentFilter.java
@@ -1,11 +1,19 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck
+
+
+com.puppycrawl.tools.checkstyle.filters.SuppressionCommentFilter
+checkCPP = false
+
+*/
 package com.puppycrawl.tools.checkstyle.treewalker;
 
 public class InputTreeWalkerSuppressionCommentFilter {
-    private int I;
+    private int I;    //violation, "Name 'I' must match pattern"
     /* CHECKSTYLE:OFF */
     private int J;
     /* CHECKSTYLE:ON */
     //CHECKSTYLE:OFF
-    private int P;
+    private int P;  //violation, "Name 'P' must match pattern"
     //CHECKSTYLE:ON
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionXpathFilterAbsolute.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionXpathFilterAbsolute.java
index 1e551f2d1da..1ba54be5617 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionXpathFilterAbsolute.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerSuppressionXpathFilterAbsolute.java
@@ -1,3 +1,12 @@
+/*
+com.puppycrawl.tools.checkstyle.filters.SuppressionXpathFilter
+file = (file)InputTreeWalkerSuppressionXpathFilterAbsolute.xml
+
+com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.treewalker;
 
 public class InputTreeWalkerSuppressionXpathFilterAbsolute {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerWithCacheWithNoViolation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerWithCacheWithNoViolation.java
new file mode 100644
index 00000000000..385d2ec27e6
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/treewalker/InputTreeWalkerWithCacheWithNoViolation.java
@@ -0,0 +1,9 @@
+/*
+com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck
+
+*/
+
+package com.puppycrawl.tools.checkstyle.treewalker;
+
+public class InputTreeWalkerWithCacheWithNoViolation {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnClass.java
index 69f4877aa9b..545b707ff52 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/utils/blockcommentposition/InputBlockCommentPositionOnClass.java
@@ -5,6 +5,13 @@
  */
 public class InputBlockCommentPositionOnClass {
 
+    /**
+     * I'm a javadoc
+     */
+    public class InputBlockCommentPositionOnInnerClass {
+
+    }
+
 }
 
 /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/utils/checkutil/InputCheckUtil9.java b/src/test/resources/com/puppycrawl/tools/checkstyle/utils/checkutil/InputCheckUtil9.java
deleted file mode 100644
index 95999633645..00000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/utils/checkutil/InputCheckUtil9.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck
-minLineCount = (default)-1
-allowedAnnotations = (default)Override
-scope = private
-excludeScope = (default)null
-allowMissingPropertyJavadoc = true
-ignoreMethodNamesRegex = (default)null
-tokens = (default)METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.utils.checkutil;
-
-public class InputCheckUtil9 {
-
-    private int mNumber;
-
-    public void setNumber(final int number) throws Exception {
-        mNumber = number; // violation above 'Missing a Javadoc comment'
-    }
-
-    public int Cost1() // violation 'Missing a Javadoc comment'
-    {
-        return 666;
-    }
-
-    public int getCost1(int forMe) // violation 'Missing a Javadoc comment'
-    {
-        return 666;
-    }
-}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/AbstractExamplesModuleTestSupport.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/AbstractExamplesModuleTestSupport.java
index 5aab7c5abe8..7f6eba6e1eb 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/AbstractExamplesModuleTestSupport.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/AbstractExamplesModuleTestSupport.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckExamplesTest.java
index be3f5a2eced..3ad8c87e922 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class ArrayTypeStyleCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,20 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:17: " + getCheckMessage(MSG_KEY),
+            "20:17: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "15:6: " + getCheckMessage(MSG_KEY),
+            "22:17: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckExamplesTest.java
index 98cc3e25d5f..4c295fab54a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.AvoidEscapedUnicodeCharactersCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AvoidEscapedUnicodeCharactersCheckExamplesTest
         extends AbstractExamplesModuleTestSupport {
     @Override
@@ -35,45 +35,60 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "16:24: " + getCheckMessage(MSG_KEY),
+            "18:24: " + getCheckMessage(MSG_KEY),
+            "20:24: " + getCheckMessage(MSG_KEY),
+            "22:24: " + getCheckMessage(MSG_KEY),
+            "26:12: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "18:24: " + getCheckMessage(MSG_KEY),
+            "20:24: " + getCheckMessage(MSG_KEY),
+            "22:24: " + getCheckMessage(MSG_KEY),
+            "24:24: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "18:24: " + getCheckMessage(MSG_KEY),
+            "20:24: " + getCheckMessage(MSG_KEY),
+            "22:24: " + getCheckMessage(MSG_KEY),
+            "28:12: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "18:24: " + getCheckMessage(MSG_KEY),
+            "22:24: " + getCheckMessage(MSG_KEY),
+            "24:24: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
         final String[] expected = {
-
+            "18:24: " + getCheckMessage(MSG_KEY, "unitAbbrev1"),
+            "20:24: " + getCheckMessage(MSG_KEY),
+            "22:24: " + getCheckMessage(MSG_KEY),
+            "24:24: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckExamplesTest.java
index 4cd435b5c7b..c3328659fdc 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckExamplesTest.java
index a9cf0e609d5..51afed9838a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class FinalParametersCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,27 +34,26 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:32: " + getCheckMessage(MSG_KEY, "n"),
+            "16:25: " + getCheckMessage(MSG_KEY, "x"),
+            "17:27: " + getCheckMessage(MSG_KEY, "args"),
         };
-
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "16:32: " + getCheckMessage(MSG_KEY, "n"),
         };
-
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "19:27: " + getCheckMessage(MSG_KEY, "args"),
         };
-
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckExamplesTest.java
index 7c154cbb781..dcefb67345d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck.MSG_KEY_NO_NEWLINE_EOF;
+import static com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck.MSG_KEY_WRONG_ENDING;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class NewlineAtEndOfFileCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,28 +35,51 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
-        final String[] expected = {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        };
-
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "1: " + getCheckMessage(MSG_KEY_NO_NEWLINE_EOF),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
+            "1: " + getCheckMessage(MSG_KEY_WRONG_ENDING),
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+            "1: " + getCheckMessage(MSG_KEY_NO_NEWLINE_EOF),
+        };
 
+        verifyWithInlineConfigParser(getPath("Example4.py"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+            "1: " + getCheckMessage(MSG_KEY_NO_NEWLINE_EOF),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
+    }
+
+    @Test
+    public void testExample6() throws Exception {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+
+        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckExamplesTest.java
index 5aa348e0b8a..05180508fbd 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/NoCodeInFileCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.NoCodeInFileCheck.MSG_KEY_NO_CODE;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class NoCodeInFileCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,18 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "1: " + getCheckMessage(MSG_KEY_NO_CODE),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "1: " + getCheckMessage(MSG_KEY_NO_CODE),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckExamplesTest.java
index ff81691c12a..8c62a03f638 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckExamplesTest.java
index 92a012f24d2..de6527c4b39 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class OuterTypeFilenameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -37,42 +37,42 @@ public void testExample1() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "11:1: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "11:1: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "11:1: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
         final String[] expected = {
-
+            "11:1: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckExamplesTest.java
index 1f506b79546..6ee0a93064a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class TodoCommentCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,20 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "15:14: " + getCheckMessage(MSG_KEY, "TODO:"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "1:3: " + getCheckMessage(MSG_KEY, "(TODO)|(FIXME)"),
+            "18:14: " + getCheckMessage(MSG_KEY, "(TODO)|(FIXME)"),
+            "20:14: " + getCheckMessage(MSG_KEY, "(TODO)|(FIXME)"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckExamplesTest.java
index 8fce3fba446..1bfcc5617a5 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckExamplesTest.java
index 423e0cf056a..1c97989373d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckExamplesTest.java
index 883186a181a..577d44f568d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckExamplesTest.java
index f79a960a59d..380368c39b9 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckExamplesTest.java
index 24db802826f..220db160376 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.UpperEllCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class UpperEllCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +34,9 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "13:15: " + getCheckMessage(MSG_KEY, "L"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationExamplesTest.java
index 042b2923c02..0d00ed38fb7 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck.MSG_KEY_ANNOTATION_LOCATION_ALONE;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AnnotationLocationExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,10 +34,13 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
+            "31:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "SuppressWarnings"),
+            "33:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "SuppressWarnings"),
+            "35:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Mock"),
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
@@ -46,24 +49,27 @@ public void testExample2() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "24:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Nonnull"),
+            "26:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Override"),
+            "36:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Nonnull"),
+            "36:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "Mock"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "33:3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "SuppressWarnings"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckExamplesTest.java
index 98c97d35d0a..420e4102147 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationOnSameLineCheck.MSG_KEY_ANNOTATION_ON_SAME_LINE;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AnnotationOnSameLineCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,22 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "16:3: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "SuppressWarnings"),
+            "33:3: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Override"),
+            "37:3: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Before"),
+            "41:3: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "SuppressWarnings"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "25:3: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "SuppressWarnings"),
+            "33:3: " + getCheckMessage(MSG_KEY_ANNOTATION_ON_SAME_LINE, "Nullable"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckExamplesTest.java
index 71afcdf30e4..68ddbb5b644 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,16 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.MSG_KEY_ANNOTATION_INCORRECT_STYLE;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.MSG_KEY_ANNOTATION_PARENS_MISSING;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.MSG_KEY_ANNOTATION_PARENS_PRESENT;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.MSG_KEY_ANNOTATION_TRAILING_COMMA_MISSING;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.MSG_KEY_ANNOTATION_TRAILING_COMMA_PRESENT;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AnnotationUseStyleCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,36 +38,47 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "25:1: " + getCheckMessage(MSG_KEY_ANNOTATION_INCORRECT_STYLE, "COMPACT_NO_ARRAY"),
+            "26:1: " + getCheckMessage(MSG_KEY_ANNOTATION_PARENS_PRESENT),
+            "28:40: " + getCheckMessage(MSG_KEY_ANNOTATION_TRAILING_COMMA_PRESENT),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
+            "16:1: " + getCheckMessage(MSG_KEY_ANNOTATION_INCORRECT_STYLE, "EXPANDED"),
+            "19:1: " + getCheckMessage(MSG_KEY_ANNOTATION_INCORRECT_STYLE, "EXPANDED"),
+            "26:1: " + getCheckMessage(MSG_KEY_ANNOTATION_PARENS_PRESENT),
+            "28:40: " + getCheckMessage(MSG_KEY_ANNOTATION_TRAILING_COMMA_PRESENT),
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
+            "17:1: " + getCheckMessage(MSG_KEY_ANNOTATION_PARENS_MISSING),
+            "25:1: " + getCheckMessage(MSG_KEY_ANNOTATION_INCORRECT_STYLE, "COMPACT"),
+            "28:1: " + getCheckMessage(MSG_KEY_ANNOTATION_INCORRECT_STYLE, "COMPACT"),
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
+            "19:34: " + getCheckMessage(MSG_KEY_ANNOTATION_TRAILING_COMMA_MISSING),
+            "26:37: " + getCheckMessage(MSG_KEY_ANNOTATION_TRAILING_COMMA_MISSING),
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckExamplesTest.java
index db469e459ff..0238ba8292b 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck.MSG_KEY_ANNOTATION_MISSING_DEPRECATED;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck.MSG_KEY_UNCLOSED_HTML_TAG;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class MissingDeprecatedCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +35,19 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "18: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "20: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
+            "32: " + getCheckMessage(MSG_KEY_UNCLOSED_HTML_TAG, "p"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckExamplesTest.java
index ab57ca61220..55affe5476a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,13 +19,15 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck.MSG_KEY_ANNOTATION_MISSING_OVERRIDE;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck.MSG_KEY_TAG_NOT_VALID_ON;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class MissingOverrideCheckExamplesTest extends AbstractExamplesModuleTestSupport {
+
     @Override
     protected String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride";
@@ -34,18 +36,20 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "27:3: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_OVERRIDE, "test2"),
+            "33:3: " + getCheckMessage(MSG_KEY_TAG_NOT_VALID_ON, "{@inheritDoc}"),
+            "39:3: " + getCheckMessage(MSG_KEY_TAG_NOT_VALID_ON, "{@inheritDoc}"),
         };
-
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "22:3: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_OVERRIDE, "equals"),
+            "30:3: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_OVERRIDE, "test"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckExamplesTest.java
index 717c9894bb8..ce4d527d12e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class PackageAnnotationCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,10 +34,10 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "13:1: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example1.java"), expected);
     }
 
     @Test
@@ -46,7 +46,7 @@ public void testExample2() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
@@ -55,6 +55,6 @@ public void testExample3() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("example3/package-info.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckExamplesTest.java
index 8cebd767b8b..3a433b31519 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck.MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class SuppressWarningsCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -35,17 +35,21 @@ protected String getPackageLocation() {
     public void testExample1() throws Exception {
         final String[] expected = {
 
+            "13:19: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, ""),
+            "16:21: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, ""),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "40:21: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"),
+            "44:32: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"),
+            "49:19: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unchecked"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsHolderExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsHolderExamplesTest.java
index c857333dcdd..763474e8373 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsHolderExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsHolderExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,15 @@
 
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck;
+import com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck;
+import com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck;
+import com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck;
+import com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class SuppressWarningsHolderExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,19 +36,31 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
+        final String pattern1 = "^[a-z][a-zA-Z0-9]*$";
+        final String pattern2 = "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$";
         final String[] expected = {
+            "21:15: " + getCheckMessage(MemberNameCheck.class,
+                        AbstractNameCheck.MSG_INVALID_PATTERN, "K", pattern1),
+            "25:28: " + getCheckMessage(ConstantNameCheck.class,
+                        AbstractNameCheck.MSG_INVALID_PATTERN, "i", pattern2),
+            "35:15: " + getCheckMessage(NoWhitespaceAfterCheck.class,
+                        NoWhitespaceAfterCheck.MSG_KEY, "int"),
+            "35:18: " + getCheckMessage(MemberNameCheck.class,
+                        AbstractNameCheck.MSG_INVALID_PATTERN, "ARR", pattern1),
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
+            "19:15: " + getCheckMessage(ParameterNumberCheck.class,
+                        ParameterNumberCheck.MSG_KEY, 7, 8),
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckExamplesTest.java
index 7f3abf491cf..cdf4485dcfc 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck.MSG_KEY_BLOCK_NESTED;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AvoidNestedBlocksCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,19 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:5: " + getCheckMessage(MSG_KEY_BLOCK_NESTED),
+            "23:15: " + getCheckMessage(MSG_KEY_BLOCK_NESTED),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "19:5: " + getCheckMessage(MSG_KEY_BLOCK_NESTED),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckExamplesTest.java
index 725e872fca4..7bcfb354803 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck.MSG_KEY_BLOCK_EMPTY;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck.MSG_KEY_BLOCK_NO_STATEMENT;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class EmptyBlockCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,27 +35,28 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:34: " + getCheckMessage(MSG_KEY_BLOCK_NO_STATEMENT, "for"),
+            "17:9: " + getCheckMessage(MSG_KEY_BLOCK_NO_STATEMENT, "try"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "21:9: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "try"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "24:16: " + getCheckMessage(MSG_KEY_BLOCK_NO_STATEMENT, "default"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckExamplesTest.java
index 3de56afdb7a..2c5115a36e1 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck.MSG_KEY_CATCH_BLOCK_EMPTY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class EmptyCatchBlockCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,36 +34,48 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "16:41: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
+            "31:34: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "33:34: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "18:41: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
+            "25:39: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
+            "33:34: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
+            "51:34: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
+        };
 
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+            "18:34: " + getCheckMessage(MSG_KEY_CATCH_BLOCK_EMPTY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckExamplesTest.java
index f139a8ca3a5..9726fb5aeba 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck.MSG_KEY_LINE_BREAK_AFTER;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck.MSG_KEY_LINE_NEW;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck.MSG_KEY_LINE_PREVIOUS;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class LeftCurlyCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,36 +36,40 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "13:1: " + getCheckMessage(MSG_KEY_LINE_PREVIOUS, "{", "1"),
+            "15:3: " + getCheckMessage(MSG_KEY_LINE_PREVIOUS, "{", "3"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "23:13: " + getCheckMessage(MSG_KEY_LINE_NEW, "{", "13"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "16:1: " + getCheckMessage(MSG_KEY_LINE_PREVIOUS, "{", "1"),
+            "22:13: " + getCheckMessage(MSG_KEY_LINE_NEW, "{", "13"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "15:1: " + getCheckMessage(MSG_KEY_LINE_PREVIOUS, "{", "1"),
+            "17:3: " + getCheckMessage(MSG_KEY_LINE_PREVIOUS, "{", "3"),
+            "25:15: " + getCheckMessage(MSG_KEY_LINE_BREAK_AFTER, "{", "15"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckExamplesTest.java
index 98ab0c91d50..594b809467b 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck.MSG_KEY_NEED_BRACES;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class NeedBracesCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,54 +35,61 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "20:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "if"),
+            "24:7: " + getCheckMessage(MSG_KEY_NEED_BRACES, "else"),
+            "29:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "do"),
+            "32:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "for"),
+            "34:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "for"),
+            "36:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "while"),
+            "39:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "while"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "22:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "if"),
+            "26:7: " + getCheckMessage(MSG_KEY_NEED_BRACES, "else"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
+            "33:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "do"),
+            "40:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "while"),
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
-        final String[] expected = {
+        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        };
-
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
         final String[] expected = {
-
+            "39:5: " + getCheckMessage(MSG_KEY_NEED_BRACES, "while"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 
     @Test
     public void testExample6() throws Exception {
         final String[] expected = {
-
+            "24:38: " + getCheckMessage(MSG_KEY_NEED_BRACES, "->"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example6.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckExamplesTest.java
index babb3b4fda4..8499aba95a3 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck.MSG_KEY_LINE_ALONE;
+import static com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck.MSG_KEY_LINE_SAME;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class RightCurlyCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,45 +35,49 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "19:5: " + getCheckMessage(MSG_KEY_LINE_SAME, "}", "5"),
+            "32:23: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", "23"),
+            "40:5: " + getCheckMessage(MSG_KEY_LINE_SAME, "}", "5"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "22:21: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", "21"),
+            "43:47: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", "47"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "24:22: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", "22"),
+            "38:16: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", "16"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "22:5: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", "5"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
         final String[] expected = {
-
+            "44:16: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", "16"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckExamplesTest.java
index 7e96d91ef76..c02918b13aa 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.ArrayTrailingCommaCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class ArrayTrailingCommaCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,24 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:5: " + getCheckMessage(MSG_KEY),
+            "25:5: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "15:26: " + getCheckMessage(MSG_KEY),
+            "19:5: " + getCheckMessage(MSG_KEY),
+            "26:16: " + getCheckMessage(MSG_KEY),
+            "27:5: " + getCheckMessage(MSG_KEY),
+            "30:29: " + getCheckMessage(MSG_KEY),
+            "34:15: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckExamplesTest.java
index d7daeb0f639..ef60f10fe6e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidDoubleBraceInitializationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.AvoidDoubleBraceInitializationCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AvoidDoubleBraceInitializationCheckExamplesTest
         extends AbstractExamplesModuleTestSupport {
     @Override
@@ -35,18 +35,11 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "16:43: " + getCheckMessage(MSG_KEY, "list1"),
+            "21:42: " + getCheckMessage(MSG_KEY, "list2"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
-    @Test
-    public void testExample2() throws Exception {
-        final String[] expected = {
-
-        };
-
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
-    }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckExamplesTest.java
index 9419fdec0ed..3882a94013b 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckExamplesTest.java
index d712bef9ace..9be471ba98c 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidNoArgumentSuperConstructorCallCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.AvoidNoArgumentSuperConstructorCallCheck.MSG_CTOR;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AvoidNoArgumentSuperConstructorCallCheckExamplesTest
         extends AbstractExamplesModuleTestSupport {
     @Override
@@ -35,9 +35,9 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:5: " + getCheckMessage(MSG_CTOR),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckExamplesTest.java
index 287c64506fc..ba79981063f 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckExamplesTest.java
index 74061206c50..1a0dabd9685 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckExamplesTest.java
index b91784d49c5..85f18db5731 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckExamplesTest.java
index a1d51f39a1f..e71c3ecc0c2 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class EmptyStatementCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +34,10 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "15:14: " + getCheckMessage(MSG_KEY),
+            "17:28: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckExamplesTest.java
index fbc96f3397d..007e2ed4880 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckExamplesTest.java
index a4be5384942..ec35148704d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck.MSG_KEY_EQUALS;
+import static com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck.MSG_KEY_HASHCODE;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class EqualsHashCodeCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +35,12 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "11:3: " + getCheckMessage(MSG_KEY_EQUALS),
+            "18:3: " + getCheckMessage(MSG_KEY_HASHCODE),
+            "41:3: " + getCheckMessage(MSG_KEY_HASHCODE),
+            "47:3: " + getCheckMessage(MSG_KEY_EQUALS),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckExamplesTest.java
index 69fec60291b..b843e6f7c7d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckExamplesTest.java
index 2d7a8abf587..8bc60f4d59c 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckExamplesTest.java
index eecdc36fd54..fb17461bc93 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckExamplesTest.java
index bbaac3b35ec..c6db034a09a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckExamplesTest.java
index d1b890c00f0..8d5193fd758 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckExamplesTest.java
index 8c76591b4f7..313d46a4b3d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckExamplesTest.java
index 9c371d0c558..e2bd5f0bb4b 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckExamplesTest.java
index 5846dd5820b..ba1dd28738b 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckExamplesTest.java
index 09a81bd1918..5082a5d0d1f 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenTextCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class IllegalTokenTextCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,36 +34,38 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:20: " + getCheckMessage(MSG_KEY, "a href"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "18:20: " + getCheckMessage(MSG_KEY, "a href"),
+            "19:20: " + getCheckMessage(MSG_KEY, "a href"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "17:29: " + getCheckMessage(MSG_KEY, '"'),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "21:17: " + getCheckMessage(MSG_KEY, "^0[^lx]"),
+            "23:18: " + getCheckMessage(MSG_KEY, "^0[^lx]"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckExamplesTest.java
index 7a70f71e18f..f804510b0a7 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckExamplesTest.java
index a10813bc7d5..5067b9ece0a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class InnerAssignmentCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +34,28 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
+            "21:11: " + getCheckMessage(MSG_KEY),
+            "22:11: " + getCheckMessage(MSG_KEY),
+            "29:51: " + getCheckMessage(MSG_KEY),
+            "33:24: " + getCheckMessage(MSG_KEY),
+            "40:17: " + getCheckMessage(MSG_KEY),
+            "44:20: " + getCheckMessage(MSG_KEY),
+            "54:16: " + getCheckMessage(MSG_KEY),
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
+    }
 
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+            "18:19: " + getCheckMessage(MSG_KEY),
+            "20:17: " + getCheckMessage(MSG_KEY),
+            "22:20: " + getCheckMessage(MSG_KEY),
+            "39:15: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(
+                getNonCompilablePath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckExamplesTest.java
index f91ab236883..a7b3ae8123d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckExamplesTest.java
index 3cc46b389a8..61fd26db6cc 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckExamplesTest.java
index e7f26ca6b32..4b16c87b5fb 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckExamplesTest.java
index f1e7a9d9379..b3d13736b49 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckExamplesTest.java
index bb13fcea511..4b27fa294c5 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckExamplesTest.java
index e9d1cd27839..a98c382054d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckExamplesTest.java
index 9e4d169eca4..bf0e2ee1327 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckExamplesTest.java
index c669c6fd9a3..aaca6e11845 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckExamplesTest.java
index ea4826ccebc..6a285caccee 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckExamplesTest.java
index 2f332094f82..aa6734b6cc8 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java
index 9e7f7b41f73..bbc76741883 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoArrayTrailingCommaCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckExamplesTest.java
index bf1a1603c35..04473dcceb1 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoCloneCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckExamplesTest.java
index 6868d15b2dd..f5f288cae68 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoEnumTrailingCommaCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckExamplesTest.java
index d9b5c019af1..166620d2a75 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/NoFinalizerCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckExamplesTest.java
index 16126a60ea8..6def334d69d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckExamplesTest.java
index e67530f7ae6..8015bb68cbc 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckExamplesTest.java
index 49067d5df91..dcb841d335d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckExamplesTest.java
index f719647b5f5..80e01194bee 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.ParameterAssignmentCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class ParameterAssignmentCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +34,12 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "21:15: " + getCheckMessage(MSG_KEY, "parameter"),
+            "34:27: " + getCheckMessage(MSG_KEY, "a"),
+            "36:6: " + getCheckMessage(MSG_KEY, "a"),
+            "37:7: " + getCheckMessage(MSG_KEY, "b"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckExamplesTest.java
index 1c9494e3f3b..9f473b626b6 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckExamplesTest.java
index 03171299a44..e4f62e52dc8 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckExamplesTest.java
index ae60b43fa53..36707268b31 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanExpressionCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckExamplesTest.java
index 566b82de137..0c3e483f61a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckExamplesTest.java
index 2da75b9e4d6..cdf845c27ad 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckExamplesTest.java
index e1c3282db68..ca513f2a6e1 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,13 +19,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.AbstractSuperCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class SuperCloneCheckExamplesTest extends AbstractExamplesModuleTestSupport {
+
     @Override
     protected String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/checks/coding/superclone";
@@ -34,9 +35,9 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "22:22: " + getCheckMessage(MSG_KEY, "clone"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckExamplesTest.java
index f9afc4ba740..95cb7782faa 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperFinalizeCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckExamplesTest.java
index 4ecca302dcd..8373fce0078 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,16 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_ASSIGN;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_EXPR;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_IDENT;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_LAMBDA;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_LITERAL;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class UnnecessaryParenthesesCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +38,27 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:18: " + getCheckMessage(MSG_ASSIGN),
+            "19:13: " + getCheckMessage(MSG_IDENT, "square"),
+            "25:19: " + getCheckMessage(MSG_LITERAL, "0"),
+            "27:15: " + getCheckMessage(MSG_ASSIGN),
+            "28:20: " + getCheckMessage(MSG_ASSIGN),
+            "28:24: " + getCheckMessage(MSG_IDENT, "square"),
+            "36:21: " + getCheckMessage(MSG_LAMBDA),
+            "44:9: " + getCheckMessage(MSG_EXPR),
+            "44:31: " + getCheckMessage(MSG_EXPR),
+            "44:53: " + getCheckMessage(MSG_EXPR),
+            "48:9: " + getCheckMessage(MSG_EXPR),
         };
-
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "18:18: " + getCheckMessage(MSG_EXPR),
+            "26:19: " + getCheckMessage(MSG_EXPR),
         };
-
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckExamplesTest.java
index 02d0ab93d72..41212897fd2 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessarySemicolonAfterOuterTypeDeclarationCheck.MSG_SEMI;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class UnnecessarySemicolonAfterOuterTypeDeclarationCheckExamplesTest
         extends AbstractExamplesModuleTestSupport {
     @Override
@@ -36,18 +36,20 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:2: " + getCheckMessage(MSG_SEMI),
+            "21:2: " + getCheckMessage(MSG_SEMI),
+            "25:2: " + getCheckMessage(MSG_SEMI),
+            "29:2: " + getCheckMessage(MSG_SEMI),
         };
-
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "19:2: " + getCheckMessage(MSG_SEMI),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckExamplesTest.java
index 87baa6955de..f56e6af06b5 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckExamplesTest.java
index 7de3e68618c..75c48119490 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInEnumerationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckExamplesTest.java
index ef80c3b0e4f..ac7e18b28b8 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckExamplesTest.java
index 80f29d5aac7..856612d31e3 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLocalVariableCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnusedLocalVariableCheck.MSG_UNUSED_LOCAL_VARIABLE;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class UnusedLocalVariableCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +34,13 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "15:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "k"),
+            "25:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "arr"),
+            "31:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "s"),
+            "37:5: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "s"),
+            "48:10: " + getCheckMessage(MSG_UNUSED_LOCAL_VARIABLE, "i"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckExamplesTest.java
index 1f0cc6323f2..98e2d142b9a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckExamplesTest.java
index c143632e666..1139a85d313 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class DesignForExtensionCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,36 +34,46 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:3: " + getCheckMessage(MSG_KEY, "Example1", "m1"),
+            "16:3: " + getCheckMessage(MSG_KEY, "Example1", "m2"),
+            "41:3: " + getCheckMessage(MSG_KEY, "Example1", "toString"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "16:3: " + getCheckMessage(MSG_KEY, "Example2", "m1"),
+            "18:3: " + getCheckMessage(MSG_KEY, "Example2", "m2"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "16:3: " + getCheckMessage(MSG_KEY, "Example3", "m1"),
+            "18:3: " + getCheckMessage(MSG_KEY, "Example3", "m2"),
+            "35:3: " + getCheckMessage(MSG_KEY, "Example3", "m7"),
+            "41:3: " + getCheckMessage(MSG_KEY, "Example3", "m8"),
+            "43:3: " + getCheckMessage(MSG_KEY, "Example3", "toString"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "17:3: " + getCheckMessage(MSG_KEY, "Example4", "m1"),
+            "19:3: " + getCheckMessage(MSG_KEY, "Example4", "m2"),
+            "36:3: " + getCheckMessage(MSG_KEY, "Example4", "m7"),
+            "44:3: " + getCheckMessage(MSG_KEY, "Example4", "toString"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckExamplesTest.java
index 652a92325ec..6b992ac833e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,8 +34,8 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-            "14:1: " + getCheckMessage(MSG_KEY, "A"),
-            "41:3: " + getCheckMessage(MSG_KEY, "Class2"),
+            "19:3: " + getCheckMessage(MSG_KEY, "B"),
+            "50:5: " + getCheckMessage(MSG_KEY, "Class2"),
         };
 
         verifyWithInlineConfigParser(getPath("Example1.java"), expected);
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckExamplesTest.java
index 87e044b73e9..2537e6182b6 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class HideUtilityClassConstructorCheckExamplesTest
         extends AbstractExamplesModuleTestSupport {
     @Override
@@ -35,9 +35,10 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "12:1: " + getCheckMessage(MSG_KEY),
+            "37:1: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckExamplesTest.java
index 880b59ff189..b9a9dbdbd8f 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class InnerTypeLastCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +34,10 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:3: " + getCheckMessage(MSG_KEY),
+            "20:3: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckExamplesTest.java
index c8904ef40f0..eebb696bb34 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class InterfaceIsTypeCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,19 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:3: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "16:3: " + getCheckMessage(MSG_KEY),
+            "21:3: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckExamplesTest.java
index 30843d72dc0..df584000941 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.design;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class MutableExceptionCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,27 +34,30 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "23:3: " + getCheckMessage(MSG_KEY, "code"),
+            "32:3: " + getCheckMessage(MSG_KEY, "message"),
+            "41:3: " + getCheckMessage(MSG_KEY, "code"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "23:3: " + getCheckMessage(MSG_KEY, "code"),
+            "41:3: " + getCheckMessage(MSG_KEY, "code"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "32:3: " + getCheckMessage(MSG_KEY, "message"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckExamplesTest.java
index 4a0ef56ff3d..59e4a1458af 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckExamplesTest.java
index 632580fedd5..27bfb72bfea 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckExamplesTest.java
index 4c6fc54379c..26b80701064 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckExamplesTest.java
index 83c5d4867f7..77a4ee3503c 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckExamplesTest.java
index fae8a56f303..24c728ab479 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckExamplesTest.java
index f78aeaa2460..07f71b5c11a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AvoidStarImportCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,54 +34,59 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "13:15: " + getCheckMessage(MSG_KEY, "java.io.*"),
+            "14:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.*"),
+            "15:17: " + getCheckMessage(MSG_KEY, "java.util.*"),
+            "16:16: " + getCheckMessage(MSG_KEY, "java.net.*"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "17:17: " + getCheckMessage(MSG_KEY, "java.util.*"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "16:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.*"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "15:15: " + getCheckMessage(MSG_KEY, "java.io.*"),
+            "17:17: " + getCheckMessage(MSG_KEY, "java.util.*"),
+            "18:16: " + getCheckMessage(MSG_KEY, "java.net.*"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
         final String[] expected = {
-
+            "17:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.*"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 
     @Test
     public void testExample6() throws Exception {
         final String[] expected = {
-
+            "18:17: " + getCheckMessage(MSG_KEY, "java.util.*"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example6.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckExamplesTest.java
index e1ab4aea5d9..8a73a9bcf19 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AvoidStaticImportCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,19 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "12:29: " + getCheckMessage(MSG_KEY, "java.lang.Math.pow"),
+            "13:31: " + getCheckMessage(MSG_KEY, "java.lang.System.*"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "16:32: " + getCheckMessage(MSG_KEY, "java.lang.Integer.parseInt"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckExamplesTest.java
index 776caa8afa6..3ca95c43d6d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckExamplesTest.java
index 5cc8e3b0644..0b9ef1dc162 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckExamplesTest.java
index 908d42ee707..b80315bc3ad 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckExamplesTest.java
index 134f8496961..b6bdbb033f1 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,14 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck.MSG_DUPLICATE;
+import static com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck.MSG_LANG;
+import static com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck.MSG_SAME;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class RedundantImportCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +36,12 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "16:1: " + getCheckMessage(MSG_SAME,
+                    "com.puppycrawl.tools.checkstyle.checks.imports.redundantimport.Example1"),
+            "17:1: " + getCheckMessage(MSG_LANG, "java.lang.String"),
+            "19:1: " + getCheckMessage(MSG_DUPLICATE, 18, "java.util.Scanner"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java
index 94d914f5811..60026442835 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class UnusedImportsCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,23 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "19:8: " + getCheckMessage(MSG_KEY, "java.lang.String"),
+            "22:8: " + getCheckMessage(MSG_KEY, "java.util.Map"),
+            "27:15: " + getCheckMessage(MSG_KEY, "java.lang.Integer.parseInt"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "21:8: " + getCheckMessage(MSG_KEY, "java.lang.String"),
+            "24:8: " + getCheckMessage(MSG_KEY, "java.util.Map"),
+            "26:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
+            "29:15: " + getCheckMessage(MSG_KEY, "java.lang.Integer.parseInt"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckExamplesTest.java
index d43f7931bf2..67c0eb98508 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckExamplesTest.java
index e69d8804d50..2bbb540c66f 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckExamplesTest.java
index 346f6b7ec64..da7eee0de15 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class AtclauseOrderCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,10 +33,45 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
+        final String tagOrder = "[@author, @version, @param, @return, @throws"
+            + ", @exception, @see,"
+            + " @since, @serial, @serialField, @serialData, @deprecated]";
+
         final String[] expected = {
+            "42: " + getCheckMessage(MSG_KEY, tagOrder),
+            "44: " + getCheckMessage(MSG_KEY, tagOrder),
+            "52: " + getCheckMessage(MSG_KEY, tagOrder),
+            "54: " + getCheckMessage(MSG_KEY, tagOrder),
+            "55: " + getCheckMessage(MSG_KEY, tagOrder),
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String tagOrder = "[@author, @since, @version, @param, @return"
+            + ", @throws, @exception,"
+            + " @deprecated, @see, @serial, @serialField, @serialData]";
 
+        final String[] expected = {
+            "29: " + getCheckMessage(MSG_KEY, tagOrder),
+            "55: " + getCheckMessage(MSG_KEY, tagOrder),
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String tagOrder = "[@author, @since, @version, @param, @return"
+            + ", @throws, @exception,"
+            + " @deprecated, @see, @serial, @serialField, @serialData]";
+
+        final String[] expected = {
+            "55: " + getCheckMessage(MSG_KEY, tagOrder),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckExamplesTest.java
index 065885fd586..0b1749b7e1d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/InvalidJavadocPositionCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.InvalidJavadocPositionCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class InvalidJavadocPositionCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,9 +34,9 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:1: " + getCheckMessage(MSG_KEY),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckExamplesTest.java
index dd95ec37ef3..a6bb75270c7 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,10 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class JavadocBlockTagLocationCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -37,7 +35,7 @@ public void testExample1() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
@@ -46,6 +44,15 @@ public void testExample2() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckExamplesTest.java
index f4d90d93f14..2c2d04ef6eb 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.MSG_JAVADOC_CONTENT_FIRST_LINE;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocContentLocationCheck.MSG_JAVADOC_CONTENT_SECOND_LINE;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class JavadocContentLocationCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +35,18 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "15:3: " + getCheckMessage(MSG_JAVADOC_CONTENT_SECOND_LINE),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "22:3: " + getCheckMessage(MSG_JAVADOC_CONTENT_FIRST_LINE),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckExamplesTest.java
index 6ec8ad35df7..485716ad7b2 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckExamplesTest.java
index 672d4e0b712..45b2baeaeb7 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMissingLeadingAsteriskCheck.MSG_MISSING_ASTERISK;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class JavadocMissingLeadingAsteriskCheckExamplesTest
         extends AbstractExamplesModuleTestSupport {
     @Override
@@ -35,9 +35,11 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "34: " + getCheckMessage(MSG_MISSING_ASTERISK),
+            "39: " + getCheckMessage(MSG_MISSING_ASTERISK),
+            "45: " + getCheckMessage(MSG_MISSING_ASTERISK),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckExamplesTest.java
index 20ff20deca7..2f0180f57e9 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckExamplesTest.java
index 37e88f6872a..8d818e2726d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckExamplesTest.java
index 28e82d7f5a1..2fd08fb4e2f 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckExamplesTest.java
index af608d66f61..c7acce5221b 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckExamplesTest.java
index 3557931a6e2..c937afbee0e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckExamplesTest.java
index 8d10b91a50a..a2d73686d9e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java
index 0c4f401348b..e4e6e9f7415 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck.MSG_JAVADOC_MISSING;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class JavadocVariableCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,36 +34,42 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "12:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "18:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "19:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "20:15: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
-
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "21:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "15:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "23:15: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "14:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "20:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "21:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "22:15: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckExamplesTest.java
index a584bf70b37..124359012f3 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckExamplesTest.java
index 4c8b5bc8791..4880b11cc8d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocPackageCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckExamplesTest.java
index 3de3570ecdc..bbd3585329a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckExamplesTest.java
index deca1f7c51d..a6fb8394efe 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckExamplesTest.java
index b59216844db..d73ea13860e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckExamplesTest.java
index 8d6d9562a06..3d0238d49c9 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckExamplesTest.java
index 1605d48b268..bfa90e845f8 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckExamplesTest.java
index 315ece80a01..794f3c54909 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckExamplesTest.java
index 025f1c59d47..fc48cbbd96d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.metrics;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.metrics.BooleanExpressionComplexityCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class BooleanExpressionComplexityCheckExamplesTest
         extends AbstractExamplesModuleTestSupport {
     @Override
@@ -35,27 +35,28 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "20:15: " + getCheckMessage(MSG_KEY, 5, 3),
+            "24:15: " + getCheckMessage(MSG_KEY, 6, 3),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "25:15: " + getCheckMessage(MSG_KEY, 6, 5),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "25:15: " + getCheckMessage(MSG_KEY, 4, 3),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckExamplesTest.java
index 650ed58474e..1aeb44ab6b1 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckExamplesTest.java
index e7c1e754653..b6d3eeddb26 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckExamplesTest.java
index bd60a657b9a..af9b4508c12 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckExamplesTest.java
index 7bebfe8a73e..9320d47ebf4 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckExamplesTest.java
index 50e905c7818..6dd0dfa2a16 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java
index 7214aff7914..2df2afcbb4d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckExamplesTest.java
index 1ede2abe6a1..bc2cda0dcf9 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckExamplesTest.java
index da92014a615..8b5f218241c 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckExamplesTest.java
index a345a6064b7..33080735194 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java
index 34635d61e3e..3c7ab60154a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ public void testExample1() throws Exception {
             "31:15: " + getCheckMessage(MSG_KEY, "incrementGLOBAL", DEFAULT_EXPECTED_CAPITAL_COUNT),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
+        verifyWithInlineXmlConfig(getPath("Example1.java"), expected);
     }
 
     @Test
@@ -55,7 +55,7 @@ public void testExample2() throws Exception {
             "35:15: " + getCheckMessage(MSG_KEY, "incrementGLOBAL", DEFAULT_EXPECTED_CAPITAL_COUNT),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
+        verifyWithInlineXmlConfig(getPath("Example2.java"), expected);
     }
 
     @Test
@@ -67,7 +67,7 @@ public void testExample3() throws Exception {
             "23:14: " + getCheckMessage(MSG_KEY, "fourthNUm", expectedCapitalCount),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
+        verifyWithInlineXmlConfig(getPath("Example3.java"), expected);
     }
 
     @Test
@@ -80,7 +80,7 @@ public void testExample4() throws Exception {
             "26:10: " + getCheckMessage(MSG_KEY, "firstXML", expectedCapitalCount),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
+        verifyWithInlineXmlConfig(getPath("Example4.java"), expected);
     }
 
     @Test
@@ -93,7 +93,7 @@ public void testExample5() throws Exception {
             "24:14: " + getCheckMessage(MSG_KEY, "nextID", expectedCapitalCount),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
+        verifyWithInlineXmlConfig(getPath("Example5.java"), expected);
     }
 
     @Test
@@ -106,13 +106,13 @@ public void testExample6() throws Exception {
             "26:20: " + getCheckMessage(MSG_KEY, "MAX_ALLOWED", expectedCapitalCount),
         };
 
-        verifyWithInlineConfigParser(getPath("Example6.java"), expected);
+        verifyWithInlineXmlConfig(getPath("Example6.java"), expected);
     }
 
     @Test
     public void testExample7() throws Exception {
         final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
 
-        verifyWithInlineConfigParser(getPath("Example7.java"), expected);
+        verifyWithInlineXmlConfig(getPath("Example7.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java
index 384d951a98c..41101d08c41 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckExamplesTest.java
index 72a631e1bf3..66e431f3c64 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,13 +19,17 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class CatchParameterNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
+
+    private static final String CATCH_PARAM_NAME_PATTERN_1 = "^(e|t|ex|[a-z][a-z][a-zA-Z]+)$";
+    private static final String CATCH_PARAM_NAME_PATTERN_2 = "^[a-z][a-zA-Z0-9]+$";
+
     @Override
     protected String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/checks/naming/catchparametername";
@@ -34,18 +38,30 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "18:40: " + getCheckMessage(MSG_INVALID_PATTERN, "e123",
+                    CATCH_PARAM_NAME_PATTERN_1),
+            "20:35: " + getCheckMessage(MSG_INVALID_PATTERN, "ab",
+                    CATCH_PARAM_NAME_PATTERN_1),
+            "23:35: " + getCheckMessage(MSG_INVALID_PATTERN, "aBC",
+                    CATCH_PARAM_NAME_PATTERN_1),
+            "26:24: " + getCheckMessage(MSG_INVALID_PATTERN, "EighthException",
+                    CATCH_PARAM_NAME_PATTERN_1),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "18:34: " + getCheckMessage(MSG_INVALID_PATTERN, "e",
+                    CATCH_PARAM_NAME_PATTERN_2),
+            "26:24: " + getCheckMessage(MSG_INVALID_PATTERN, "EighthException",
+                    CATCH_PARAM_NAME_PATTERN_2),
+            "28:24: " + getCheckMessage(MSG_INVALID_PATTERN, "t",
+                    CATCH_PARAM_NAME_PATTERN_2),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckExamplesTest.java
index 105801566f6..202a15519b7 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.MSG_ILLEGAL_ABSTRACT_CLASS_NAME;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class ClassTypeParameterNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,28 +33,39 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
+        final String pattern = "^[A-Z]$";
         final String[] expected = {
-
+            "14:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "t", pattern),
+            "15:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "abc", pattern),
+            "16:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "LISTENER", pattern),
+            "17:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "RequestT", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
+        final String pattern = "^[A-Z]{2,}$";
         final String[] expected = {
-
+            "15:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "T", pattern),
+            "16:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "t", pattern),
+            "17:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "abc", pattern),
+            "19:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "RequestT", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
+        final String pattern = "(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)";
         final String[] expected = {
-
+            "16:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "t", pattern),
+            "17:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "abc", pattern),
+            "18:18: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "LISTENER", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java
index 63113b48394..5ec3dd19cd6 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckExamplesTest.java
index b4d4a34867d..49bbb557a0b 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class IllegalIdentifierNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,19 +33,33 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
-        final String[] expected = {
+        final String format = "(?i)^(?!(record|yield|var|permits|sealed|_)$).+$";
 
+        final String[] expected = {
+            "17:11: " + getCheckMessage(MSG_INVALID_PATTERN, "var", format),
+            "18:7: " + getCheckMessage(MSG_INVALID_PATTERN, "record", format),
+            "19:10: " + getCheckMessage(MSG_INVALID_PATTERN, "yield", format),
+            "22:10: " + getCheckMessage(MSG_INVALID_PATTERN, "Record", format),
+            "24:19: " + getCheckMessage(MSG_INVALID_PATTERN, "record", format),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
-        final String[] expected = {
+        final String format = "(?i)^(?!(record|yield|var|permits|sealed|open|transitive|_)$).+$";
 
+        final String[] expected = {
+            "17:11: " + getCheckMessage(MSG_INVALID_PATTERN, "var", format),
+            "18:7: " + getCheckMessage(MSG_INVALID_PATTERN, "record", format),
+            "19:10: " + getCheckMessage(MSG_INVALID_PATTERN, "yield", format),
+            "22:10: " + getCheckMessage(MSG_INVALID_PATTERN, "Record", format),
+            "24:19: " + getCheckMessage(MSG_INVALID_PATTERN, "record", format),
+            "33:7: " + getCheckMessage(MSG_INVALID_PATTERN, "open", format),
+            "34:10: " + getCheckMessage(MSG_INVALID_PATTERN, "transitive", format),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckExamplesTest.java
index a923f21efb6..856a20abfbd 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class InterfaceTypeParameterNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,19 +33,20 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
-        final String[] expected = {
 
+        final String[] expected = {
+            "14:29: " + getCheckMessage(MSG_INVALID_PATTERN, "t", "^[A-Z]$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "17:28: " + getCheckMessage(MSG_INVALID_PATTERN, "type", "^[a-zA-Z]$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckExamplesTest.java
index 39c3550679e..3854023f261 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class LambdaParameterNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,18 +34,19 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:11: " + getCheckMessage(MSG_INVALID_PATTERN, "S", "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "20:40: " + getCheckMessage(MSG_INVALID_PATTERN, "_s", "^[a-z]([a-zA-Z]+)*$"),
+            "25:23: " + getCheckMessage(MSG_INVALID_PATTERN, "Word", "^[a-z]([a-zA-Z]+)*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckExamplesTest.java
index fa48d2d8883..edf57f51c3d 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class LocalFinalVariableNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,27 +34,30 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "17:17: " + getCheckMessage(MSG_INVALID_PATTERN, "VAR1", "^[a-z][a-zA-Z0-9]*$"),
+            "20:17: " + getCheckMessage(MSG_INVALID_PATTERN, "VAR2", "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "18:17: " + getCheckMessage(MSG_INVALID_PATTERN, "var1", "^[A-Z][A-Z0-9]*$"),
+            "21:17: " + getCheckMessage(MSG_INVALID_PATTERN, "var2", "^[A-Z][A-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "19:17: " + getCheckMessage(MSG_INVALID_PATTERN, "scanner", "^[A-Z][A-Z0-9]*$"),
+            "23:30: " + getCheckMessage(MSG_INVALID_PATTERN, "ex", "^[A-Z][A-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckExamplesTest.java
index e76663b3d00..d9d40d921cd 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class LocalVariableNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,46 +33,59 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
+        final String pattern = "^[a-z][a-zA-Z0-9]*$";
         final String[] expected = {
-
+            "15:14: " + getCheckMessage(MSG_INVALID_PATTERN, "VAR", pattern),
+            "17:14: " + getCheckMessage(MSG_INVALID_PATTERN, "var_1", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
+        final String pattern = "^[a-z](_?[a-zA-Z0-9]+)*$";
         final String[] expected = {
-
+            "17:14: " + getCheckMessage(MSG_INVALID_PATTERN, "VAR", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
+        final String pattern = "^[a-z](_?[a-zA-Z0-9]+)*$";
         final String[] expected = {
-
+            "20:13: " + getCheckMessage(MSG_INVALID_PATTERN, "K", pattern),
+            "23:17: " + getCheckMessage(MSG_INVALID_PATTERN, "O", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
+        final String pattern = "^[a-z][_a-zA-Z0-9]+$";
         final String[] expected = {
-
+            "21:9: " + getCheckMessage(MSG_INVALID_PATTERN, "g", pattern),
+            "23:11: " + getCheckMessage(MSG_INVALID_PATTERN, "a", pattern),
+            "26:11: " + getCheckMessage(MSG_INVALID_PATTERN, "I", pattern),
+            "30:14: " + getCheckMessage(MSG_INVALID_PATTERN, "a", pattern),
+            "33:14: " + getCheckMessage(MSG_INVALID_PATTERN, "A", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
+        final String pattern = "^[a-z][_a-zA-Z0-9]{2,}$";
         final String[] expected = {
-
+            "17:9: " + getCheckMessage(MSG_INVALID_PATTERN, "i", pattern),
+            "19:11: " + getCheckMessage(MSG_INVALID_PATTERN, "j", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 }
+
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckExamplesTest.java
index 843aadc4a37..b283fe22185 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class MemberNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,27 +34,32 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "21:14: " + getCheckMessage(MSG_INVALID_PATTERN, "NUM1", "^[a-z][a-zA-Z0-9]*$"),
+            "23:17: " + getCheckMessage(MSG_INVALID_PATTERN, "NUM2", "^[a-z][a-zA-Z0-9]*$"),
+            "25:7: " + getCheckMessage(MSG_INVALID_PATTERN, "NUM3", "^[a-z][a-zA-Z0-9]*$"),
+            "27:15: " + getCheckMessage(MSG_INVALID_PATTERN, "NUM4", "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "16:14: " + getCheckMessage(MSG_INVALID_PATTERN, "num1", "^m[A-Z][a-zA-Z0-9]*$"),
+            "20:15: " + getCheckMessage(MSG_INVALID_PATTERN, "num4", "^m[A-Z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "16:17: " + getCheckMessage(MSG_INVALID_PATTERN, "NUM2", "^[a-z][a-zA-Z0-9]*$"),
+            "18:7: " + getCheckMessage(MSG_INVALID_PATTERN, "NUM3", "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckExamplesTest.java
index 60843bce447..7f0d8f4d8e8 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,13 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.MSG_INVALID_PATTERN;
+import static com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class MethodNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,19 +35,20 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "15:16: " + getCheckMessage(MSG_INVALID_PATTERN, "Method3", "^[a-z][a-zA-Z0-9]*$"),
+            "16:15: " + getCheckMessage(MSG_INVALID_PATTERN, "Method4", "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "16:15: " + getCheckMessage(MSG_INVALID_PATTERN, "Method2", "^[a-z](_?[a-zA-Z0-9]+)*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
@@ -55,24 +57,25 @@ public void testExample3() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "17:15: " + getCheckMessage(MSG_KEY, "Example4"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
         final String[] expected = {
-
+            "19:16: " + getCheckMessage(MSG_INVALID_PATTERN, "Method3", "^[a-z](_?[a-zA-Z0-9]+)*$"),
+            "20:8: " + getCheckMessage(MSG_INVALID_PATTERN, "Method4", "^[a-z](_?[a-zA-Z0-9]+)*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckExamplesTest.java
index bd28db8ae24..1f7ebb34703 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class MethodTypeParameterNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,10 +34,11 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:11: " + getCheckMessage(MSG_INVALID_PATTERN, "a", "^[A-Z]$"),
+            "16:11: " + getCheckMessage(MSG_INVALID_PATTERN, "k", "^[A-Z]$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
@@ -46,6 +47,6 @@ public void testExample2() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckExamplesTest.java
index 0f1bfbc5167..036fc9e122c 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckExamplesTest.java
index 03f32a0df04..2f463abee8a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class ParameterNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,45 +34,47 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "14:20: " + getCheckMessage(MSG_INVALID_PATTERN, "V2", "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "17:20: " + getCheckMessage(MSG_INVALID_PATTERN, "V3", "^[a-z][_a-zA-Z0-9]+$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "16:20: " + getCheckMessage(MSG_INVALID_PATTERN, "V2", "^[a-z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 
     @Test
     public void testExample4() throws Exception {
         final String[] expected = {
-
+            "16:20: " + getCheckMessage(MSG_INVALID_PATTERN, "v_2", "^[a-z][a-zA-Z0-9]+$"),
+            "17:20: " + getCheckMessage(MSG_INVALID_PATTERN, "V3", "^[a-z][a-zA-Z0-9]+$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 
     @Test
     public void testExample5() throws Exception {
         final String[] expected = {
-
+            "25:26: " + "Parameter name 'V2' must match pattern '^[a-z]([a-z0-9][a-zA-Z0-9]*)?$'",
+            "27:23: " + "Parameter name 'b' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9]*$'",
         };
 
-        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example5.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckExamplesTest.java
index c585c1225c3..18db1abd001 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class PatternVariableNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,28 +33,39 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
-        final String[] expected = {
 
+        final String pattern = "^[a-z][a-zA-Z0-9]*$";
+
+        final String[] expected = {
+            "15:30: " + getCheckMessage(MSG_INVALID_PATTERN, "STRING", pattern),
+            "17:31: " + getCheckMessage(MSG_INVALID_PATTERN, "num_1", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
-        final String[] expected = {
 
+        final String pattern = "^[a-z](_?[a-zA-Z0-9]+)*$";
+
+        final String[] expected = {
+            "17:30: " + getCheckMessage(MSG_INVALID_PATTERN, "STRING", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
-        final String[] expected = {
 
+        final String pattern = "^[a-z][_a-zA-Z0-9]{2,}$";
+
+        final String[] expected = {
+            "17:30: " + getCheckMessage(MSG_INVALID_PATTERN, "STRING", pattern),
+            "20:31: " + getCheckMessage(MSG_INVALID_PATTERN, "n", pattern),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckExamplesTest.java
index 91f8bd076e7..08d070c84d8 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckExamplesTest.java
index 6394853681d..93d41b37734 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckExamplesTest.java
index e8677522b98..4674e311142 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,13 +19,17 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class StaticVariableNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
+
+    public static final String STATIC_VAR_NAME_PATTERN_1 = "^[a-z][a-zA-Z0-9]*$";
+    public static final String STATIC_VAR_NAME_PATTERN_2 = "^[a-z](_?[a-zA-Z0-9]+)*$";
+
     @Override
     protected String getPackageLocation() {
         return "com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename";
@@ -34,27 +38,50 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "19:21: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "ItStatic1", STATIC_VAR_NAME_PATTERN_1),
+            "20:24: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "ItStatic2", STATIC_VAR_NAME_PATTERN_1),
+            "21:22: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "ItStatic", STATIC_VAR_NAME_PATTERN_1),
+            "22:21: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "it_static", STATIC_VAR_NAME_PATTERN_1),
+            "23:21: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "It_Static", STATIC_VAR_NAME_PATTERN_1),
+            "24:22: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "It_Static1", STATIC_VAR_NAME_PATTERN_1),
+            "25:14: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "It_Static2", STATIC_VAR_NAME_PATTERN_1),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "21:22: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "ItStatic", STATIC_VAR_NAME_PATTERN_1),
+            "24:22: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "It_Static1", STATIC_VAR_NAME_PATTERN_1),
+            "25:14: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "It_Static2", STATIC_VAR_NAME_PATTERN_1),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "19:21: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "ItStatic1", STATIC_VAR_NAME_PATTERN_2),
+            "20:24: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "ItStatic2", STATIC_VAR_NAME_PATTERN_2),
+            "23:21: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "It_Static", STATIC_VAR_NAME_PATTERN_2),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckExamplesTest.java
index 34d583983fe..1bcf28f6626 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class TypeNameCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,27 +34,30 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "15:8: " + getCheckMessage(MSG_INVALID_PATTERN, "Third_Name", "^[A-Z][a-zA-Z0-9]*$"),
+            "16:17: " + getCheckMessage(MSG_INVALID_PATTERN, "FourthName_", "^[A-Z][a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
         final String[] expected = {
-
+            "16:7: " + getCheckMessage(MSG_INVALID_PATTERN, "Example2", "^[a-z](_?[a-zA-Z0-9]+)*$"),
+            "18:16: " + getCheckMessage(MSG_INVALID_PATTERN,
+                    "SecondName", "^[a-z](_?[a-zA-Z0-9]+)*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "19:13: " + getCheckMessage(MSG_INVALID_PATTERN, "SecondName", "^I_[a-zA-Z0-9]*$"),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckExamplesTest.java
index 52a564340e5..b1b34e85af6 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckExamplesTest.java
index afe83c65fb2..e4effb3864e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckExamplesTest.java
index 880742c9894..612dec0b1e5 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckExamplesTest.java
index 8d6cfebd180..4502db52a45 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckExamplesTest.java
index bcb36d59c20..007df7d74a4 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckExamplesTest.java
index 22375704326..dc925811a41 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckExamplesTest.java
index e865a8f430a..1c876d8333a 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckExamplesTest.java
index 1502e45ccb3..88f41b34450 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class FileLengthCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -37,15 +37,24 @@ public void testExample1() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
+        final String[] expected = {
+            "1: " + getCheckMessage(MSG_KEY, 18, 5),
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
         final String[] expected = {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java
index 8a7d37e624b..b3bf92a9da7 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckExamplesTest.java
index a56c19d1dc2..78056422229 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckExamplesTest.java
index f20e3c8c97c..21b2da3d6d3 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckExamplesTest.java
index d5691e55457..14a2f6f0ed0 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.sizes.MethodLengthCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class MethodLengthCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -33,28 +33,35 @@ protected String getPackageLocation() {
 
     @Test
     public void testExample1() throws Exception {
-        final String[] expected = {
 
-        };
+        final int max = 4;
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        final String[] expected = {
+            "18:3: " + getCheckMessage(MSG_KEY, 5, max, "Example1"),
+            "31:3: " + getCheckMessage(MSG_KEY, 6, max, "firstMethod"),
+            "44:3: " + getCheckMessage(MSG_KEY, 5, max, "thirdMethod"),
+            "52:5: " + getCheckMessage(MSG_KEY, 5, max, "MyBadRecord"),
+        };
+        verifyWithInlineConfigParser(getNonCompilablePath("Example1.java"), expected);
     }
 
     @Test
     public void testExample2() throws Exception {
-        final String[] expected = {
 
-        };
+        final int max = 4;
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        final String[] expected = {
+            "32:3: " + getCheckMessage(MSG_KEY, 6, max, "firstMethod"),
+            "45:3: " + getCheckMessage(MSG_KEY, 5, max, "thirdMethod"),
+        };
+        verifyWithInlineConfigParser(getNonCompilablePath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-
+            "33:3: " + getCheckMessage(MSG_KEY, 6, 4, "firstMethod"),
         };
-
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getNonCompilablePath("Example3.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckExamplesTest.java
index ba47c38234b..a2c021ec53e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckExamplesTest.java
index f5d0f7f724c..6db90c4606f 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.checks.sizes;
 
-import org.junit.jupiter.api.Disabled;
+import static com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck.MSG_KEY;
+
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
 
-@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
 public class ParameterNumberCheckExamplesTest extends AbstractExamplesModuleTestSupport {
     @Override
     protected String getPackageLocation() {
@@ -34,10 +34,13 @@ protected String getPackageLocation() {
     @Test
     public void testExample1() throws Exception {
         final String[] expected = {
-
+            "16:3: " + getCheckMessage(MSG_KEY, 7, 8),
+            "20:3: " + getCheckMessage(MSG_KEY, 7, 8),
+            "25:15: " + getCheckMessage(MSG_KEY, 7, 8),
+            "33:15: " + getCheckMessage(MSG_KEY, 7, 8),
         };
 
-        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example1.java"), expected);
     }
 
     @Test
@@ -46,15 +49,28 @@ public void testExample2() throws Exception {
 
         };
 
-        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example2.java"), expected);
     }
 
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
+            "18:3: " + getCheckMessage(MSG_KEY, 7, 8),
+            "22:3: " + getCheckMessage(MSG_KEY, 7, 8),
+            "35:15: " + getCheckMessage(MSG_KEY, 7, 8),
+        };
 
+        verifyWithInlineConfigParser(getPath("Example3.java"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+            "22:3: " + getCheckMessage(MSG_KEY, 7, 8),
+            "27:15: " + getCheckMessage(MSG_KEY, 7, 8),
+            "35:15: " + getCheckMessage(MSG_KEY, 7, 8),
         };
 
-        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+        verifyWithInlineConfigParser(getPath("Example4.java"), expected);
     }
 }
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckExamplesTest.java
index 966c8c0b2c1..fe20d825371 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java
index effb56b1c84..3ce3b552d17 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java
index f42123b5a30..463de7f1690 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java
index ed7aeaf6b61..e0da46b1528 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java
index c608e2d4785..38356ee6113 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckExamplesTest.java
index 7e64cd73fd0..600a112be36 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java
index 1372ec4d71c..2b0d917c24e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java
index 94c97113e9f..84d8b8d0c31 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java
index 8ce2e664efc..0c936646591 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java
index 918a95ee4dc..bb59e8ae7bd 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCaseDefaultColonExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java
index fb2733e46eb..7aa0ab9291e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java
index dcb58298f53..71d26990d3f 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java
index 937d52c148e..819152b8317 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java
index 8c8d24dad20..e592f155fc0 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java
index 17369218f09..a35fc50255e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java
index f56b5649dce..51eb65cb217 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java
index b4173bb2af1..1d926884390 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java
index fb978647014..3ca09520237 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterExamplesTest.java
index 8b5cd191812..fa3f020815e 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilterExamplesTest.java
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // checkstyle: Checks Java source code and other text files for adherence to a set of rules.
-// Copyright (C) 2001-2023 the original author or authors.
+// Copyright (C) 2001-2024 the original author or authors.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterExamplesTest.java
new file mode 100644
index 00000000000..7cdd2fec9ac
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilterExamplesTest.java
@@ -0,0 +1,42 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SeverityMatchFilterExamplesTest extends AbstractExamplesModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/severitymatchfilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterExamplesTest.java
new file mode 100644
index 00000000000..24ef50de3f1
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterExamplesTest.java
@@ -0,0 +1,51 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SuppressWarningsFilterExamplesTest extends AbstractExamplesModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+    }
+}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterExamplesTest.java
new file mode 100644
index 00000000000..b583e611c22
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterExamplesTest.java
@@ -0,0 +1,105 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SuppressWithNearbyCommentFilterExamplesTest extends AbstractExamplesModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+    }
+
+    @Test
+    public void testExample6() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+    }
+
+    @Test
+    public void testExample7() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example7.txt"), expected);
+    }
+
+    @Test
+    public void testExample8() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example8.txt"), expected);
+    }
+}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterExamplesTest.java
new file mode 100644
index 00000000000..6d91e256d02
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterExamplesTest.java
@@ -0,0 +1,114 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SuppressWithNearbyTextFilterExamplesTest extends AbstractExamplesModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+    }
+
+    @Test
+    public void testExample6() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+    }
+
+    @Test
+    public void testExample7() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example7.txt"), expected);
+    }
+
+    @Test
+    public void testExample8() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example8.txt"), expected);
+    }
+
+    @Test
+    public void testExample9() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example9.txt"), expected);
+    }
+}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterExamplesTest.java
new file mode 100644
index 00000000000..ff9d3feb6f1
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterExamplesTest.java
@@ -0,0 +1,116 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SuppressWithPlainTextCommentFilterExamplesTest
+        extends AbstractExamplesModuleTestSupport {
+
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+    }
+
+    @Test
+    public void testExample6() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+    }
+
+    @Test
+    public void testExample7() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example7.txt"), expected);
+    }
+
+    @Test
+    public void testExample8() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example8.txt"), expected);
+    }
+
+    @Test
+    public void testExample9() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getNonCompilablePath("Example9.java"), expected);
+    }
+}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterExamplesTest.java
new file mode 100644
index 00000000000..ba7d315447d
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterExamplesTest.java
@@ -0,0 +1,105 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SuppressionCommentFilterExamplesTest extends AbstractExamplesModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+    }
+
+    @Test
+    public void testExample6() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+    }
+
+    @Test
+    public void testExample7() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example7.txt"), expected);
+    }
+
+    @Test
+    public void testExample8() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example8.txt"), expected);
+    }
+}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilterExamplesTest.java
new file mode 100644
index 00000000000..342d9bf5779
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilterExamplesTest.java
@@ -0,0 +1,123 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SuppressionSingleFilterExamplesTest extends AbstractExamplesModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+    }
+
+    @Test
+    public void testExample6() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+    }
+
+    @Test
+    public void testExample7() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example7.txt"), expected);
+    }
+
+    @Test
+    public void testExample8() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example8.txt"), expected);
+    }
+
+    @Test
+    public void testExample9() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example9.txt"), expected);
+    }
+
+    @Test
+    public void testExample10() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example10.txt"), expected);
+    }
+}
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilterExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilterExamplesTest.java
new file mode 100644
index 00000000000..6a06fc0b26c
--- /dev/null
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilterExamplesTest.java
@@ -0,0 +1,159 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-2024 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.filters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.AbstractExamplesModuleTestSupport;
+
+@Disabled("until https://github.com/checkstyle/checkstyle/issues/13345")
+public class SuppressionXpathSingleFilterExamplesTest extends AbstractExamplesModuleTestSupport {
+    @Override
+    protected String getPackageLocation() {
+        return "com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter";
+    }
+
+    @Test
+    public void testExample1() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example1.txt"), expected);
+    }
+
+    @Test
+    public void testExample2() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example2.txt"), expected);
+    }
+
+    @Test
+    public void testExample3() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example3.txt"), expected);
+    }
+
+    @Test
+    public void testExample4() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example4.txt"), expected);
+    }
+
+    @Test
+    public void testExample5() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example5.txt"), expected);
+    }
+
+    @Test
+    public void testExample6() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example6.txt"), expected);
+    }
+
+    @Test
+    public void testExample7() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example7.txt"), expected);
+    }
+
+    @Test
+    public void testExample8() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example8.txt"), expected);
+    }
+
+    @Test
+    public void testExample9() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example9.txt"), expected);
+    }
+
+    @Test
+    public void testExample10() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example10.txt"), expected);
+    }
+
+    @Test
+    public void testExample11() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example11.txt"), expected);
+    }
+
+    @Test
+    public void testExample12() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example12.txt"), expected);
+    }
+
+    @Test
+    public void testExample13() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example13.txt"), expected);
+    }
+
+    @Test
+    public void testExample14() throws Exception {
+        final String[] expected = {
+
+        };
+
+        verifyWithInlineConfigParser(getPath("Example14.txt"), expected);
+    }
+}
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.java
new file mode 100644
index 00000000000..966935ca69b
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.java
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="PackageAnnotation"/>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java7
+
+// xdoc section -- start
+@Deprecated // violation below
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation;
+
+class Example1 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.java
new file mode 100644
index 00000000000..3f0243e2415
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="IllegalTokenText">
+        <property name="tokens" value="TEXT_BLOCK_CONTENT"/>
+        <property name="format" value='"'/>
+    </module>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+// xdoc section -- start
+public class Example3 {
+  public void myTest() {
+    final String quote = """
+            \""""; // violation above
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example2.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example2.java
new file mode 100644
index 00000000000..b8a998a660b
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example2.java
@@ -0,0 +1,47 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InnerAssignment"/>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.coding.innerassignment;
+
+
+// xdoc section -- start
+public class Example2 {
+  public void test1(int mode) {
+    int x = 0;
+    x = switch (mode) {
+      case 1 -> x = 1;  // violation
+      case 2 -> {
+        yield x = 2; // violation
+      }
+      default -> x = 0; // violation
+    };
+  }
+  public void test2(int mode) {
+    int x = 0;
+    switch(mode) {
+      case 2 -> {
+        x = 2;
+      }
+      case 1 -> x = 1;
+    }
+  }
+  public void test3(int mode) {
+    int x = 0, y = 0;
+    switch(mode) {
+      case 1:
+      case 2: {
+        x = y = 2; // violation
+      }
+      case 4:
+      case 5:
+        x = 1;
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.java
new file mode 100644
index 00000000000..06ce4f52c76
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.java
@@ -0,0 +1,42 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="IllegalIdentifierName"/>
+  </module>
+</module>
+*/
+
+
+
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming.illegalidentifiername;
+
+// xdoc section -- start
+public class Example1 {
+  Integer var = 4; // violation, 'Name 'var' must match pattern'
+  int record = 15; // violation, 'Name 'record' must match pattern'
+  String yield = "yield";
+  // violation above, 'Name 'yield' must match pattern'
+
+  record Record(Record r){} // violation, 'Name 'Record' must match pattern'
+
+  record R(Record record){} // violation, 'Name 'record' must match pattern'
+
+  String yieldString = "yieldString";
+  // ok above, word 'yield' is not used as an identifier by itself
+  record MyRecord(){}
+  // ok above, word 'Record' is not used as an identifier by itself
+  Integer variable = 2;
+  // ok above, word 'var' is not used as an identifier by itself
+
+  int open = 4; // ok, word 'open' can be used as an identifier
+  Object transitive = "transitive";
+  // ok above, word 'transitive' can be used as an identifier
+
+  int openInt = 4;
+  // ok above, word 'openInt' can be used as an identifier
+  Object transitiveObject = "transitiveObject";
+  // ok above, word 'transitiveObject' can be used as an identifier
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.java
new file mode 100644
index 00000000000..80b52c08543
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.java
@@ -0,0 +1,42 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="IllegalIdentifierName">
+      <property name="format"
+        value="(?i)^(?!(record|yield|var|permits|sealed|open|transitive|_)$).+$"/>
+    </module>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming.illegalidentifiername;
+
+// xdoc section -- start
+public class Example2 {
+  Integer var = 4; // violation, 'Name 'var' must match pattern'
+  int record = 15; // violation, 'Name 'record' must match pattern'
+  String yield = "yield";
+  // violation above, 'Name 'yield' must match pattern'
+
+  record Record(Record r){} // violation, 'Name 'Record' must match pattern'
+
+  record R(Record record){} // violation, 'Name 'record' must match pattern'
+
+  String yieldString = "yieldString";
+  // ok above, word 'yield' is not used as an identifier by itself
+  record MyRecord(){}
+  // ok above, word 'Record' is not used as an identifier by itself
+  Integer variable = 2;
+  // ok above, word 'var' is not used as an identifier by itself
+
+  int open = 4; // violation, 'Name 'open' must match pattern'
+  Object transitive = "transitive";
+  // violation above, 'Name 'transitive' must match pattern'
+
+  int openInt = 4;
+  // ok above, word 'open' is not used as an identifier by itself
+  Object transitiveObject = "transitiveObject";
+  // ok above, word 'transitive' is not used as an identifier by itself
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.java
new file mode 100644
index 00000000000..3c9a02dfb38
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="PatternVariableName"/>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming.patternvariablename;
+
+// xdoc section -- start
+class Example1 {
+  void foo(Object o1){
+    if (o1 instanceof String STRING) {} // violation
+    if (o1 instanceof Integer num) {}
+    if (o1 instanceof Integer num_1) {} // violation
+    if (o1 instanceof Integer n) {}
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.java
new file mode 100644
index 00000000000..9c3054fa4d9
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.java
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="PatternVariableName">
+        <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+    </module>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming.patternvariablename;
+
+// xdoc section -- start
+class Example2 {
+  void foo(Object o1){
+    if (o1 instanceof String STRING) {} // violation
+    if (o1 instanceof Integer num) {}
+    if (o1 instanceof Integer num_1) {}
+    if (o1 instanceof Integer n) {}
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.java
new file mode 100644
index 00000000000..09a802d2f63
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.java
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="PatternVariableName">
+        <property name="format" value="^[a-z][_a-zA-Z0-9]{2,}$"/>
+    </module>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.naming.patternvariablename;
+
+// xdoc section -- start
+class Example3 {
+  void foo(Object o1){
+    if (o1 instanceof String STRING) {} // violation
+    if (o1 instanceof Integer num) {}
+    if (o1 instanceof Integer num_1) {}
+    if (o1 instanceof Integer n) {} // violation
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.java
new file mode 100644
index 00000000000..456f8eb63a8
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.java
@@ -0,0 +1,59 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodLength">
+      <property name="max" value="4"/>
+    </module>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
+
+// xdoc section -- start
+public class Example1 {
+
+  // violation below, 'Method Example1 length is 5 lines (max allowed is 4)'
+  public Example1() {
+    int var1 = 2;
+    int var2 = 4;
+    int sum = var1 + var2;
+  }
+
+  // ok, as it is less than 4 lines
+  public Example1(int a)  {
+    int var1 = 2;
+    int sum = var1 + a;
+  }
+
+  // violation below, 'Method firstMethod length is 6 lines (max allowed is 4)'
+  public void firstMethod() {
+    int index = 0;
+    if (index < 5) {
+      index++;
+    }
+  }
+
+  public void secondMethod() {
+    // comments are counted by default
+    System.out.println("line 3");
+  }
+
+  // violation below, 'Method thirdMethod length is 5 lines (max allowed is 4)'
+  public void thirdMethod() {
+
+    // empty line above is counted by default,just like this comment
+    System.out.println("line 4");
+  }
+
+  record MyBadRecord() {
+    // violation below, 'Method MyBadRecord length is 5 lines (max allowed is 4)'
+    public MyBadRecord {
+
+      System.out.println("line3");
+      System.out.println("line4");
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.java
new file mode 100644
index 00000000000..fbc796d034e
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.java
@@ -0,0 +1,60 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodLength">
+      <property name="tokens" value="METHOD_DEF"/>
+      <property name="max" value="4"/>
+    </module>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
+
+// xdoc section -- start
+public class Example2 {
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example2()  {
+    int var1 = 2;
+    int var2 = 4;
+    int sum = var1 + var2;
+  }
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example2(int a)  {
+    int var1 = 2;
+    int sum = var1 + a;
+  }
+
+  // violation below, 'Method firstMethod length is 6 lines (max allowed is 4)'
+  public void firstMethod() {
+    int index = 0;
+    if (index < 5) {
+      index++;
+    }
+  }
+
+  public void secondMethod() {
+    // comments are counted by default
+    System.out.println("line 3");
+  }
+
+  // violation below, 'Method thirdMethod length is 5 lines (max allowed is 4)'
+  public void thirdMethod() {
+
+    // empty line above is counted by default,just like this comment
+    System.out.println("line 4");
+  }
+
+  record MyBadRecord() {
+    // ok, COMPACT_CTOR_DEF is not in configured tokens
+    public MyBadRecord {
+
+      System.out.println("line3");
+      System.out.println("line4");
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.java
new file mode 100644
index 00000000000..b2574d21a2a
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.java
@@ -0,0 +1,60 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodLength">
+      <property name="tokens" value="METHOD_DEF"/>
+      <property name="max" value="4"/>
+      <property name="countEmpty" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.checks.sizes.methodlength;
+
+// xdoc section -- start
+public class Example3 {
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example3()  {
+    int var1 = 2;
+    int var2 = 4;
+    int sum = var1 + var2;
+  }
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example3(int a)  {
+    int var1 = 2;
+    int sum = var1 + a;
+  }
+
+  // violation below, 'Method firstMethod length is 6 lines (max allowed is 4)'
+  public void firstMethod() {
+    int index = 0;
+    if (index < 5) {
+      index++;
+    }
+  }
+
+  public void secondMethod() {
+    // countEmpty property is false,so this line doesn't count
+    System.out.println("line 3");
+  }
+
+  public void thirdMethod() {
+
+    // countEmpty property is false,so this line and the line above don't count
+    System.out.println("line 4");
+  }
+
+  record MyBadRecord() {
+    // ok, COMPACT_CTOR_DEF is not in configured tokens
+    public MyBadRecord {
+
+      System.out.println("line3");
+      System.out.println("line4");
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java
index a3141dd7957..58e3b017eea 100644
--- a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespacebeforecasedefaultcolon/Example1.java
@@ -7,7 +7,7 @@
 
 
 */
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespacebeforecasedefaultcolon;
 
 import java.time.DayOfWeek;
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java
index 0134dceb5fb..a0ae6387dba 100644
--- a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/Example1.java
@@ -7,7 +7,7 @@
 
 
 */
-//non-compiled with javac: Compilable with Java14
+//non-compiled with javac: Compilable with Java17
 package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter;
 
 import java.io.InputStream;
diff --git a/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example9.java b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example9.java
new file mode 100644
index 00000000000..08377a658f1
--- /dev/null
+++ b/src/xdocs-examples/resources-noncompilable/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example9.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="LineLength">
+      <property name="max" value="100"/>
+  </module>
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value='=\s+"""'/>
+    <property name="onCommentFormat" value='^\s+""";'/>
+  </module>
+</module>
+
+
+*/
+//non-compiled with javac: Compilable with Java17
+package com.puppycrawl.tools.checkstyle.filters.suppresswithplaintextcommentfilter;
+
+// xdoc section -- start
+public class Example9 {
+
+  // ok, opening and closing triple quotes are 'offCommentFormat' and 'onCommentFormat'
+  static final String LOCATION_CSV_SAMPLE = """
+          locationId,label,regionId,regionLabel,vendorId,vendorLabel,address,address2,city,stateProvinceCode,zipCode,countryCode,latitude,longitude
+          ST001,Station 001,ZONE1,Zone 1,CP1,Competitor 1,123 Street,Unit 2,Houston,TX,77033,US,29.761496813335178,-95.53049214204984
+          ST002,Station 002,ZONE2,,CP2,,668 Street,Unit 23,San Jose,CA,95191,US,37.35102477242508,-121.9209934020318
+          """;
+
+  // violation below, 'Line is longer than 80 characters'
+  static final String SINGLE_LINE_SAMPLE = "locationId,label,regionId,regionLabel,vendorId,vendorLabel,address,address2,city,stateProvinceCode,zipCode,countryCode,latitude,longitude";
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.java
new file mode 100644
index 00000000000..35c50f804b1
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.java
@@ -0,0 +1,38 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationLocation"/>
+  </module>
+</module>
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+import javax.annotation.Nonnull;
+import org.mockito.Mock;
+
+interface DataLoader {
+
+}
+
+
+// xdoc section -- start
+class Example1 {
+  @Nonnull
+  private boolean field1; // ok
+  @Override public int hashCode() { return 1; } // ok
+  @Nonnull // ok
+  private boolean field2;
+  @Override // ok
+  public boolean equals(Object obj) { return true; }
+  @Mock DataLoader loader1; // ok
+  @SuppressWarnings("deprecation") DataLoader loader2;
+  // violation above, 'Annotation 'SuppressWarnings' should be alone on line'
+  @SuppressWarnings("deprecation") public int foo() { return 1; }
+  // violation above, 'Annotation 'SuppressWarnings' should be alone on line'
+  @Nonnull @Mock DataLoader loader3;
+  // violation above, 'Annotation 'Mock' should be alone on line'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.txt
deleted file mode 100644
index c5b6654c860..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationLocation"/>
-  </module>
-</module>
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
-
-// xdoc section -- start
-class Example1 {
-  @NotNull private boolean field1; //ok
-  @Override public int hashCode() { return 1; } //ok
-  @NotNull //ok
-  private boolean field2;
-  @Override //ok
-  public boolean equals(Object obj) { return true; }
-  @Mock
-  DataLoader loader; //ok
-  @SuppressWarnings("deprecation") DataLoader loader; //violation
-  @SuppressWarnings("deprecation") public int foo() { return 1; } //violation
-  @NotNull @Mock DataLoader loader; //violation
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.java
new file mode 100644
index 00000000000..7dd9d894f00
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.java
@@ -0,0 +1,37 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationLocation">
+      <property name="allowSamelineSingleParameterlessAnnotation"
+                value="false"/>
+      <property name="allowSamelineParameterizedAnnotation" value="false"/>
+      <property name="allowSamelineMultipleAnnotations" value="true"/>
+    </module>
+  </module>
+</module>
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+import javax.annotation.Nonnull;
+import org.mockito.Mock;
+
+// xdoc section -- start
+class Example2 {
+  @Nonnull
+  private boolean field1;
+  @Override public int hashCode() { return 1; } // ok
+  @Nonnull
+  private boolean field2;
+  @Override
+  public boolean equals(Object obj) { return true; }
+  @Mock
+  DataLoader loader1;
+  @SuppressWarnings("deprecation") DataLoader loader;
+  @SuppressWarnings("deprecation") public int foo() { return 1; } // ok
+  @Nonnull @Mock DataLoader loader2;
+  // ok above as 'allowSamelineMultipleAnnotations' set to true
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.txt
deleted file mode 100644
index 71ee88e6567..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationLocation">
-      <property name="allowSamelineMultipleAnnotations" value="true"/>
-      <property name="allowSamelineSingleParameterlessAnnotation"
-                value="false"/>
-      <property name="allowSamelineParameterizedAnnotation" value="false"/>
-    </module>
-  </module>
-</module>
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
-
-// xdoc section -- start
-class Example2 {
-  @NotNull private boolean field1; //ok
-  @Override public int hashCode() { return 1; } //ok
-  @NotNull //ok
-  private boolean field2;
-  @Override //ok
-  public boolean equals(Object obj) { return true; }
-  @Mock DataLoader loader; //ok
-  @SuppressWarnings("deprecation") DataLoader loader; //ok
-  @SuppressWarnings("deprecation") public int foo() { return 1; } //ok
-  @NotNull @Mock DataLoader loader; //ok
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.java
new file mode 100644
index 00000000000..34127cc1f9d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.java
@@ -0,0 +1,39 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationLocation">
+      <property name="allowSamelineMultipleAnnotations" value="false"/>
+      <property name="allowSamelineSingleParameterlessAnnotation"
+                value="false"/>
+      <property name="allowSamelineParameterizedAnnotation" value="true"/>
+    </module>
+  </module>
+</module>
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+import javax.annotation.Nonnull;
+import org.mockito.Mock;
+
+// xdoc section -- start
+class Example3 {
+  // violation below, 'Annotation 'Nonnull' should be alone on line.'
+  @Nonnull private boolean field1;
+  // violation below, 'Annotation 'Override' should be alone on line.'
+  @Override public int hashCode() { return 1; }
+  @Nonnull
+  private boolean field2;
+  @Override
+  public boolean equals(Object obj) { return true; }
+  @Mock
+  DataLoader loader;
+  @SuppressWarnings("deprecation") DataLoader loader1;
+  @SuppressWarnings("deprecation") public int foo() { return 1; }
+  // violation below, 'Annotation 'Nonnull' should be alone on line.'
+  @Nonnull @Mock DataLoader loader2;
+  // violation above, 'Annotation 'Mock' should be alone on line.'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.txt
deleted file mode 100644
index 4f7762ca843..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationLocation">
-      <property name="allowSamelineMultipleAnnotations" value="false"/>
-      <property name="allowSamelineSingleParameterlessAnnotation"
-                value="false"/>
-      <property name="allowSamelineParameterizedAnnotation" value="true"/>
-    </module>
-  </module>
-</module>
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
-
-// xdoc section -- start
-class Example3 {
-  @NotNull private boolean field1; //violation
-  @Override public int hashCode() { return 1; } //violation
-  @NotNull //ok
-  private boolean field2;
-  @Override //ok
-  public boolean equals(Object obj) { return true; }
-  @Mock DataLoader loader; //violation
-  @SuppressWarnings("deprecation") DataLoader loader; //ok
-  @SuppressWarnings("deprecation") public int foo() { return 1; } //ok
-  @NotNull @Mock DataLoader loader; //violation
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.java
new file mode 100644
index 00000000000..79a50077137
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.java
@@ -0,0 +1,37 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationLocation">
+      <property name="tokens" value="METHOD_DEF"/>
+      <property name="allowSamelineMultipleAnnotations" value="false"/>
+      <property name="allowSamelineSingleParameterlessAnnotation"
+                value="true"/>
+      <property name="allowSamelineParameterizedAnnotation" value="false"/>
+    </module>
+  </module>
+</module>
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+import org.antlr.v4.runtime.misc.NotNull;
+import org.mockito.Mock;
+
+// xdoc section -- start
+class Example4 {
+  @NotNull private boolean field1; // ok, as 'tokens' property set to METHOD_DEF only
+  @Override public int hashCode() { return 1; }
+  @NotNull
+  private boolean field2;
+  @Override
+  public boolean equals(Object obj) { return true; }
+  @Mock
+  DataLoader loader1;
+  @SuppressWarnings("deprecation") DataLoader loader;
+  @SuppressWarnings("deprecation") public int foo() { return 1; }
+  // violation above, 'Annotation 'SuppressWarnings' should be alone on line.'
+  @NotNull @Mock DataLoader loader2;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.txt
deleted file mode 100644
index c81a45f5dd8..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationLocation">
-      <property name="tokens" value="METHOD_DEF"/>
-      <property name="allowSamelineMultipleAnnotations" value="false"/>
-      <property name="allowSamelineSingleParameterlessAnnotation"
-                value="true"/>
-      <property name="allowSamelineParameterizedAnnotation" value="false"/>
-    </module>
-  </module>
-</module>
-
-
-*/
-
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
-
-// xdoc section -- start
-class Example4 {
-  @NotNull private boolean field1; //ok
-  @Override public int hashCode() { return 1; } //ok
-  @NotNull //ok
-  private boolean field2;
-  @Override //ok
-  public boolean equals(Object obj) { return true; }
-  @Mock DataLoader loader; //ok
-  @SuppressWarnings("deprecation") DataLoader loader; //ok
-  @SuppressWarnings("deprecation") public int foo() { return 1; } //violation
-  @NotNull @Mock DataLoader loader; //ok
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.java
new file mode 100644
index 00000000000..a0b0e0faf13
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.java
@@ -0,0 +1,46 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationOnSameLine"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
+
+import org.junit.Before;
+
+// xdoc section -- start
+class Example1 {
+
+  @SuppressWarnings("deprecation") // violation
+  public Example1() {
+  }
+
+  @SuppressWarnings("unchecked") public void fun2() {  // OK
+  }
+
+  public void fun1() {
+  }
+
+}
+
+@SuppressWarnings("unchecked") class Test1 extends Example1 {  // OK
+
+  @Deprecated public Test1() {  // OK
+  }
+
+  @Override // violation
+  public void fun1() {
+  }
+
+  @Before // violation
+  @Override public void fun2() {  // OK
+  }
+
+  @SuppressWarnings("deprecation") // violation
+  @Before public void fun3() {
+  }
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.txt
deleted file mode 100644
index 098603702f8..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationOnSameLine"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Foo {
-
-  @SuppressWarnings("deprecation")  // violation, annotation should be on the same line
-  public Foo() {
-  }
-
-  @SuppressWarnings("unchecked") public void fun2() {  // OK
-  }
-
-}
-
-@SuppressWarnings("unchecked") class Bar extends Foo {  // OK
-
-  @Deprecated public Bar() {  // OK
-  }
-
-  @Override  // violation, annotation should be on the same line
-  public void fun1() {
-  }
-
-  @Before @Override public void fun2() {  // OK
-  }
-
-  @SuppressWarnings("deprecation")  // violation, annotation should be on the same line
-  @Before public void fun3() {
-  }
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.java
new file mode 100644
index 00000000000..1b541d3da7d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.java
@@ -0,0 +1,37 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationOnSameLine">
+      <property name="tokens"
+                value="INTERFACE_DEF, VARIABLE_DEF, CTOR_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationonsameline;
+
+import javax.annotation.Nullable;
+
+// xdoc section -- start
+@Deprecated interface Foo {  // OK
+
+  void doSomething();
+
+}
+
+class Example2 implements Foo {
+
+  @SuppressWarnings("deprecation") // violation
+  public Example2() {
+  }
+
+  @Override  // OK
+  public void doSomething() {
+  }
+
+  @Nullable // violation
+  String s;
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.txt
deleted file mode 100644
index 8ad629a1d77..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationOnSameLine">
-      <property name="tokens"
-                value="INTERFACE_DEF, VARIABLE_DEF, CTOR_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@Deprecated interface Foo {  // OK
-
-  void doSomething();
-
-}
-
-class Bar implements Foo {
-
-  @SuppressWarnings("deprecation")  // violation, annotation should be on the same line
-  public Bar() {
-  }
-
-  @Override  // OK
-  public void doSomething() {
-  }
-
-  @Nullable  // violation, annotation should be on the same line
-  String s;
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.java
new file mode 100644
index 00000000000..e1069454586
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.java
@@ -0,0 +1,33 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationUseStyle"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
+
+@interface SomeArrays {
+  String[] value() default {};
+}
+
+// xdoc section -- start
+@SuppressWarnings("unchecked") // ok as it's in implied style
+@Deprecated // ok as it matches closingParens default property
+@SomeArrays({"unchecked","unused"}) // ok as it's in implied style
+public class Example1
+{
+
+}
+
+// violation below 'Annotation style must be 'COMPACT_NO_ARRAY''
+@SuppressWarnings(value={"unchecked"})
+@Deprecated() // violation 'Annotation cannot have closing parenthesis'
+// violation below 'Annotation array values cannot contain trailing comma'
+@SomeArrays(value={"unchecked","unused",})
+class TestStyle1
+{
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.txt
deleted file mode 100644
index c33af1326cb..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationUseStyle"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@SuppressWarnings("unchecked") // OK
-@Deprecated // OK
-@SomeArrays({"unchecked","unused"}) // OK
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // Violation - parameter 'value' shouldn't be used
-@Deprecated() // Violation - cannot have a closing parenthesis
-@SomeArrays(value={"unchecked","unused",}) // Violation - cannot have a trailing array comma
-class TestTwo {
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.java
new file mode 100644
index 00000000000..fb0f03ee351
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.java
@@ -0,0 +1,32 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationUseStyle">
+      <property name="elementStyle" value="expanded"/>
+      <property name="closingParens" value="never"/>
+      <property name="trailingArrayComma" value="never"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
+
+// xdoc section -- start
+@SuppressWarnings("unchecked") // violation 'Annotation style must be 'EXPANDED''
+@Deprecated // ok as closingParens property set to never
+// violation below 'Annotation style must be 'EXPANDED''
+@SomeArrays({"unchecked","unused"})
+public class Example2
+{
+
+}
+
+@SuppressWarnings(value={"unchecked"}) // ok as elementStyle set to expanded
+@Deprecated() // violation 'Annotation cannot have closing parenthesis'
+// violation below 'Annotation array values cannot contain trailing comma'
+@SomeArrays(value={"unchecked","unused",})
+class TestStyle2 {
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.txt
deleted file mode 100644
index 758cce7561d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationUseStyle">
-      <property name="elementStyle" value="expanded"/>
-      <property name="closingParens" value="never"/>
-      <property name="trailingArrayComma" value="never"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@SuppressWarnings("unchecked") // Violation - parameters should be referenced
-@Deprecated // OK
-@SomeArrays({"unchecked","unused"}) // Violation - parameters should be referenced
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // OK
-@Deprecated() // Violation - cannot have a closing parenthesis
-@SomeArrays(value={"unchecked","unused",}) // Violation - cannot have a trailing array comma
-class TestTwo {
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.java
new file mode 100644
index 00000000000..a7af3db3963
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.java
@@ -0,0 +1,32 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationUseStyle">
+      <property name="elementStyle" value="compact"/>
+      <property name="closingParens" value="always"/>
+      <property name="trailingArrayComma" value="ignore"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
+
+// xdoc section -- start
+@SuppressWarnings("unchecked") // ok as element style set to compact
+@Deprecated // violation 'Annotation must have closing parenthesis'
+@SomeArrays({"unchecked","unused"}) // ok as it's in compact style
+public class Example3
+{
+
+}
+
+// violation below 'Annotation style must be 'COMPACT''
+@SuppressWarnings(value={"unchecked"})
+@Deprecated() // ok as closingParens set to always
+// violation below 'Annotation style must be 'COMPACT''
+@SomeArrays(value={"unchecked","unused",})
+class TestStyle3 {
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.txt
deleted file mode 100644
index af6ec7516e6..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationUseStyle">
-      <property name="elementStyle" value="compact"/>
-      <property name="closingParens" value="always"/>
-      <property name="trailingArrayComma" value="ignore"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@SuppressWarnings("unchecked") // OK
-@Deprecated // Violation - must have a closing parenthesis
-@SomeArrays({"unchecked","unused"}) // OK
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // Violation - parameter 'value' shouldn't be used
-@Deprecated() // OK
-@SomeArrays(value={"unchecked","unused",}) // Violation - parameter 'value' shouldn't be used
-class TestTwo {
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.java
new file mode 100644
index 00000000000..cbcc1e858e5
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.java
@@ -0,0 +1,33 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AnnotationUseStyle">
+      <property name="elementStyle" value="ignore"/>
+      <property name="closingParens" value="ignore"/>
+      <property name="trailingArrayComma" value="always"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
+
+// xdoc section -- start
+@SuppressWarnings("unchecked") // ok as element style set to 'ignore'
+@Deprecated // ok as 'closingParens' is set to 'ignore
+// violation below 'Annotation array values must contain trailing comma'
+@SomeArrays({"unchecked","unused"})
+public class Example4
+{
+
+}
+
+// violation below 'Annotation array values must contain trailing comma'
+@SuppressWarnings(value={"unchecked"})
+@Deprecated() // ok as 'closingParens' is set to 'ignore
+// ok below as it has a trailing array comma
+@SomeArrays(value={"unchecked","unused",})
+class TestStyle4 {
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.txt
deleted file mode 100644
index 8f838749eb5..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AnnotationUseStyle">
-      <property name="elementStyle" value="ignore"/>
-      <property name="closingParens" value="ignore"/>
-      <property name="trailingArrayComma" value="always"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@SuppressWarnings("unchecked") // OK
-@Deprecated // OK
-@SomeArrays({"unchecked","unused"}) // Violation - must have a trailing array comma
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // Violation - must have a trailing array comma
-@Deprecated() // OK
-@SomeArrays(value={"unchecked","unused",}) // OK
-class TestTwo {
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.java
new file mode 100644
index 00000000000..e40e7f3bfd3
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.java
@@ -0,0 +1,35 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MissingDeprecated"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
+
+// xdoc section -- start
+class Example1 {
+  @Deprecated
+  public static final int MY_CONST = 13; // ok
+
+  /** This javadoc is missing deprecated tag. */
+  // violation below '@deprecated Javadoc tag with description.'
+  @Deprecated
+  public static final int COUNTER = 10;
+
+  /**
+   * @deprecated
+   * <p></p>
+   */
+  @Deprecated
+    public static final int NUM = 123456; // ok
+
+  /**
+   * @deprecated
+   *  <p>
+   */
+  @Deprecated
+  public static final int CONST = 12; // ok
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.txt
deleted file mode 100644
index fbd765099a7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MissingDeprecated"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@Deprecated
-public static final int MY_CONST = 13; // ok
-
-/** This javadoc is missing deprecated tag. */
-@Deprecated
-public static final int COUNTER = 10; // violation
-
-/**
- * @deprecated
- * <p></p>
- */
-@Deprecated
-public static final int NUM = 123456; // ok
-
-/**
- * @deprecated
- *  <p>
- */
-@Deprecated
-public static final int CONST = 12; // ok
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.java
new file mode 100644
index 00000000000..891e933e1e9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.java
@@ -0,0 +1,37 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MissingDeprecated">
+      <property name="violateExecutionOnNonTightHtml" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
+
+// xdoc section -- start
+class Example2 {
+  @Deprecated
+  public static final int MY_CONST = 13; // ok
+
+  /** This javadoc is missing deprecated tag. */
+  // violation below '@deprecated Javadoc tag with description.'
+  @Deprecated
+  public static final int COUNTER = 10;
+
+  /**
+   * @deprecated
+   * <p></p>
+   */
+  @Deprecated
+  public static final int NUM = 123456; // ok
+
+  /**
+   * @deprecated
+   * <p> // violation, 'Unclosed HTML tag found: p'
+  */
+  @Deprecated
+  public static final int CONST = 12;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.txt
deleted file mode 100644
index 2f85b2d817f..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MissingDeprecated">
-      <property name="violateExecutionOnNonTightHtml" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@Deprecated
-public static final int MY_CONST = 13; // ok
-
-/** This javadoc is missing deprecated tag. */
-@Deprecated
-public static final int COUNTER = 10; // violation
-
-/**
- * @deprecated
- * <p></p>
- */
-@Deprecated
-public static final int NUM = 123456; // ok
-
-/**
- * @deprecated
- * <p>
- */
-@Deprecated
-public static final int CONST = 12; // violation, tight HTML rules not obeyed
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.java
new file mode 100644
index 00000000000..b4da1b0ad4d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.java
@@ -0,0 +1,43 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MissingOverride"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingoverride;
+
+class ParentClass1{
+  public void test1(){}
+
+  public void test2(){}
+
+}
+// xdoc section -- start
+class Example1 extends ParentClass1 {
+
+  /** {@inheritDoc} */
+  @Override
+  public void test1() { // OK
+
+  }
+
+  /** {@inheritDoc} */
+  public void test2() { // violation, 'include @java.lang.Override'
+
+  }
+
+  /** {@inheritDoc} */
+  // violation below '{@inheritDoc} tag is not valid at this location.'
+  private void test3() {
+
+  }
+
+  /** {@inheritDoc} */
+  // violation below '{@inheritDoc} tag is not valid at this location.'
+  public static void test4() {
+
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.txt
deleted file mode 100644
index 3b86cd82af9..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MissingOverride"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test extends SuperClass {
-
-    /** {@inheritDoc} */
-    @Override
-    public void test1() { // OK
-
-    }
-
-    /** {@inheritDoc} */
-    public void test2() { // violation, should be annotated with @Override
-
-    }
-
-    /** {@inheritDoc} */
-    private void test3() { // violation, using the @inheritDoc tag on private method
-
-    }
-
-    /** {@inheritDoc} */
-    public static void test4() { // violation, using the @inheritDoc tag on static method
-
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.java
new file mode 100644
index 00000000000..2922b317615
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.java
@@ -0,0 +1,54 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MissingOverride">
+      <property name="javaFiveCompatibility"
+                value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingoverride;
+
+class ParentClass2 {
+  public void test(){}
+
+}
+
+// xdoc section -- start
+class Example2 {
+  /** {@inheritDoc} */
+  public boolean equals(Object o) { // violation, 'include @java.lang.Override'
+    return o == this;
+  }
+}
+
+interface B {
+
+  /** {@inheritDoc} */
+  void test(); // violation, 'include @java.lang.Override'
+}
+
+class C extends ParentClass2 {
+  /** {@inheritDoc} */
+  public void test() { // OK, is ignored because class extends other class
+
+  }
+}
+
+class D implements B {
+  /** {@inheritDoc} */
+  public void test() { // OK, is ignored because class implements interface
+  }
+}
+
+class E {
+  Runnable r = new Runnable() {
+
+    /** {@inheritDoc} */
+    public void run() { // OK, is ignored because class is anonymous class
+    }
+  };
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.txt
deleted file mode 100644
index 09cb61a1d93..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MissingOverride">
-      <property name="javaFiveCompatibility"
-                value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test1 {
-
-    /** {@inheritDoc} */
-    public void equals() { // violation, should be annotated with @Override
-
-    }
-}
-
-interface Test2 {
-
-    /** {@inheritDoc} */
-    void test(); // violation, should be annotated with @Override
-}
-
-class Test3 extends SuperClass {
-
-    /** {@inheritDoc} */
-    public void test() { // OK, is ignored because class extends other class
-
-    }
-}
-
-class Test4 implements SuperInterface {
-
-    /** {@inheritDoc} */
-    public void test() { // OK, is ignored because class implements interface
-
-    }
-}
-
-class Test5 {
-    Runnable r = new Runnable() {
-
-        /** {@inheritDoc} */
-        public void run() { // OK, is ignored because class is anonymous class
-
-        }
-    };
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.txt
deleted file mode 100644
index ae54b0d0466..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="PackageAnnotation"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@Deprecated
-package com.example.annotations.packageannotation; //violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.java
new file mode 100644
index 00000000000..97146debf82
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.java
@@ -0,0 +1,13 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="PackageAnnotation"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation;
+
+class Example2 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.txt
deleted file mode 100644
index 3225f6c4a2a..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="PackageAnnotation"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-package com.example.annotations.packageannotation; //ok
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example3.txt
deleted file mode 100644
index 002c76ea901..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example3.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="PackageAnnotation"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@Deprecated
-package com.example.annotations.packageannotation; //ok
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/example3/package-info.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/example3/package-info.java
new file mode 100644
index 00000000000..94758965dfe
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/example3/package-info.java
@@ -0,0 +1,13 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="PackageAnnotation"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+@Deprecated
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation.example3;
+
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.java
new file mode 100644
index 00000000000..fdcf6e65b27
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.java
@@ -0,0 +1,37 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWarnings"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.suppresswarnings;
+
+// xdoc section -- start
+// violation below 'The warning '' cannot be suppressed at this location'
+@SuppressWarnings("")
+class Example1 {
+  // violation below 'The warning '' cannot be suppressed at this location'
+  @SuppressWarnings("")
+  final int num1 = 1;
+  // ok below as default format only checks for a blank or empty string
+  @SuppressWarnings("all")
+  final int num2 = 2;
+  // ok below as default format only checks for a blank or empty string
+  @SuppressWarnings("unused")
+  final int num3 = 3;
+
+  void foo1(@SuppressWarnings("unused") int param) {}
+
+  @SuppressWarnings("all")
+  void foo2(int param) {}
+  @SuppressWarnings("unused")
+  void foo3(int param) {}
+  @SuppressWarnings(true?"all":"unused")
+  void foo4(int param) {}
+}
+// ok below as default format only checks for a blank or empty string
+@SuppressWarnings("unchecked")
+class Test1 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.txt
deleted file mode 100644
index 2ddd5266141..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="SuppressWarnings"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@SuppressWarnings("") // violation
-class TestA {
-  @SuppressWarnings("") // violation
-  final int num1 = 1;
-  @SuppressWarnings("all") // ok
-  final int num2 = 2;
-  @SuppressWarnings("unused") // ok
-  final int num3 = 3;
-
-  void foo1(@SuppressWarnings("unused") int param) {} // ok
-
-  @SuppressWarnings("all") // ok
-  void foo2(int param) {}
-  @SuppressWarnings("unused") // ok
-  void foo3(int param) {}
-  @SuppressWarnings(true?"all":"unused") // ok
-  void foo4(int param) {}
-}
-@SuppressWarnings("unchecked") // ok
-class TestB {}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.java
new file mode 100644
index 00000000000..a94b0ed2450
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.java
@@ -0,0 +1,51 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWarnings">
+      <property name="format"
+          value="^unchecked$|^unused$"/>
+      <property name="tokens"
+        value="
+        CLASS_DEF,INTERFACE_DEF,ENUM_DEF,
+        ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
+        ENUM_CONSTANT_DEF,METHOD_DEF,CTOR_DEF
+        "/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.suppresswarnings;
+
+// xdoc section -- start
+// ok below, since we are only checking for '^unchecked$|^unused$'
+@SuppressWarnings("")
+class Example2 {
+  // ok below as VARIABLE_DEF is not configured in tokens to check
+  @SuppressWarnings("")
+  final int num1 = 1;
+  @SuppressWarnings("all")
+  final int num2 = 2;
+  @SuppressWarnings("unused")
+  final int num3 = 3;
+
+  // ok below as PARAMETER_DEF is not configured in tokens to check
+  void foo1(@SuppressWarnings("unused") int param) {}
+
+  // ok below, since we are only checking for '^unchecked$|^unused$'
+  @SuppressWarnings("all")
+  void foo2(int param) {}
+
+  // violation below, 'The warning 'unused' cannot be suppressed at this location'
+  @SuppressWarnings("unused")
+  void foo3(int param) {}
+
+  // violation below, 'The warning 'unused' cannot be suppressed at this location'
+  @SuppressWarnings(true?"all":"unused")
+  void foo4(int param) {}
+}
+
+// violation below, 'The warning 'unchecked' cannot be suppressed at this location'
+@SuppressWarnings("unchecked")
+class Test2 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.txt
deleted file mode 100644
index 95373ba21f3..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="SuppressWarnings">
-      <property name="format"
-          value="^unchecked$|^unused$"/>
-      <property name="tokens"
-        value="
-        CLASS_DEF,INTERFACE_DEF,ENUM_DEF,
-        ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
-        ENUM_CONSTANT_DEF,METHOD_DEF,CTOR_DEF
-        "/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@SuppressWarnings("") // ok
-class TestA {
-  @SuppressWarnings("") // ok
-  final int num1 = 1;
-  @SuppressWarnings("all") // ok
-  final int num2 = 2;
-  @SuppressWarnings("unused") // ok
-  final int num3 = 3;
-
-  void foo1(@SuppressWarnings("unused") int param) {} // ok
-
-  @SuppressWarnings("all") // ok
-  void foo2(int param) {}
-  @SuppressWarnings("unused") // violation
-  void foo3(int param) {}
-  @SuppressWarnings(true?"all":"unused") // violation
-  void foo4(int param) {}
-}
-@SuppressWarnings("unchecked") // violation
-class TestB {}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.java
new file mode 100644
index 00000000000..b6d75032e6e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.java
@@ -0,0 +1,40 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+  <module name="MemberName"/>
+  <module name="ConstantName"/>
+  <module name="ParameterNumber">
+    <property name="id" value="ParamNumberId"/>
+  </module>
+  <module name=
+    "NoWhitespaceAfter"/>
+  <module name="SuppressWarningsHolder"/>
+  </module>
+  <module name="SuppressWarningsFilter"/>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.suppresswarningsholder;
+
+// xdoc section -- start
+class Example1 {
+  private int K; // violation, 'Name 'K' must match pattern'
+  @SuppressWarnings({"membername"})
+  private int J; // violation suppressed
+
+  private static final int i = 0; // violation, 'Name 'i' must match pattern'
+  @SuppressWarnings("checkstyle:constantname")
+  private static final int m = 0; // violation suppressed
+
+  @SuppressWarnings("ParamNumberId")
+    public void needsLotsOfParameters1 (int a, // violation suppressed
+     int b, int c, int d, int e, int f, int g, int h) {
+     // ...
+  }
+
+  private int [] ARR; // violation ''int' is followed by whitespace'
+  // violation above, 'Name 'ARR' must match pattern'
+  @SuppressWarnings("all")
+  private int [] ARRAY; // violations suppressed
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.txt
deleted file mode 100644
index eb6e351fd3b..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-  <module name="MemberName"/>
-  <module name="ConstantName"/>
-  <module name="ParameterNumber">
-    <property name="id" value="ParamNumberId"/>
-  </module>
-  <module name="NoWhitespaceAfter"/>
-
-  <module name="SuppressWarningsHolder"/>
-  </module>
-  <module name="SuppressWarningsFilter"/>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-
-   private int K; // violation
-   @SuppressWarnings({"membername"})
-   private int J; // violation suppressed
-
-   private static final int i = 0; // violation
-   @SuppressWarnings("checkstyle:constantname")
-   private static final int m = 0; // violation suppressed
-
-   public void needsLotsOfParameters (int a, // violation
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
-
-   @SuppressWarnings("ParamNumberId")
-   public void needsLotsOfParameters1 (int a, // violation suppressed
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
-
-   private int [] ARR; // 2 violations
-   @SuppressWarnings("all")
-   private int [] ARRAY; // violations suppressed
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.java
new file mode 100644
index 00000000000..cf67c92f2db
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.java
@@ -0,0 +1,31 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+  <module name="ParameterNumber"/>
+  <module name="SuppressWarningsHolder">
+    <property name="aliasList" value=
+      "com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck=paramnum"/>
+  </module>
+  </module>
+  <module name="SuppressWarningsFilter"/>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.suppresswarningsholder;
+
+// xdoc section -- start
+class Example2 {
+  // violation below, 'More than 7 parameters (found 8)'
+  public void needsLotsOfParameters (int a,
+    int b, int c, int d, int e, int f, int g, int h) {
+    // ...
+  }
+
+  @SuppressWarnings("paramnum")
+  public void needsLotsOfParameters1 (int a, // violation suppressed
+    int b, int c, int d, int e, int f, int g, int h) {
+    // ...
+  }
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.txt
deleted file mode 100644
index e9cb4d1f3b2..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-  <module name="ParameterNumber"/>
-
-  <module name="SuppressWarningsHolder">
-    <property name="aliasList" value=
-      "com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck=paramnum"/>
-  </module>
-  </module>
-  <module name="SuppressWarningsFilter"/>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-
-   public void needsLotsOfParameters (int a, // violation
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
-
-   @SuppressWarnings("paramnum")
-   public void needsLotsOfParameters1 (int a, // violation suppressed
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.java
new file mode 100644
index 00000000000..721b622b045
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.java
@@ -0,0 +1,24 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ArrayTypeStyle"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.arraytypestyle;
+
+// xdoc section -- start
+public class Example1 {
+  int[] nums; // ok since default format checks for Java style
+  String strings[]; // violation, 'Array brackets at illegal position'
+
+  char[] toCharArray() {
+    return null;
+  }
+
+  byte getData()[] { // violation, 'Array brackets at illegal position'
+    return null;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.txt
deleted file mode 100644
index c055d76588e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ArrayTypeStyle"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class MyClass {
-  int[] nums; // OK
-  String strings[]; // violation
-
-  char[] toCharArray() { // OK
-    return null;
-  }
-
-  byte getData()[] { // violation
-    return null;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.java
new file mode 100644
index 00000000000..a0f44d71fe8
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.java
@@ -0,0 +1,26 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ArrayTypeStyle">
+      <property name="javaStyle" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.arraytypestyle;
+
+// xdoc section -- start
+public class Example2 {
+  int[] nums; // violation, 'Array brackets at illegal position'
+  String strings[]; // OK as follows C style since 'javaStyle' set to false
+
+  char[] toCharArray() { // OK
+    return null;
+  }
+
+  byte getData()[] { // violation, 'Array brackets at illegal position'
+    return null;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.txt
deleted file mode 100644
index f6a607099f0..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ArrayTypeStyle">
-      <property name="javaStyle" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class MyClass {
-  int[] nums; // violation
-  String strings[]; // OK
-
-  char[] toCharArray() { // OK
-    return null;
-  }
-
-  byte getData()[] { // violation
-    return null;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.java
new file mode 100644
index 00000000000..0e19aa97766
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.java
@@ -0,0 +1,29 @@
+/*xml
+<module name="Checker">
+    <module name="TreeWalker">
+        <module name="AvoidEscapedUnicodeCharacters"/>
+    </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
+
+// xdoc section -- start
+public class Example1 {
+  // OK, perfectly clear even without a comment.
+  String unitAbbrev = "μs";
+  // violation below, the reader has no idea what this is. 'should be avoided.'
+  String unitAbbrev1 = "\u03bcs";
+  // violation below
+  String unitAbbrev2 = "\u03bc\u03bc\u03bc";
+  // violation below
+  String unitAbbrev3 = "\u03bcs"; // it is  μs
+  // violation below
+  String unitAbbrev4 = "\u03bc\u03bcs";
+  public static int content() {
+    char content = 'r';
+    // violation below
+    return '\ufeff' + content;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.txt
deleted file mode 100644
index f58c8b05447..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidEscapedUnicodeCharacters"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-String unitAbbrev = "μs";     // OK, perfectly clear even without a comment.
-String unitAbbrev = "\u03bcs";// violation, the reader has no idea what this is.
-return '\ufeff' + content;    // OK, an example of non-printable,
-                              // control characters (byte order mark).
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.java
new file mode 100644
index 00000000000..013a6bd1e85
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.java
@@ -0,0 +1,31 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowEscapesForControlCharacters" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
+
+// xdoc section -- start
+public class Example2 {
+  // OK, a normal String below
+  String unitAbbrev = "μs";
+  // violation below, μs is a printable character. 'should be avoided.'
+  String unitAbbrev1 = "\u03bcs";
+  // violation below
+  String unitAbbrev2 = "\u03bc\u03bc\u03bc";
+  // violation below
+  String unitAbbrev3 = "\u03bcs";
+  // violation below
+  String unitAbbrev4 = "\u03bc\u03bcs";
+  public static int content() {
+    char content = 'r';
+    // OK, non-printable control character.
+    return '\ufeff' + content;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.txt
deleted file mode 100644
index ec10ffc3b53..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidEscapedUnicodeCharacters">
-      <property name="allowEscapesForControlCharacters" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-String unitAbbrev = "μs";      // OK, a normal String
-String unitAbbrev = "\u03bcs"; // violation, "\u03bcs" is a printable character.
-return '\ufeff' + content;     // OK, non-printable control character.
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.java
new file mode 100644
index 00000000000..30e69c420ac
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.java
@@ -0,0 +1,31 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowByTailComment" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
+
+// xdoc section -- start
+public class Example3 {
+  // OK, a normal String below
+  String unitAbbrev = "μs";
+  // violation below
+  String unitAbbrev1 = "\u03bcs";
+  // violation below
+  String unitAbbrev2 = "\u03bc\u03bc\u03bc";
+  // violation below
+  String unitAbbrev3 = "\u03bcs";
+  // ok, because there is trailing comment and allowByTailComment=true
+  String unitAbbrev4 = "\u03bc\u03bcs"; // it is  μs
+  public static int content() {
+    char content = 'r';
+    // violation below
+    return '\ufeff' + content;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.txt
deleted file mode 100644
index 5d5e4fa40dd..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidEscapedUnicodeCharacters">
-      <property name="allowByTailComment" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-String unitAbbrev = "μs";      // OK, a normal String
-String unitAbbrev = "\u03bcs"; // OK, Greek letter mu, "s"
-return '\ufeff' + content;
-// -----^--------------------- violation, comment is not used within same line.
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.java
new file mode 100644
index 00000000000..8e45bdfa854
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.java
@@ -0,0 +1,31 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowIfAllCharactersEscaped" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
+
+// xdoc section -- start
+public class Example4 {
+  // OK, a normal String below
+  String unitAbbrev = "μs";
+  // violation below, not all characters are escaped ('s'). 'should be avoided.'
+  String unitAbbrev1 = "\u03bcs";
+  // ok, because below are escape characters and allowIfAllCharacters = true.
+  String unitAbbrev2 = "\u03bc\u03bc\u03bc";
+  // violation below
+  String unitAbbrev3 = "\u03bcs"; // it is  μs
+  // violation below, not all characters are escaped ('s'). 'should be avoided.'
+  String unitAbbrev4 = "\u03bc\u03bcs";
+  public static int content() {
+    char content = 'r';
+    // OK, all control characters are escaped below
+    return '\ufeff' + content;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.txt
deleted file mode 100644
index 89e4d7942fb..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidEscapedUnicodeCharacters">
-      <property name="allowIfAllCharactersEscaped" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-String unitAbbrev = "μs";      // OK, a normal String
-String unitAbbrev = "\u03bcs"; // violation, not all characters are escaped ('s').
-String unitAbbrev = "\u03bc\u03bc\u03bc"; // OK
-String unitAbbrev = "\u03bc\u03bcs";// violation, not all characters are escaped ('s').
-return '\ufeff' + content;          // OK, all control characters are escaped
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.java
new file mode 100644
index 00000000000..c5870192d51
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.java
@@ -0,0 +1,31 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowNonPrintableEscapes" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.avoidescapedunicodecharacters;
+
+// xdoc section -- start
+public class Example5 {
+  // OK, a normal String below.
+  String unitAbbrev = "μs";
+  // violation below, printable escape character. 'should be avoided.'
+  String unitAbbrev1 = "\u03bcs";
+  // violation below, printable escape character. 'should be avoided.'
+  String unitAbbrev2 = "\u03bc\u03bc\u03bc";
+  // violation below
+  String unitAbbrev3 = "\u03bcs"; // it is μs
+  // violation below
+  String unitAbbrev4 = "\u03bc\u03bcs";
+  public static int content() {
+    char content = 'r';
+    // OK, non-printable escape character below
+    return '\ufeff' + content;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.txt
deleted file mode 100644
index c2c7b2e35e6..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidEscapedUnicodeCharacters">
-      <property name="allowNonPrintableEscapes" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-String unitAbbrev = "μs";       // OK, a normal String
-String unitAbbrev1 = "\u03bcs"; // violation, printable escape character.
-String unitAbbrev2 = "\u03bc\u03bc\u03bc"; // violation, printable escape character.
-String unitAbbrev3 = "\u03bc\u03bcs";// violation, printable escape character.
-return '\ufeff' + content;           // OK, non-printable escape character.
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java
new file mode 100644
index 00000000000..39027cb5fbe
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java
@@ -0,0 +1,33 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidNestedBlocks"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.avoidnestedblocks;
+
+import static org.checkstyle.suppressionxpathfilter.interfaceistype.InputXpathInterfaceIsTypeAllowMarker.a;
+
+// xdoc section -- start
+public class Example1 {
+  public void foo() {
+    int myInteger = 0;
+    {                      // violation
+      myInteger = 2;
+    }
+    System.out.println("myInteger = " + myInteger);
+
+    switch (a) {
+      case 1: {                    // violation
+        System.out.println("Case 1");
+        break;
+      }
+      case 2:
+        System.out.println("Case 2");
+        break;
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.txt
deleted file mode 100644
index 2740b06d60d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidNestedBlocks"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public void foo() {
-  int myInteger = 0;
-  {                      // violation
-    myInteger = 2;
-  }
-  System.out.println("myInteger = " + myInteger);
-
-  switch (a) {
-    case 1:
-      {                    // violation
-        System.out.println("Case 1");
-        break;
-      }
-    case 2:
-      System.out.println("Case 2");     // OK
-      break;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java
new file mode 100644
index 00000000000..88308796e5a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java
@@ -0,0 +1,35 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidNestedBlocks">
+      <property name="allowInSwitchCase" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.avoidnestedblocks;
+
+import static org.checkstyle.suppressionxpathfilter.interfaceistype.InputXpathInterfaceIsTypeAllowMarker.a;
+
+// xdoc section -- start
+public class Example2 {
+  public void foo() {
+    int myInteger = 0;
+    {                      // violation
+      myInteger = 2;
+    }
+    System.out.println("myInteger = " + myInteger);
+
+    switch (a) {
+      case 1: {
+        System.out.println("Case 1");
+        break;
+      }
+      case 2:
+        System.out.println("Case 2");
+        break;
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.txt
deleted file mode 100644
index b7813c2ac32..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidNestedBlocks">
-      <property name="allowInSwitchCase" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public void foo() {
-  int myInteger = 0;
-  {                      // violation
-    myInteger = 2;
-  }
-  System.out.println("myInteger = " + myInteger);
-
-  switch (a)
-  {
-    case 1:
-      {                    // OK
-        System.out.println("Case 1");
-        break;
-      }
-    case 2:
-      System.out.println("Case 2");     // OK
-      break;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.java
new file mode 100644
index 00000000000..c891b0646a5
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.java
@@ -0,0 +1,24 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyBlock"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock;
+
+// xdoc section -- start
+public class Example1 {
+  private void emptyLoop() {
+    for (int i = 0; i < 10; i++) { // violation 'Must have at least one statement'
+    }
+
+    try { // violation 'Must have at least one statement'
+
+    } catch (Exception e) {
+      // ignored
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.txt
deleted file mode 100644
index 4414088b217..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyBlock"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-  private void emptyLoop() {
-    for (int i = 0; i < 10; i++) { // violation
-    }
-
-    try { // violation
-
-    } catch (Exception e) {
-      // ignored
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.java
new file mode 100644
index 00000000000..5c9e6fd89a4
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyBlock">
+      <property name="option" value="text"/>
+      <property name="tokens" value="LITERAL_TRY"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock;
+
+// xdoc section -- start
+public class Example2 {
+  private void emptyLoop() {
+    for (int i = 0; i < 10; i++) {
+      // ignored
+    }
+
+    try {
+    }  // violation above 'Empty try block'
+    catch (Exception e) {
+      // ignored
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.txt
deleted file mode 100644
index 7cc525995a8..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyBlock">
-      <property name="option" value="text"/>
-      <property name="tokens" value="LITERAL_TRY"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-  private void emptyLoop() {
-    for (int i = 0; i < 10; i++) {
-      // ignored
-    }
-
-    // violation on next line
-    try {
-
-    } catch (Exception e) {
-      // ignored
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.java
new file mode 100644
index 00000000000..667c1eddbd0
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyBlock">
+      <property name="tokens" value="LITERAL_DEFAULT"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock;
+
+import static com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier.InputRedundantModifierFinalInEnumStaticMethods.TestEnum.someMethod;
+
+// xdoc section -- start
+public class Example3 {
+  private void test(int a) {
+    switch (a) {
+      case 1: someMethod();
+      default: // OK, as there is no block
+    }
+    switch (a) {
+      case 1: someMethod();
+      default: {} // violation 'Must have at least one statement'
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.txt
deleted file mode 100644
index 8b8a6f2b854..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyBlock">
-      <property name="tokens" value="LITERAL_DEFAULT"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-  private void test(int a) {
-    switch (a) {
-      case 1: someMethod();
-      default: // OK, as there is no block
-    }
-    switch (a) {
-      case 1: someMethod();
-      default: {} // violation
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.java
new file mode 100644
index 00000000000..1b158087672
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.java
@@ -0,0 +1,43 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyCatchBlock"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptycatchblock;
+
+// xdoc section -- start
+public class Example1 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException expected) {
+    } // violation above
+  }
+
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ignore) {
+      // no handling
+    } // ok, catch block has comment
+  }
+
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException o) {
+    } // violation above
+  }
+
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ex) {
+      // This is expected
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.txt
deleted file mode 100644
index c51feb5f96d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyCatchBlock"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // ok, catch block has comment
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.java
new file mode 100644
index 00000000000..cc425243539
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.java
@@ -0,0 +1,45 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyCatchBlock">
+      <property name="exceptionVariableName" value="expected|ignore"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptycatchblock;
+
+// xdoc section -- start
+public class Example2 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException expected) {
+    }
+  }
+
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ignore) {
+      // no handling
+    }
+  }
+
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException o) {
+    } // violation above
+  }
+
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ex) {
+      // This is expected
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.txt
deleted file mode 100644
index 264abd1a2e9..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyCatchBlock">
-      <property name="exceptionVariableName" value="expected|ignore"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // ok
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // ok
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.java
new file mode 100644
index 00000000000..7ebeb51c6cf
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.java
@@ -0,0 +1,45 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyCatchBlock">
+      <property name="commentFormat" value="This is expected"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptycatchblock;
+
+// xdoc section -- start
+public class Example3 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException expected) {
+    } // violation above
+  }
+
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ignore) {
+      // no handling
+    } // violation 2 lines above
+  }
+
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException o) {
+    } // violation above
+  }
+
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ex) {
+      // This is expected
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.txt
deleted file mode 100644
index 15c3670b23e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyCatchBlock">
-      <property name="commentFormat" value="This is expected"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.java
new file mode 100644
index 00000000000..7b400989aa9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.java
@@ -0,0 +1,59 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyCatchBlock">
+      <property name="commentFormat" value="This is expected"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptycatchblock;
+// xdoc section -- start
+public class Example4 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      //This is expected
+    }
+  }
+
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      //   This is expected
+    }
+  }
+
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      // This is expected
+      // some another comment
+    }
+  }
+
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      /* This is expected */
+    }
+  }
+
+  private void exampleMethod5() {
+    try {
+      throw new RuntimeException();
+      // violation below
+    } catch (RuntimeException e) {
+      /*
+       *
+       * This is expected
+       * some another comment */
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.txt
deleted file mode 100644
index b64b58a1c5d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyCatchBlock">
-      <property name="commentFormat" value="This is expected"/>
-      <property name="exceptionVariableName" value="myException"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  //This is expected
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  //   This is expected
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  // This is expected
-  // some another comment
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  /* This is expected */
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  /*
-  *
-  * This is expected
-  * some another comment
-  */
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException myException) {
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example5.java
new file mode 100644
index 00000000000..d12ef7ff603
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example5.java
@@ -0,0 +1,29 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyCatchBlock">
+      <property name="exceptionVariableName" value="myException"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.emptycatchblock;
+
+// xdoc section -- start
+public class Example5 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+    } // violation above
+  }
+
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException myException) {
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.java
new file mode 100644
index 00000000000..2e6c4508a83
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LeftCurly"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
+
+// xdoc section -- start
+class Example1
+{ // violation, ''{' at column 1 should be on the previous line.'
+  private interface TestInterface
+  { // violation, ''{' at column 3 should be on the previous line.'
+  }
+
+  private
+    class
+    MyClass { // OK
+  }
+
+  enum Colors {RED, // OK
+    BLUE,
+    GREEN;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.txt
deleted file mode 100644
index efc769b8f36..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LeftCurly"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test
-{ // Violation - '{' should be on the previous line
-  private interface TestInterface
-  { // Violation - '{' should be on the previous line
-  }
-
-  private
-  class
-  MyClass { // OK
-  }
-
-  enum Colors {RED, // OK
-    BLUE,
-    GREEN;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.java
new file mode 100644
index 00000000000..9128dc28627
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.java
@@ -0,0 +1,31 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LeftCurly">
+      <property name="option" value="nl"/>
+      <property name="tokens" value="CLASS_DEF,INTERFACE_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
+
+// xdoc section -- start
+class Example2
+{ // OK
+  private interface TestInterface
+  { // OK
+  }
+
+  private
+    class
+    MyClass { // violation, ''{' at column 13 should be on a new line.'
+  }
+
+  enum Colors {RED, // OK
+    BLUE,
+    GREEN;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.txt
deleted file mode 100644
index 6816c10341c..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LeftCurly">
-      <property name="option" value="nl"/>
-      <property name="tokens" value="CLASS_DEF,INTERFACE_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test
-{ // OK
-  private interface TestInterface
-  { // OK
-  }
-
-  private
-  class
-  MyClass { // Violation - '{' should be on a new line
-  }
-
-  enum Colors {RED, // OK
-    BLUE,
-    GREEN;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.java
new file mode 100644
index 00000000000..346a41c8e21
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LeftCurly">
+      <property name="option" value="nlow"/>
+      <property name="tokens" value="CLASS_DEF,INTERFACE_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
+
+// xdoc section -- start
+class Example3
+{ // violation, ''{' at column 1 should be on the previous line.'
+  private interface TestInterface { // OK
+  }
+
+  private
+    class
+    MyClass { // violation, ''{' at column 13 should be on a new line.'
+  }
+
+  enum Colors {RED, // OK
+    BLUE,
+    GREEN;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.txt
deleted file mode 100644
index b0689733e32..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LeftCurly">
-      <property name="option" value="nlow"/>
-      <property name="tokens" value="CLASS_DEF,INTERFACE_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test
-{ // Violation - '{' should be on the previous line
-  private interface TestInterface { // OK
-  }
-
-  private
-  class
-  MyClass { // Violation - '{' should be on a new line
-  }
-
-  enum Colors {RED, // OK
-    BLUE,
-    GREEN;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.java
new file mode 100644
index 00000000000..12326c4abbc
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LeftCurly">
+      <property name="ignoreEnums" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.leftcurly;
+
+// xdoc section -- start
+class Example4
+{ // violation, ''{' at column 1 should be on the previous line.'
+  private interface TestInterface
+  { // violation, ''{' at column 3 should be on the previous line.'
+  }
+
+  private
+    class
+    MyClass { // OK
+  }
+
+  enum Colors {RED, // violation, ''{' at column 15 should have line break after.'
+    BLUE,
+    GREEN;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.txt
deleted file mode 100644
index 2f79f62ff96..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LeftCurly">
-      <property name="ignoreEnums" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test
-{ // Violation - '{' should be on the previous line
-  private interface TestInterface
-  { // Violation - '{' should be on the previous line
-  }
-
-  private
-  class
-  MyClass { // OK
-  }
-
-  enum Colors {RED, // Violation - '{' should have line break after
-  BLUE,
-  GREEN;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.java
new file mode 100644
index 00000000000..3a344cfeff4
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.java
@@ -0,0 +1,53 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NeedBraces"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
+
+// xdoc section -- start
+class Example1 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = "O";
+  public boolean Example1() {
+    if (obj.equals(num)) return true;
+    // violation above, ''if' construct must use '{}'s.'
+    if (true) {
+      count = 2;
+    } else
+        // violation above, ''else' construct must use '{}'s.'
+        return false;
+    for (int i = 0; i < 5; i++) {
+      ++count;}
+    do // violation, ''do' construct must use '{}'s.'
+        ++count;
+    while (false);
+    for (int j = 0; j < 10; j++);
+    // violation above, ''for' construct must use '{}'s.'
+    for(int i = 0; i < 10; value.charAt(12));
+    // violation above, ''for' construct must use '{}'s.'
+    while (counter < 10)
+        // violation above, ''while' construct must use '{}'s.'
+        ++count;
+    while (value.charAt(12) < 5);
+    // violation above, ''while' construct must use '{}'s.'
+    switch (num) {
+      case 1: counter++; break;
+    }
+    return true;
+  }
+}
+
+
+
+
+
+
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.txt
deleted file mode 100644
index d20052dccf4..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NeedBraces"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
-if (true) {                     // OK
-    return true;
-} else                          // violation, single-line statements not allowed without braces
-    return false;
-for (int i = 0; i < 5; i++) {   // OK
-     ++count;
-}
-do                              // violation, single-line statements not allowed without braces
-    ++count;
-while (false);
-for (int j = 0; j < 10; j++); // violation, empty loop body not allowed
-for(int i = 0; i < 10; value.incrementValue()); // violation, empty loop body not allowed
-while (counter < 10)          // violation, single-line statements not allowed without braces
-    ++count;
-while (value.incrementValue() < 5); // violation, empty loop body not allowed
-switch (num) {
-  case 1: counter++; break;         // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.java
new file mode 100644
index 00000000000..83502cac066
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.java
@@ -0,0 +1,53 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NeedBraces">
+      <property name="tokens" value="LITERAL_IF, LITERAL_ELSE"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
+
+// xdoc section -- start
+class Example2 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = "O";
+  public boolean Example2() {
+    if (obj.equals(num)) return true;
+    // violation above, ''if' construct must use '{}'s.'
+    if (true) {
+      count = 2;
+    } else
+        // violation above, ''else' construct must use '{}'s.'
+        return false;
+    for (int i = 0; i < 5; i++) {
+      ++count;}
+    do // ok, because DO is not a target of validation
+        ++count;
+    while (false);
+    for (int j = 0; j < 10; j++);
+    // ok above, because FOR is not a target of validation
+    for(int i = 0; i < 10; value.charAt(12));
+    // ok above, because FOR is not a target of validation
+    while (counter < 10)
+        // ok above, because WHILE is not a target of validation
+        ++count;
+    while (value.charAt(12) < 5);
+    // ok above, because WHILE is not a target of validation
+    switch (num) {
+      case 1: counter++; break;
+    }
+    return true;
+  }
+}
+
+
+
+
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.txt
deleted file mode 100644
index 66cb89e4c29..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NeedBraces">
-      <property name="tokens" value="LITERAL_IF, LITERAL_ELSE"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
-if (true) {                     // OK
-    return true;
-} else                          // violation, single-line statements not allowed without braces
-    return false;
-for (int i = 0; i < 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j < 10; j++);   // OK
-for(int i = 0; i < 10; value.incrementValue()); // OK
-while (counter < 10)                            // OK
-    ++count;
-while (value.incrementValue() < 5); // OK
-switch (num) {
-  case 1: counter++; break;         // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.java
new file mode 100644
index 00000000000..e444f65e9a3
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.java
@@ -0,0 +1,51 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NeedBraces">
+      <property name="allowSingleLineStatement" value="true"/>
+      <property name="tokens"
+             value="LITERAL_IF, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
+
+// xdoc section -- start
+class Example3 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = "O";
+  public boolean Example3() {
+    if (obj.equals(num)) return true;
+    // ok above, because single line IF statement is allowed in config.
+    if (true) {
+      count = 2;
+    } else
+        // ok above, because single line ELSE statement is allowed in config.
+        return false;
+    for (int i = 0; i < 5; i++) {
+      ++count;}
+    do // violation, ''do' construct must use '{}'s.'
+        ++count;
+    while (false);
+    for (int j = 0; j < 10; j++);
+    // ok above, because single line FOR statement is allowed in config.
+    for(int i = 0; i < 10; value.charAt(12));
+    // ok above, because single line FOR statement is allowed in config.
+    while (counter < 10)
+        // violation above, ''while' construct must use '{}'s.'
+        ++count;
+    while (value.charAt(12) < 5);
+    // ok above, because single line FOR statement is allowed in config.
+    switch (num) {
+      case 1: counter++; break;
+    }
+    return true;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.txt
deleted file mode 100644
index 1142f06f3df..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NeedBraces">
-      <property name="allowSingleLineStatement" value="true"/>
-      <property name="tokens"
-             value="LITERAL_IF, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-if (obj.isValid()) return true;  // OK
-if (true) {                      // OK
-    return true;
-} else                           // OK
-    return false;
-for (int i = 0; i < 5; i++) {    // OK
-    ++count;
-}
-do                               // OK
-   ++count;
-while (false);
-for (int j = 0; j < 10; j++);                   // violation, empty loop body not allowed
-for(int i = 0; i < 10; value.incrementValue()); // violation, empty loop body not allowed
-while (counter < 10)                 // OK
-   ++count;
-while (value.incrementValue() < 5);  // violation, empty loop body not allowed
-switch (num) {
-  case 1: counter++; break;          // OK
-}
-while (obj.isValid()) return true;   // OK
-do this.notify(); while (o != null); // OK
-for (int i = 0; ; ) this.notify();   // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.java
new file mode 100644
index 00000000000..607817f6534
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.java
@@ -0,0 +1,51 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NeedBraces">
+      <property name="tokens" value="LITERAL_CASE, LITERAL_DEFAULT"/>
+      <property name="allowSingleLineStatement" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
+
+// xdoc section -- start
+class Example4 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = "O";
+  public boolean Example4() {
+
+    if (obj.equals(num)) return true;
+    // ok above, because IF is not a target of validation
+    if (true) {
+      count = 2;
+    } else
+        // ok above, because ELSE is not a target of validation
+        return false;
+    for (int i = 0; i < 5; i++) {
+      ++count;}
+    do // ok, because DO is not a target of validation
+        ++count;
+    while (false);
+    for (int j = 0; j < 10; j++);
+    // ok above, because FOR is not a target of validation
+    for(int i = 0; i < 10; value.charAt(12));
+    // ok above, because FOR is not a target of validation
+    while (counter < 10)
+        // ok above, because WHILE is not a target of validation
+        ++count;
+    while (value.charAt(12) < 5);
+    // ok above, because WHILE is not a target of validation
+    switch (num) {
+      case 1: counter++; break;
+    }
+    return true;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.txt
deleted file mode 100644
index 58786b261bd..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NeedBraces">
-      <property name="tokens" value="LITERAL_CASE, LITERAL_DEFAULT"/>
-      <property name="allowSingleLineStatement" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-if (obj.isValid()) return true; // OK
-if (true) {                     // OK
-    return true;
-} else                          // OK
-    return false;
-for (int i = 0; i < 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j < 10; j++);   // OK
-for(int i = 0; i < 10; value.incrementValue()); // OK
-while (counter < 10)                            // OK
-   ++count;
-while (value.incrementValue() < 5); // OK
-switch (num) {
-  case 1: counter++; break;         // OK
-  case 6: counter += 10; break;     // OK
-  default: counter = 100; break;    // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.java
new file mode 100644
index 00000000000..70bbdbe9b69
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.java
@@ -0,0 +1,53 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NeedBraces">
+      <property name="allowEmptyLoopBody" value="true"/>
+      <property name="tokens" value="LITERAL_WHILE, LITERAL_FOR"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
+
+// xdoc section -- start
+class Example5 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = "O";
+  public boolean Example5() {
+    if (obj.equals(num)) return true;
+    // ok above, because IF is not a target of validation
+    if (true) {
+      count = 2;
+    } else
+        // ok above, because ELSE is not a target of validation
+        return false;
+    for (int i = 0; i < 5; i++) {
+      ++count;}
+    do // ok, because DO is not a target of validation
+        ++count;
+    while (false);
+    for (int j = 0; j < 10; j++);
+    // ok above, because FOR is not a target of validation
+    for(int i = 0; i < 10; value.charAt(12));
+    // ok above, because FOR is not a target of validation
+    while (counter < 10)
+        // violation above, ''while' construct must use '{}'s.'
+        ++count;
+    while (value.charAt(12) < 5);
+    // ok above, because WHILE is not a target of validation
+    switch (num) {
+      case 1: counter++; break;
+    }
+    return true;
+  }
+}
+
+
+
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.txt
deleted file mode 100644
index 6ef73317ddc..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NeedBraces">
-      <property name="allowEmptyLoopBody" value="true"/>
-      <property name="tokens" value="LITERAL_WHILE, LITERAL_FOR"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-if (obj.isValid()) return true; // OK
-if (true) {                     // OK
-    return true;
-} else                          // OK
-    return false;
-for (int i = 0; i < 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j < 10; j++);   // OK
-for(int i = 0; i < 10; value.incrementValue()); // OK
-while (counter < 10)           // violation, single-line statements not allowed without braces
-   ++count;
-while (value.incrementValue() < 5); // OK
-switch (num) {
-case 1: counter++; break;           // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.java
new file mode 100644
index 00000000000..f78688b4796
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.java
@@ -0,0 +1,47 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NeedBraces">
+      <property name="tokens" value="LAMBDA"/>
+      <property name="allowSingleLineStatement" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
+
+import java.util.EnumSet;
+import java.util.concurrent.CompletableFuture;
+
+// xdoc section -- start
+class Example6 {
+  enum HttpMethod {GET, OPTIONS}
+  Object result = new Object();
+  private CustomCompletableFuture<Object> allowedFuture;
+  Example6() {
+    allowedFuture = new CustomCompletableFuture<>();
+    allowedFuture.addCallback(result -> assertEquals("Invalid response", // violation
+                    EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result),
+            ex -> fail(ex.getMessage()));
+    allowedFuture.addCustomCallback(() -> {
+      return assertEquals("Invalid response",
+              EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result);},
+            ex -> fail(ex.getMessage()));}
+  private Object assertEquals(String invalidResponse, EnumSet<HttpMethod> get,
+                              Object result) {
+    return result;}
+  private String fail(String message) {
+    return message;
+  }}
+class CustomCompletableFuture<T> {
+  private CompletableFuture<T> allowedFuture;
+  public CustomCompletableFuture() {
+    allowedFuture = new CompletableFuture<>();
+  }
+  public void addCallback(java.util.function.Consumer<T> successCallback,
+          java.util.function.Consumer<Throwable> failureCallback) {}
+  public void addCustomCallback(java.util.function.Supplier<Object> successLambda,
+          java.util.function.Consumer<Throwable> failureLambda) {}
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.txt
deleted file mode 100644
index 6014a62052d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NeedBraces">
-      <property name="tokens" value="LAMBDA"/>
-      <property name="allowSingleLineStatement" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-allowedFuture.addCallback(result -> assertEquals("Invalid response",
-  EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result), // violation, lambda spans 2 lines
-  ex -> fail(ex.getMessage())); // OK
-
-allowedFuture.addCallback(result -> {
-  return assertEquals("Invalid response",
-    EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result);
-  }, // OK
-  ex -> fail(ex.getMessage()));
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.java
new file mode 100644
index 00000000000..92472f84a32
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.java
@@ -0,0 +1,60 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="RightCurly"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+// xdoc section -- start
+public class Example1 {
+
+  public void test() {
+
+    boolean foo = false;
+    if (foo) {
+      bar();
+    } // violation, 'should be on the same line'
+    // as the next part of a multi-block statement (one that directly
+    // contains multiple blocks: if/else-if/else, do/while or try/catch/finally).
+    else {
+      bar();
+    }
+
+    if (foo) {
+      bar();
+    } else {
+      bar();
+    }
+
+    if (foo) { bar(); } int i = 0;
+    // violation above, 'should be alone on a line.'
+
+    if (foo) { bar(); }
+    i = 0;
+
+    try {
+      bar();
+    } // violation, 'should be on the same line'
+    // as the next part of a multi-block statement (one that directly
+    // contains multiple blocks: if/else-if/else, do/while or try/catch/finally).
+    catch (Exception e) {
+      bar();
+    }
+
+    try {
+      bar();
+    } catch (Exception e) {
+      bar();
+    }
+
+  }
+
+  private void bar() {
+  }
+
+  public void testSingleLine() { bar(); } // OK, because singleline is allowed
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.txt
deleted file mode 100644
index 8553ec24f9b..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="RightCurly"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-
-  public void test() {
-
-    if (foo) {
-      bar();
-    }           // violation, right curly must be in the same line as the 'else' keyword
-    else {
-      bar();
-    }
-
-    if (foo) {
-      bar();
-    } else {     // OK
-      bar();
-    }
-
-    if (foo) { bar(); } int i = 0;  // violation
-                  // ^^^ statement is not allowed on same line after curly right brace
-
-    if (foo) { bar(); }            // OK
-    int i = 0;
-
-    try {
-      bar();
-    }           // violation, rightCurly must be in the same line as 'catch' keyword
-    catch (Exception e) {
-      bar();
-    }
-
-    try {
-      bar();
-    } catch (Exception e) { // OK
-      bar();
-    }
-
-  }                         // OK
-
-  public void testSingleLine() { bar(); } // OK, because singleline is allowed
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.java
new file mode 100644
index 00000000000..dc9449da2e6
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.java
@@ -0,0 +1,50 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="RightCurly">
+      <property name="option" value="alone"/>
+      <property name="tokens" value="LITERAL_ELSE, METHOD_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+// xdoc section -- start
+public class Example2 {
+
+  public void test() {
+
+    boolean foo = false;
+    if (foo) {
+      bar();
+    } else { bar(); }
+    // violation above, 'should be alone on a line.'
+
+    if (foo) {
+      bar();
+    } else {
+      bar();
+    }
+
+    try {
+      bar();
+    } catch (Exception e) {
+      // OK above because config is set to token METHOD_DEF and LITERAL_ELSE
+      bar();
+    }
+
+  }
+
+  private void bar() {
+  }
+
+  public void violate() { Object bar = "bar"; }
+  // violation above, 'should be alone on a line.'
+
+  public void ok() {
+    bar();
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.txt
deleted file mode 100644
index e61235eca64..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="RightCurly">
-      <property name="option" value="alone"/>
-      <property name="tokens" value="LITERAL_ELSE, METHOD_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-
-  public void test() {
-
-    if (foo) {
-      bar();
-    } else { bar(); }   // violation, right curly must be alone on line
-
-    if (foo) {
-      bar();
-    } else {
-      bar();
-    }                   // OK
-
-    try {
-      bar();
-    } catch (Exception e) { // OK because config is set to token METHOD_DEF and LITERAL_ELSE
-      bar();
-    }
-
-  }                         // OK
-
-  public void violate() { bar; } // violation, singleline is not allowed here
-
-  public void ok() {
-    bar();
-  }                              // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.java
new file mode 100644
index 00000000000..53de6d85ae6
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.java
@@ -0,0 +1,42 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="RightCurly">
+      <property name="option" value="alone"/>
+      <property name="tokens" value="LITERAL_SWITCH, LITERAL_CASE"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+// xdoc section -- start
+class Example3 {
+
+  public void method0() {
+    int mode = 0;
+    int x;
+    switch (mode) {
+      case 1:
+        int y = 1;
+        break;
+      case 2: {x = 1;}   // violation '}' at column 22 should be alone on a line'
+      case 3: int z = 0; {break;} // ok, the braces is not a first child of case
+      default:
+        x = 0;
+    } // ok, RightCurly is alone
+  }
+
+  public void method01() {
+    int mode = 0;
+    switch (mode) {
+      case 1:
+        int x = 1;
+        break;
+      default:
+        x = 0; }
+    // violation above, 'should be alone on a line.'
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.txt
deleted file mode 100644
index 1fed41ed5af..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="RightCurly">
-      <property name="option" value="alone"/>
-      <property name="tokens" value="LITERAL_SWITCH"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0;
-        } // ok, RightCurly is alone
-    }
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0; } // violation, RightCurly should be alone on a line
-    }
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.java
new file mode 100644
index 00000000000..49cf9e5ee1d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.java
@@ -0,0 +1,46 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="RightCurly">
+      <property name="option" value="alone_or_singleline"/>
+      <property name="tokens" value="LITERAL_IF, METHOD_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+// xdoc section -- start
+public class Example4 {
+
+  public void test() {
+
+    boolean foo = false;
+    if (foo) {
+      bar();
+    } else { // violation, 'should be alone on a line.'
+      bar();
+    }
+
+    if (foo) {
+      bar();
+    }
+    else {
+      bar();
+    }
+
+    try {
+      bar();
+    } catch (Exception e) { // OK because config did not set token LITERAL_TRY
+      bar();
+    }
+
+  }
+
+  private void bar() {
+  }
+
+  public void violate() { bar(); } // OK , because singleline
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.txt
deleted file mode 100644
index ec83cdfcb11..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="RightCurly">
-      <property name="option" value="alone_or_singleline"/>
-      <property name="tokens" value="LITERAL_IF, METHOD_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-
-  public void test() {
-
-    if (foo) {
-      bar();
-    } else {        // violation, right curly must be alone on line
-      bar();
-    }
-
-    if (foo) {
-      bar();
-    }               // OK
-    else {
-      bar();
-    }
-
-    try {
-      bar();
-    } catch (Exception e) {        // OK because config did not set token LITERAL_TRY
-      bar();
-    }
-
-  }                                // OK
-
-  public void violate() { bar(); } // OK , because singleline
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.java
new file mode 100644
index 00000000000..38e3b2a79d8
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.java
@@ -0,0 +1,48 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="RightCurly">
+      <property name="option" value="alone_or_singleline"/>
+      <property name="tokens" value="LITERAL_SWITCH, LITERAL_CASE"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.blocks.rightcurly;
+
+// xdoc section -- start
+class Example5 {
+
+  public void method0() {
+    int mode = 0;
+    int x;
+    switch (mode) {
+      case 1:
+        int y = 1;
+        break;
+      case 2: {x = 1;}   // ok, RightCurly is in single line
+      case 3: int z = 0; {break;} // ok, the braces is not a first child of case
+      default:
+        x = 0;
+    }
+  }
+
+  public static void method7() {
+    int mode = 0;
+    switch (mode) {
+      case 1:
+        int x = 5;
+    } // ok, RightCurly is on the same line as LeftCurly
+  }
+
+  public void method() {
+    int mode = 0;
+    int x;
+    switch (mode) {
+      case 1:
+        x = 1; }
+    // violation above, 'should be alone on a line.'
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.txt
deleted file mode 100644
index 9fb46d450ed..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="RightCurly">
-      <property name="option" value="alone_or_singleline"/>
-      <property name="tokens" value="LITERAL_SWITCH"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0;
-        } // ok
-    }
-
-    public static void method7() {
-        int mode = 0;
-        int x;
-        switch (mode) { case 1: x = 5; } // ok, RightCurly is on the same line as LeftCurly
-    }
-
-    public void method() {
-        int mode = 0;
-        int x;
-        switch (mode) {
-            case 1:
-                x = 1; } // violation, right curly should be alone on line
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.java
new file mode 100644
index 00000000000..d74f3c4baa2
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.java
@@ -0,0 +1,49 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ArrayTrailingComma"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.arraytrailingcomma;
+
+// xdoc section -- start
+public class Example1 {
+  int[] numbers = {1, 2, 3};
+  boolean[] bools = {
+    true,
+    true,
+    false  // violation
+    };
+
+  String[][] text = {{},{},};
+
+  double[][] decimals = {
+    {0.5, 2.3, 1.1,},
+    {1.7, 1.9, 0.6},
+    {0.8, 7.4, 6.5}  // violation
+  };
+
+  char[] chars = {'a', 'b', 'c'
+  };
+
+  String[] letters = {
+    "a", "b", "c"};
+
+  int[] a1 = new int[]{
+    1,
+    2
+    ,
+  };
+
+  int[] a2 = new int[]{
+    1,
+    2
+  ,};
+}
+// xdoc section -- end
+
+
+
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.txt
deleted file mode 100644
index df3f2413ef9..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ArrayTrailingComma"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-int[] numbers = {1, 2, 3};        //no violation
-boolean[] bools = {
-true,
-true,
-false
-};        //violation
-
-String[][] text = {{},{},};        //no violation
-
-double[][] decimals = {
-{0.5, 2.3, 1.1,},        //no violation
-{1.7, 1.9, 0.6},
-{0.8, 7.4, 6.5}
-};        // violation as previous line misses a comma
-
-char[] chars = {'a', 'b', 'c'
-  };        / /no violation
-
-String[] letters = {
-  "a", "b", "c"};        // no violation
-
-int[] a1 = new int[]{
-  1,
-  2
-  ,
-};        // no violation
-
-int[] a2 = new int[]{
-  1,
-  2
-  ,};        // no violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.java
new file mode 100644
index 00000000000..abf051c2fb6
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.java
@@ -0,0 +1,53 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ArrayTrailingComma">
+        <property name="alwaysDemandTrailingComma" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.arraytrailingcomma;
+
+// xdoc section -- start
+public class Example2 {
+  int[] numbers = {1, 2, 3}; // violation
+  boolean[] bools = {
+    true,
+    true,
+    false // violation
+  };
+
+  String[][] text = {{},{},};
+
+  double[][] decimals = {
+    {0.5, 2.3, 1.1,},
+    {1.7, 1.9, 0.6}, // violation
+    {0.8, 7.4, 6.5,} // violation
+  };
+
+  char[] chars = {'a', 'b', 'c'  // violation
+  };
+
+  String[] letters = {
+    "a", "b", "c"}; // violation
+
+  int[] a1 = new int[]{
+    1,
+    2
+    ,
+  };
+
+  int[] a2 = new int[]{
+    1,
+    2
+    ,};
+}
+// xdoc section -- end
+
+
+
+
+
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.txt
deleted file mode 100644
index ad10c9bebe0..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ArrayTrailingComma">
-        <property name="alwaysDemandTrailingComma" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-int[] numbers = {1, 2, 3}; // violation
-boolean[] bools = {
-true,
-true,
-false // violation
-};
-
-String[][] text = {{},{},}; // OK
-
-double[][] decimals = {
-{0.5, 2.3, 1.1,}, // OK
-{1.7, 1.9, 0.6}, // violation
-{0.8, 7.4, 6.5} // violation
-}; // violation, previous line misses a comma
-
-char[] chars = {'a', 'b', 'c'  // violation
-  };
-
-String[] letters = {
-  "a", "b", "c"}; // violation
-
-int[] a1 = new int[]{
-  1,
-  2
-  ,
-}; // OK
-
-int[] a2 = new int[]{
-  1,
-  2
-  ,}; // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.java
new file mode 100644
index 00000000000..6b1fff0c927
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.java
@@ -0,0 +1,36 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidDoubleBraceInitialization"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.avoiddoublebraceinitialization;
+
+import java.util.ArrayList;
+
+import java.util.List;
+
+// xdoc section -- start
+class Example1 {
+  List<Integer> list1 = new ArrayList<>() { // violation
+    {
+      add(1);
+    }
+  };
+  List<String> list2 = new ArrayList<>() { // violation
+        ;
+    // comments and semicolons are ignored
+    {
+      add("foo");
+    }
+  };
+  List<Object> list = new ArrayList<>() {
+    // OK, as it is not double brace pattern
+    private int field;
+    {
+      add(new Object());
+    }
+  };
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.txt
deleted file mode 100644
index 1835455e93b..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidDoubleBraceInitialization"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-    List<Integer> list1 = new ArrayList<>() { // violation
-        {
-            add(1);
-        }
-    };
-    List<String> list2 = new ArrayList<>() { // violation
-        ;
-        // comments and semicolons are ignored
-        {
-            add("foo");
-        }
-    };
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example2.txt
deleted file mode 100644
index 144fb130124..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidDoubleBraceInitialization"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-    List<Object> list = new ArrayList<>() { // OK, not pure double brace pattern
-        private int field;
-        {
-            add(new Object());
-        }
-    };
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.java
new file mode 100644
index 00000000000..202d865f806
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidNoArgumentSuperConstructorCall"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.avoidnoargumentsuperconstructorcall;
+
+// xdoc section -- start
+class SuperClass {
+  public SuperClass() {}
+  public SuperClass(int arg) {}
+}
+class Example1 extends SuperClass {
+  Example1() {
+    super(); // violation
+  }
+
+  Example1(int arg) {
+    super(arg); // ok, explicit constructor invocation with argument
+  }
+
+  Example1(long arg) {
+    // ok, no explicit constructor invocation
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.txt
deleted file mode 100644
index feacc639af5..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidNoArgumentSuperConstructorCall"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass extends SomeOtherClass {
-    MyClass() {
-        super(); // violation
-    }
-
-    MyClass(int arg) {
-        super(arg); // OK, call with argument have to be explicit
-    }
-
-    MyClass(long arg) {
-        // OK, call is implicit
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example1.java
new file mode 100644
index 00000000000..c9d43ffae3e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example1.java
@@ -0,0 +1,42 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ConstructorsDeclarationGrouping"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.constructorsdeclarationgrouping;
+
+// xdoc section -- start
+public class Example1 {
+
+  int x;
+
+  Example1() {}
+
+  Example1(String s) {}
+
+  // comments between constructors are allowed.
+  Example1(int x) {}
+
+  Example1(String s, int x) {}
+
+  void foo() {}
+
+  private enum ExampleEnum {
+
+    ONE, TWO, THREE;
+
+    ExampleEnum() {}
+
+    ExampleEnum(int x) {}
+
+    ExampleEnum(String s) {}
+
+    int x = 10;
+
+    void foo() {}
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example2.java
new file mode 100644
index 00000000000..bd3c517e134
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example2.java
@@ -0,0 +1,43 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ConstructorsDeclarationGrouping"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.constructorsdeclarationgrouping;
+
+// xdoc section -- start
+public class Example2 {
+
+  int x;
+
+  Example2() {}
+
+  Example2(String s){}
+
+  void foo() {}
+
+  Example2(int x) {} // violation
+
+  Example2(String s, int x) {} // violation
+
+  private enum ExampleEnum {
+
+    ONE, TWO, THREE;
+
+    ExampleEnum() {}
+
+    ExampleEnum(int x) {}
+
+    final int x = 10;
+
+    ExampleEnum(String str) {} // violation
+
+    void foo() {}
+  }
+
+  Example2(float f) {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.java
new file mode 100644
index 00000000000..e186ac1ee19
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.java
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EmptyStatement"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.emptystatement;
+
+// xdoc section -- start
+public class Example1 {
+  public void foo() {
+    int i = 5;
+    if(i > 3); // violation
+    i++;
+    for (i = 0; i < 5; i++); // violation
+    i++;
+    while (i > 10)
+      i++;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.txt
deleted file mode 100644
index c46cf486f0b..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EmptyStatement"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public void foo() {
-  int i = 5;
-  if (i > 3); // violation, ";" right after if statement
-    i++;
-  for (i = 0; i < 5; i++); // violation
-    i++;
-  while (i > 10) // OK
-    i++;
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.java
new file mode 100644
index 00000000000..e275c7fc438
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.java
@@ -0,0 +1,52 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="EqualsHashCode"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.equalshashcode;
+// xdoc section -- start
+class Example1 {
+  public int hashCode() { // violation, no valid 'equals'
+    return 0;
+  }
+  public boolean equals(String o) { return false; }
+}
+
+class ExampleNoHashCode {
+  public boolean equals(Object o) { // violation, no 'hashCode'
+    return false;
+  }
+  public boolean equals(String o) { return false; }
+}
+
+class ExampleBothMethods1 {
+  public int hashCode() { return 0; }
+  public boolean equals(Object o) { // ok, both methods exist
+    return false;
+  }
+  public boolean equals(String o) { return false; }
+}
+
+class ExampleBothMethods2 {
+  public int hashCode() { return 0; }
+  public boolean equals(java.lang.Object o) { // ok, both methods exist
+    return false;
+  }
+}
+
+class ExampleNoValidHashCode {
+  public static int hashCode(int i) { return 0; }
+  public boolean equals(Object o) { // violation, no valid 'hashCode'
+    return false;
+  }
+}
+
+class ExampleNoValidEquals {
+  public int hashCode() { // violation, no valid 'equals'
+    return 0;
+  }
+  public static boolean equals(Object o, Object o2) { return false; }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.txt
deleted file mode 100644
index 33eb51e63ca..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="EqualsHashCode"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public static class Example1 {
-    public int hashCode() {
-        // code
-    }
-    public boolean equals(String o) { // violation, overloaded implementation of 'equals'
-        // code
-    }
-}
-public static class Example2 {
-    public boolean equals(Object o) { // violation, no 'hashCode'
-        // code
-    }
-    public boolean equals(String o) {
-        // code
-    }
-}
-public static class Example3 {
-    public int hashCode() {
-        // code
-    }
-    public boolean equals(Object o) { // OK
-        // code
-    }
-    public boolean equals(String o) {
-        // code
-    }
-}
-public static class Example4 {
-    public int hashCode() {
-        // code
-    }
-    public boolean equals(java.lang.Object o) { // OK
-        // code
-   }
-}
-public static class Example5 {
-    public static int hashCode(int i) {
-        // code
-    }
-    public boolean equals(Object o) { // violation, overloaded implementation of 'hashCode'
-        // code
-    }
-}
-public static class Example6 {
-    public int hashCode() { // violation, overloaded implementation of 'equals'
-        // code
-    }
-    public static boolean equals(Object o, Object o2) {
-        // code
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example1.java
index acff087cb2d..c173b75a818 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example1.java
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example1.java
@@ -18,7 +18,7 @@ public void foo() throws Exception {
       switch (i) {
         case 1:
           i++;
-        case 2: // violation 'Fall through from previous branch of the switch'
+        case 2: // violation 'Fall\ through from previous branch of the switch'
           i++;
           break;
         case 3:
@@ -29,7 +29,7 @@ public void foo() throws Exception {
           throw new Exception();
         case 5:
           i++; // no break by design
-        case 6: // violation 'Fall through from previous branch of the switch'
+        case 6: // violation 'Fall\ through from previous branch of the switch'
         case 7:
           i++;
           continue;
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example2.java
index 80a701c7600..eafa329b281 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example2.java
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example2.java
@@ -20,7 +20,7 @@ public void foo() throws Exception {
       switch (i) {
         case 1:
           i++;
-        case 2: // violation 'Fall through from previous branch of the switch'
+        case 2: // violation 'Fall\ through from previous branch of the switch'
           i++;
           break;
         case 3:
@@ -31,11 +31,11 @@ public void foo() throws Exception {
           throw new Exception();
         case 5:
           i++; // no break by design
-        case 6: // violation 'Fall through from previous branch of the switch'
+        case 6: // violation 'Fall\ through from previous branch of the switch'
         case 7:
           i++;
           continue;
-        case 11: // violation 'Fall through from the last branch of the switch'
+        case 11: // violation 'Fall\ through from the last branch of the switch'
           i++;
       }
     }
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example3.java
index f5b61221b9b..ed84cb1c541 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example3.java
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/fallthrough/Example3.java
@@ -20,7 +20,7 @@ public void foo() throws Exception {
       switch (i) {
         case 1:
           i++;
-        case 2: // violation 'Fall through from previous branch of the switch'
+        case 2: // violation 'Fall\ through from previous branch of the switch'
           i++;
           break;
         case 3:
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.java
new file mode 100644
index 00000000000..c570eaa4658
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="IllegalTokenText">
+      <property name="tokens" value="STRING_LITERAL"/>
+      <property name="format" value="a href"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+// xdoc section -- start
+public class Example1 {
+  public void myTest() {
+    String test  = "a href"; // violation
+    String test2 = "A href"; // OK, case is sensitive
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.txt
deleted file mode 100644
index 793324a8509..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="IllegalTokenText">
-      <property name="tokens" value="STRING_LITERAL"/>
-      <property name="format" value="a href"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public void myTest() {
-    String test = "a href"; // violation
-    String test2 = "A href"; // OK, case is sensitive
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.java
new file mode 100644
index 00000000000..bbae3b7feea
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="IllegalTokenText">
+      <property name="tokens" value="STRING_LITERAL"/>
+      <property name="format" value="a href"/>
+      <property name="ignoreCase" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+// xdoc section -- start
+public class Example2 {
+  public void myTest() {
+    String test  = "a href"; // violation
+    String test2 = "A href"; // violation
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.txt
deleted file mode 100644
index 51de44fd584..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="IllegalTokenText">
-      <property name="tokens" value="STRING_LITERAL"/>
-      <property name="format" value="a href"/>
-      <property name="ignoreCase" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public void myTest() {
-    String test = "a href"; // violation
-    String test2 = "A href"; // violation, case is ignored
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.txt
deleted file mode 100644
index 2c64d1ddbdc..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="IllegalTokenText">
-        <property name="tokens" value="TEXT_BLOCK_CONTENT"/>
-        <property name="format" value='"'/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public void myTest() {
-    final String quote = """
-               \""""; // violation
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.java
new file mode 100644
index 00000000000..c49afd67da1
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.java
@@ -0,0 +1,26 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="IllegalTokenText">
+      <property name="tokens" value="NUM_INT,NUM_LONG"/>
+      <property name="format" value="^0[^lx]"/>
+      <property name="ignoreCase" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltokentext;
+
+// xdoc section -- start
+public class Example4 {
+  public void myTest() {
+    int test1 = 0; // OK
+    int test2 = 0x111; // OK
+    int test3 = 0X111; // OK, case is ignored
+    int test4 = 010; // violation
+    long test5 = 0L; // OK
+    long test6 = 010L; // violation
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.txt
deleted file mode 100644
index dbfec37fdf0..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="IllegalTokenText">
-      <property name="tokens" value="NUM_INT,NUM_LONG"/>
-      <property name="format" value="^0[^lx]"/>
-      <property name="ignoreCase" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public void myTest() {
-    int test1 = 0; // OK
-    int test2 = 0x111; // OK
-    int test3 = 0X111; // OK, case is ignored
-    int test4 = 010; // violation
-    long test5 = 0L; // OK
-    long test6 = 010L; // violation
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.java
new file mode 100644
index 00000000000..e57370a92fd
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.java
@@ -0,0 +1,57 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InnerAssignment"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.innerassignment;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+// xdoc section -- start
+public class Example1 {
+  void foo() throws IOException {
+    int a, b;
+    a = b = 5; // violation
+    a = b += 5; // violation
+
+    a = 5;
+    b = 5;
+    a = 5; b = 5;
+
+    double myDouble;
+    double[] doubleArray = new double[] {myDouble = 4.5, 15.5}; // violation
+
+    String nameOne;
+    List<String> myList = new ArrayList<String>();
+    myList.add(nameOne = "tom"); // violation
+
+    for (int k = 0; k < 10; k = k + 2) {
+        // some code
+    }
+
+    boolean someVal;
+    if (someVal = true) { // violation
+        // some code
+    }
+
+    while (someVal = false) {} // violation
+
+    InputStream is = new FileInputStream("textFile.txt");
+    while ((b = is.read()) != -1) { // OK, this is a common idiom
+        // some code
+    }
+  }
+
+  boolean testMethod() {
+    boolean val;
+    return val = true; // violation
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.txt
deleted file mode 100644
index 20054b3fac7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="InnerAssignment"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-
-  void foo() {
-    int a, b;
-    a = b = 5; // violation, assignment to each variable should be in a separate statement
-    a = b += 5; // violation
-
-    a = 5; // OK
-    b = 5; // OK
-    a = 5; b = 5; // OK
-
-    double myDouble;
-    double[] doubleArray = new double[] {myDouble = 4.5, 15.5}; // violation
-
-    String nameOne;
-    List<String> myList = new ArrayList<String>();
-    myList.add(nameOne = "tom"); // violation
-
-    for (int k = 0; k < 10; k = k + 2) { // OK
-      // some code
-    }
-
-    boolean someVal;
-    if (someVal = true) { // violation
-      // some code
-    }
-
-    while (someVal = false) {} // violation
-
-    InputStream is = new FileInputStream("textFile.txt");
-    while ((b = is.read()) != -1) { // OK, this is a common idiom
-      // some code
-    }
-  }
-
-  boolean testMethod() {
-    boolean val;
-    return val = true; // violation
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example1.txt
index e79e5db8bae..05c26fe9154 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example1.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example1.txt
@@ -8,8 +8,10 @@
 
 // xdoc section -- start
 public void foo(int i) {}
+// comments between overloaded methods are allowed.
 public void foo(String s) {}
 public void foo(String s, int i) {}
 public void foo(int i, String s) {}
 public void notFoo() {}
+private interface ExampleInterface() {}
 // xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example2.txt
index 41156b571c2..c803cf5020c 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example2.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example2.txt
@@ -8,8 +8,10 @@
 
 // xdoc section -- start
 public void foo(int i) {} // OK
+// comments between overloaded methods are allowed.
 public void foo(String s) {} // OK
 public void notFoo() {} // violation. Have to be after foo(String s, int i)
 public void foo(int i, String s) {}
-public void foo(String s, int i) {}
+private interface ExampleInterface() {}
+public void foo(String s, int i) {} // violation. Have to be after foo(int i, String s)
 // xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.java
new file mode 100644
index 00000000000..eca942e7cee
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.java
@@ -0,0 +1,45 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterAssignment"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.parameterassignment;
+
+
+import java.util.function.IntBinaryOperator;
+import java.util.function.IntPredicate;
+
+// xdoc section -- start
+class Example1 {
+  int methodOne(int parameter) {
+    if (parameter <= 0 ) {
+      throw new IllegalArgumentException("A positive value is expected");
+    }
+    parameter -= 2;  // violation
+    return parameter;
+  }
+
+  int methodTwo(int parameter) {
+    if (parameter <= 0 ) {
+      throw new IllegalArgumentException("A positive value is expected");
+    }
+    int local = parameter;
+    local -= 2;  // OK
+    return local;
+  }
+
+  IntPredicate obj = a -> ++a == 12; // violation
+  IntBinaryOperator obj2 = (int a, int b) -> {
+    a++;     // violation
+    b += 12; // violation
+    return a + b;
+  };
+  IntPredicate obj3 = a -> {
+    int b = a; // ok
+    return ++b == 12;
+  };
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.txt
deleted file mode 100644
index a2f555725a9..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterAssignment"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  int methodOne(int parameter) {
-    if (parameter <= 0 ) {
-      throw new IllegalArgumentException("A positive value is expected");
-    }
-    parameter -= 2;  // violation
-    return parameter;
-  }
-
-  int methodTwo(int parameter) {
-    if (parameter <= 0 ) {
-      throw new IllegalArgumentException("A positive value is expected");
-    }
-    int local = parameter;
-    local -= 2;  // OK
-    return local;
-  }
-
-  IntPredicate obj = a -> ++a == 12; // violation
-  IntBinaryOperator obj2 = (int a, int b) -> {
-      a++;     // violation
-      b += 12; // violation
-      return a + b;
-  };
-  IntPredicate obj3 = a -> {
-      int b = a; // ok
-      return ++b == 12;
-  };
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.java
new file mode 100644
index 00000000000..5c5cef02b5f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.java
@@ -0,0 +1,35 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuperClone"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.superclone;
+
+// xdoc section -- start
+class Example1 {
+  public Object clone() throws CloneNotSupportedException {
+    return super.clone();
+  }
+}
+
+class SuperCloneB {
+  private int b;
+
+  // violation below, "Method 'clone' should call 'super.clone'."
+  public SuperCloneB clone() {
+    SuperCloneB other = new SuperCloneB();
+    other.b = this.b;
+    return other;
+  }
+}
+
+class SuperCloneC {
+
+  public SuperCloneC clone() throws CloneNotSupportedException {
+    return (SuperCloneC) super.clone();
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.txt
deleted file mode 100644
index 4466cea0fcd..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="SuperClone"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class A {
-
- public Object clone() { // OK
-  return super.clone();
- }
-}
-
-class B {
-private int b;
-
- public B clone() { // violation, does not call super.clone()
-  B other = new B();
-  other.b = this.b;
-  return other;
- }
-}
-
-class C {
-
- public C clone() { // OK
-  return (C) super.clone();
- }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.java
new file mode 100644
index 00000000000..6405395b4bd
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.java
@@ -0,0 +1,60 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UnnecessaryParentheses"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.unnecessaryparentheses;
+
+import java.util.List;
+
+// xdoc section -- start
+class Example1 {
+
+  public int square(int a, int b) {
+    // violation below, 'Unnecessary parentheses around assignment right-hand side'
+    int square = (a * b);
+    // violation below, 'Unnecessary parentheses around identifier 'square''
+    return (square);
+  }
+
+  int sumOfSquares = 0;
+  public void sumOfSquares() {
+    // violation below, 'Unnecessary parentheses around literal '0''
+    for (int i = (0); i < 10; i++) {
+      // violation below, 'Unnecessary parentheses around assignment right-hand side'
+      int x = (i + 1);
+      sumOfSquares += (square(x,x));  // 2 violations
+    }
+  }
+
+  List<String> myList = List.of("a1", "b1", "c1");
+  public void filter() {
+    myList.stream()
+        // violation below, 'Unnecessary parentheses around lambda value'
+        .filter((s) -> s.startsWith("c"))
+            .forEach(System.out::println);
+  }
+
+  int a = 10, b = 12, c = 15;
+  boolean x = true, y = false, z = true;
+  public void test() {
+    // 3 violations below
+    if ((a >= 0 && b <= 9) || (c >= 5 && b <= 5) || (c >= 3 && a <= 7)) {
+      return;
+    }
+    // violation below, 'Unnecessary parentheses around expression'
+    if ((-a) != -27 && b > 5) {
+      return;
+    }
+    if (x == (a <= 15)) {
+      return;
+    }
+    if (x == (y == z)) {
+      return;
+    }
+  }
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.txt
deleted file mode 100644
index 5dcaadd7705..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UnnecessaryParentheses"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public int square(int a, int b){
-  int square = (a * b); // violation
-  return (square);      // violation
-}
-int sumOfSquares = 0;
-for(int i=(0); i<10; i++){          // violation
-  int x = (i + 1);                  // violation
-  sumOfSquares += (square(x * x));  // violation
-}
-double num = (10.0); //violation
-List<String> list = Arrays.asList("a1", "b1", "c1");
-myList.stream()
-  .filter((s) -> s.startsWith("c")) // violation
-  .forEach(System.out::println);
-int a = 10, b = 12, c = 15;
-boolean x = true, y = false, z= true;
-if ((a >= 0 && b <= 9)            // violation, unnecessary parenthesis
-         || (c >= 5 && b <= 5)    // violation, unnecessary parenthesis
-         || (c >= 3 && a <= 7)) { // violation, unnecessary parenthesis
-    return;
-}
-if ((-a) != -27 // violation, unnecessary parenthesis
-         && b > 5) {
-    return;
-}
-if (x==(a <= 15)) { // ok
-    return;
-}
-if (x==(y == z)) { // ok
-    return;
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.java
new file mode 100644
index 00000000000..9f3bbcca833
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.java
@@ -0,0 +1,39 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UnnecessaryParentheses">
+      <property name="tokens" value="BOR, BAND, BXOR" />
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.unnecessaryparentheses;
+
+// xdoc section -- start
+class Example2 {
+
+  void method() {
+    int x = 9, y = 8;
+    // violation below, 'Unnecessary parentheses around expression'
+    if (x >= 0 ^ (x <= 8 & y <= 11)
+         ^ y >= 8) {
+      return;
+    }
+    if (x >= 0 ^ x <= 8 & y <= 11 ^ y >= 8) {
+      return;
+    }
+    // violation below, 'Unnecessary parentheses around expression'
+    if (x >= 0 || (x <= 8 & y <= 11)
+        && y >= 8) {
+      return;
+    }
+    if (x >= 0 || x <= 8 & y <= 11 && y >= 8) {
+      return;
+    }
+    if (x >= 0 & (x <= 8 ^ y <= 11) & y >= 8) {
+      return;
+    }
+  }
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.txt
deleted file mode 100644
index d988ac30211..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UnnecessaryParentheses">
-      <property name="tokens" value="BOR, BAND, BXOR" />
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-
-    void method() {
-        int x = 9, y = 8;
-        if(x>= 0 ^ (x<=8 & y<=11) // violation, unnecessary parenthesis
-            ^ y>=8) {
-            return;
-        }
-         if(x>= 0 ^ x<=8 & y<=11 ^ y>=8) { // ok
-            return;
-        }
-        if(x>= 0 || (x<=8 & y<=11) // violation, unnecessary parenthesis
-            && y>=8) {
-            return;
-        }
-        if(x>= 0 || x<=8 & y<=11 && y>=8) { // ok
-            return;
-        }
-        if(x>= 0 & (x<=8 ^ y<=11) & y>=8) { // ok
-            return;
-        }
-    }
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.java
new file mode 100644
index 00000000000..c52d57dafba
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.unnecessarysemicolonafteroutertypedeclaration;
+
+// xdoc section -- start
+class Example1 {
+  class Nested {
+
+  }; // OK, nested type declarations are ignored
+
+}; // violation
+
+interface B {
+
+}; // violation
+
+enum C {
+
+}; // violation
+
+@interface D {
+
+}; // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.txt
deleted file mode 100644
index 86200d3a7a1..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class A {
-
-   class Nested {
-
-   }; // OK, nested type declarations are ignored
-
-}; // violation
-
-interface B {
-
-}; // violation
-
-enum C {
-
-}; // violation
-
-{@literal @}interface D {
-
-}; // violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.java
new file mode 100644
index 00000000000..add82d79350
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.java
@@ -0,0 +1,33 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UnnecessarySemicolonAfterOuterTypeDeclaration">
+      <property name="tokens" value="CLASS_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.coding.unnecessarysemicolonafteroutertypedeclaration;
+
+// xdoc section -- start
+class Example2 {
+  class Nested {
+
+  }; // OK, nested type declarations are ignored
+
+}; // violation
+
+interface T {
+
+};
+
+enum U {
+
+};
+
+@interface V {
+
+};
+// xdoc section -- end
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.txt
deleted file mode 100644
index d3fda0c532a..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UnnecessarySemicolonAfterOuterTypeDeclaration">
-      <property name="tokens" value="CLASS_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class A {
-
-}; // violation
-
-interface B {
-
-}; // OK
-
-enum C {
-
-}; // OK
-
-{@literal @}interface D {
-
-}; // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.java
new file mode 100644
index 00000000000..1193f19c807
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.java
@@ -0,0 +1,59 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UnusedLocalVariable"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.coding.unusedlocalvariable;
+
+import java.io.*;
+import java.util.function.Predicate;
+// xdoc section -- start
+class Example1 {
+  {
+    int k = 12; // violation, assign and update but never use 'k'
+    k++;
+  }
+
+  int a;
+  Example1(int a) { // ok, as 'a' is a constructor parameter not a local variable
+    this.a = 12;
+  }
+
+  void method(int b) {
+    int[] arr = {1, 2, 3};  // violation, unused local variable 'arr'
+    int[] anotherArr = {1}; // ok, 'anotherArr' is accessed
+    anotherArr[0] = 4;
+  }
+
+  String convertValue(String newValue) {
+    String s = newValue.toLowerCase(); // violation, unused local variable 's'
+    return newValue.toLowerCase();
+  }
+
+  void read() throws IOException {
+    BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+    String s; // violation, unused local variable 's'
+    while ((s = reader.readLine()) != null) {}
+    try (BufferedReader reader1 = // ok, 'reader1' is a resource
+                 new BufferedReader(new FileReader("abc.txt"))) {}
+    try {
+    } catch (Exception e) { // ok, 'e' is an exception parameter
+    }
+  }
+
+  void loops() {
+    int j = 12;
+    for (int i = 0; j < 11; i++) { // violation, unused local variable 'i'
+    }
+    for (int p = 0; j < 11; p++)   // ok, 'p' is used
+      p /= 2;
+  }
+
+  void lambdas() {
+    Predicate<String> obj = (String str) -> true; // ok, 'str' is a lambda parameter
+    obj.test("Test");
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.txt
deleted file mode 100644
index 21f50a21b82..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UnusedLocalVariable"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-
-    int a;
-
-    {
-        int k = 12; // violation, assigned and updated but never used
-        k++;
-    }
-
-    Test(int a) {   // ok as 'a' is a constructor parameter not a local variable
-        this.a = 12;
-    }
-
-    void method(int b) {
-        int a = 10;             // violation
-        int[] arr = {1, 2, 3};  // violation
-        int[] anotherArr = {1}; // ok
-        anotherArr[0] = 4;
-    }
-
-    String convertValue(String newValue) {
-        String s = newValue.toLowerCase(); // violation
-        return newValue.toLowerCase();
-    }
-
-    void read() throws IOException {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-        String s; // violation
-        while ((s = reader.readLine()) != null) {
-        }
-        try (BufferedReader reader1 // ok as 'reader1' is a resource and resources are closed
-                                    // at the end of the statement
-            = new BufferedReader(new FileReader("abc.txt"))) {
-        }
-        try {
-        } catch (Exception e) {     // ok as e is an exception parameter
-        }
-    }
-
-    void loops() {
-        int j = 12;
-        for (int i = 0; j < 11; i++) { // violation, unused local variable 'i'.
-        }
-        for (int p = 0; j < 11; p++)   // ok
-            p /= 2;
-    }
-
-    void lambdas() {
-        Predicate<String> obj = (String str) -> { // ok as 'str' is a lambda parameter
-            return true;
-        };
-        obj.test("test");
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.java
new file mode 100644
index 00000000000..e466a375155
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.java
@@ -0,0 +1,46 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="DesignForExtension"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.design.designforextension;
+
+// xdoc section -- start
+public abstract class Example1 {
+  private int bar;
+
+  public int m1() {return 2;}  // violation
+
+  public int m2() {return 8;}  // violation
+
+  private void m3() {m4();}  // OK. Private method.
+
+  protected void m4() { }  // OK. No implementation.
+
+  public abstract void m5();  // OK. Abstract method.
+
+  /**
+   * This implementation ...
+   @return some int value.
+   */
+  public int m6() {return 1;}  // OK. Have javadoc on overridable method.
+
+  /**
+   * Some comments ...
+   */
+  public int m7() {return 1;}  // OK. Have javadoc on overridable method.
+
+  /**
+   * This
+   * implementation ...
+   */
+  public int m8() {return 2;}  // OK. Have javadoc on overridable method.
+
+  @Override                   // violation
+  public String toString() {
+    return "";
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.txt
deleted file mode 100644
index a3f4321d8f3..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="DesignForExtension"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}  // OK. Private method.
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // OK. Have javadoc on overridable method.
-
-  @Override
-  public String toString() {  // Violation. No javadoc for @Override method.
-    return "";
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.java
new file mode 100644
index 00000000000..266965c8fb9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.java
@@ -0,0 +1,48 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="DesignForExtension">
+      <property name="ignoredAnnotations" value="Override"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.design.designforextension;
+
+// xdoc section -- start
+public abstract class Example2 {
+  private int bar;
+
+  public int m1() {return 2;}  // violation
+
+  public int m2() {return 8;}  // violation
+
+  private void m3() {m4();}  // OK. Private method.
+
+  protected void m4() { }  // OK. No implementation.
+
+  public abstract void m5();  // OK. Abstract method.
+
+  /**
+   * This implementation ...
+   @return some int value.
+   */
+  public int m6() {return 1;}  // OK. Have javadoc on overridable method.
+
+  /**
+   * Some comments ...
+   */
+  public int m7() {return 1;}  // OK. Have javadoc on overridable method.
+
+  /**
+   * This
+   * implementation ...
+   */
+  public int m8() {return 2;}  // OK. Have javadoc on overridable method.
+
+  @Override
+  public String toString() {
+    return "";
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.txt
deleted file mode 100644
index aede49ef506..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="DesignForExtension">
-      <property name="ignoredAnnotations" value="Override"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}  // OK. Private method.
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // OK. Have javadoc on overridable method.
-
-  @Override
-  public String toString() {  // OK. Have javadoc on overridable method.
-    return "";
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.java
new file mode 100644
index 00000000000..58d04587272
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.java
@@ -0,0 +1,48 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="DesignForExtension">
+      <property name="requiredJavadocPhrase" value="This implementation"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.design.designforextension;
+
+// xdoc section -- start
+public abstract class Example3 {
+  private int bar;
+
+  public int m1() {return 2;}  // violation
+
+  public int m2() {return 8;}  // violation
+
+  private void m3() {m4();}  // OK. Private method.
+
+  protected void m4() { }  // OK. No implementation.
+
+  public abstract void m5();  // OK. Abstract method.
+
+  /**
+   * This implementation ...
+   @return some int value.
+   */
+  public int m6() {return 1;}  // OK. Have required javadoc.
+
+  /**
+   * Some comments ...
+   */
+  public int m7() {return 1;}  // violation
+
+  /**
+   * This
+   * implementation ...
+   */
+  public int m8() {return 2;}  // violation
+
+  @Override                    // violation
+  public String toString() {
+    return "";
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.txt
deleted file mode 100644
index 8c0df7ce196..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="DesignForExtension">
-      <property name="requiredJavadocPhrase" value="This implementation"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}  // OK. Private method.
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have required javadoc.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // Violation. No required javadoc.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // Violation. No required javadoc.
-
-  @Override
-  public String toString() {  // Violation. No required javadoc.
-    return "";
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.java
new file mode 100644
index 00000000000..79344e09403
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.java
@@ -0,0 +1,49 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="DesignForExtension">
+      <property name="requiredJavadocPhrase"
+        value="This[\s\S]*implementation"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.design.designforextension;
+
+// xdoc section -- start
+public abstract class Example4 {
+  private int bar;
+
+  public int m1() {return 2;}  // violation
+
+  public int m2() {return 8;}  // violation
+
+  private void m3() {m4();}
+
+  protected void m4() { }  // OK. No implementation.
+
+  public abstract void m5();  // OK. Abstract method.
+
+  /**
+   * This implementation ...
+   @return some int value.
+   */
+  public int m6() {return 1;}  // OK. Have required javadoc.
+
+  /**
+   * Some comments ...
+   */
+  public int m7() {return 1;}  // violation
+
+  /**
+   * This
+   * implementation ...
+   */
+  public int m8() {return 2;}  // OK. Have required javadoc.
+
+  @Override                    // violation
+  public String toString() {
+    return "";
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.txt
deleted file mode 100644
index 0960da97139..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="DesignForExtension">
-      <property name="requiredJavadocPhrase"
-        value="This[\s\S]*implementation"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have required javadoc.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // Violation. No required javadoc.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // OK. Have required javadoc.
-
-  @Override
-  public String toString() {  // Violation. No required javadoc.
-    return "";
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/Example1.java
index 17d23a429a4..bf32e660adc 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/Example1.java
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/Example1.java
@@ -6,43 +6,53 @@
 </module>
 */
 
-// xdoc section -- start
-final class Example1 {
-  private Example1() { }
-}
+package com.puppycrawl.tools.checkstyle.checks.design.finalclass;
 
-class A { // violation, 'Class A should be declared as final.'
-  private A() { }
-}
+// xdoc section -- start
+public class Example1 { // ok, since it has a public constructor
 
-class B { // ok, since it has a public constructor
-  int field1;
-  String field2;
-  private B(int value) {
-    this.field1 = value;
-    this.field2 = " ";
+  final class A {
+    private A() {
+    }
   }
-  public B(String value) {
-    this.field2 = value;
-    this.field1 = 0;
+
+  class B { // violation, 'Class B should be declared as final.'
+    private B() {
+    }
   }
-}
 
-class TestAnonymousInnerClasses { // ok, class has an anonymous inner class.
-  public static final TestAnonymousInnerClasses ONE
-          = new TestAnonymousInnerClasses() {};
+  class C { // ok, since it has a public constructor
+    int field1;
+    String field2;
 
-  private TestAnonymousInnerClasses() {
+    private C(int value) {
+      this.field1 = value;
+      this.field2 = " ";
+    }
+
+    public C(String value) {
+      this.field2 = value;
+      this.field1 = 0;
+    }
   }
-}
 
-class Class1 {
+  class AnonymousInner { // ok, class has an anonymous inner class.
+    public final AnonymousInner ONE
+            = new AnonymousInner() {
+            };
 
-  private class Class2 { // violation, 'Class Class2 should be declared as final'
+    private AnonymousInner() {
+    }
   }
 
-  public class Class3 {
-  }
+  class Class1 {
 
+    private class Class2 { // violation, 'Class Class2 should be declared as final'
+    }
+
+    public class Class3 {
+    }
+
+  }
 }
 // xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.java
new file mode 100644
index 00000000000..0af95eb74bb
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.java
@@ -0,0 +1,41 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="HideUtilityClassConstructor"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
+
+// xdoc section -- start
+class Example1 { // violation
+
+  public Example1() {
+  }
+
+  public static void fun() {
+  }
+}
+
+class Foo { // OK
+
+  private Foo() {
+  }
+
+  static int n;
+}
+
+class Bar { // OK
+
+  protected Bar() {
+    // prevents calls from subclass
+    throw new UnsupportedOperationException();
+  }
+}
+
+class UtilityClass { // violation
+
+  static float f;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.txt
deleted file mode 100644
index fb5fca65047..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="HideUtilityClassConstructor"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test { // violation, class only has a static method and a constructor
-
-  public Test() {
-  }
-
-  public static void fun() {
-  }
-}
-
-class Foo { // OK
-
-  private Foo() {
-  }
-
-  static int n;
-}
-
-class Bar { // OK
-
-  protected Bar() {
-    // prevents calls from subclass
-    throw new UnsupportedOperationException();
-  }
-}
-
-class UtilityClass { // violation, class only has a static field
-
-  static float f;
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.java
new file mode 100644
index 00000000000..29d0ba51e71
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InnerTypeLast"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.design.innertypelast;
+
+// xdoc section -- start
+class Test1 {
+  private String s;
+  class InnerTest1 {}
+  public void test() {} // violation
+}
+
+class Test2 {
+  static {};
+  class InnerTest1 {}
+  public Test2() {} // violation
+}
+
+class Example1 {
+  private String s;
+  public void test() {}
+  class InnerTest1 {}
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.txt
deleted file mode 100644
index 0a3d564fa69..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="InnerTypeLast"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-    private String s; // OK
-    class InnerTest1 {}
-    public void test() {} // violation, method should be declared before inner types.
-}
-
-class Test2 {
-    static {}; // OK
-    class InnerTest1 {}
-    public Test2() {} // violation, constructor should be declared before inner types.
-}
-
-class Test3 {
-    private String s; // OK
-    public void test() {} // OK
-    class InnerTest1 {}
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.java
new file mode 100644
index 00000000000..6ba982a0a7a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InterfaceIsType"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.interfaceistype;
+
+// xdoc section -- start
+class Example1 {
+  // violation below, 'interfaces should describe a type and hence have methods.'
+  interface Test1 {
+    int a = 3;
+  }
+
+  // ok below, because marker interfaces are allowed by default.
+  interface Test2 {
+
+  }
+
+  interface Test3 { // ok, because it has a method.
+    int a = 3;
+    void test();
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.txt
deleted file mode 100644
index 7ca5a27eae8..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="InterfaceIsType"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public interface Test1 { // violation
-    int a = 3;
-}
-
-public interface Test2 { // OK
-
-}
-
-public interface Test3 { // OK
-    int a = 3;
-    void test();
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.java
new file mode 100644
index 00000000000..58cdd41032c
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InterfaceIsType">
+      <property name="allowMarkerInterfaces" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.interfaceistype;
+
+// xdoc section -- start
+class Example2 {
+  // violation below, 'interfaces should describe a type and hence have methods.'
+  interface Test1 {
+    int a = 3;
+  }
+
+  // violation below, 'interfaces should describe a type and hence have methods.'
+  interface Test2 {
+
+  }
+
+  interface Test3 { // ok, because it has a method.
+    int a = 3;
+    void test();
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.txt
deleted file mode 100644
index 335b213970a..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="InterfaceIsType">
-      <property name="allowMarkerInterfaces" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public interface Test1 { // violation
-    int a = 3;
-}
-
-public interface Test2 { // violation
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.java
new file mode 100644
index 00000000000..0a0bdc5ae53
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.java
@@ -0,0 +1,47 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MutableException"/>
+  </module>
+</module>
+*/
+
+
+
+package com.puppycrawl.tools.checkstyle.checks.design.mutableexception;
+
+// xdoc section -- start
+class Example1 extends Exception {
+  private int code; // OK, class name doesn't match with default pattern
+
+  public Example1() {
+    code = 1;
+  }
+}
+
+class FirstException extends Exception {
+  private int code; // violation
+
+  public FirstException() {
+    code = 2;
+  }
+}
+
+class FirstThrowable extends Throwable {
+  final int code; // OK
+  String message; // violation
+
+  public FirstThrowable(int code, String message) {
+    this.code = code;
+    this.message = message;
+  }
+}
+
+class FirstBadException extends java.lang.Exception {
+  int code; // violation
+
+  public FirstBadException(int code) {
+    this.code = code;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.txt
deleted file mode 100644
index ea11046ed2d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MutableException"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class FirstClass extends Exception {
-  private int code; // OK, class name doesn't match with default pattern
-
-  public FirstClass() {
-    code = 1;
-  }
-}
-
-class MyException extends Exception {
-  private int code; // violation, The field 'code' must be declared final
-
-  public MyException() {
-    code = 2;
-  }
-}
-
-class MyThrowable extends Throwable {
-  final int code; // OK
-  String message; // violation, The field 'message' must be declared final
-
-  public MyThrowable(int code, String message) {
-    this.code = code;
-    this.message = message;
-  }
-}
-
-class BadException extends java.lang.Exception {
-  int code; // violation, The field 'code' must be declared final
-
-  public BadException(int code) {
-    this.code = code;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.java
new file mode 100644
index 00000000000..8b287af9dd9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.java
@@ -0,0 +1,47 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MutableException">
+      <property name="format" value="^.*Exception$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.mutableexception;
+
+// xdoc section -- start
+class Example2 extends Exception {
+  private int code; // OK, class name doesn't match with given pattern
+
+  public Example2() {
+    code = 1;
+  }
+}
+
+class SecondException extends Exception {
+  private int code; // violation
+
+  public SecondException() {
+    code = 2;
+  }
+}
+
+class SecondThrowable extends Throwable {
+  final int code; // OK, class name doesn't match with given pattern
+  String message; // OK, class name doesn't match with given pattern
+
+  public SecondThrowable(int code, String message) {
+    this.code = code;
+    this.message = message;
+  }
+}
+
+class SecondBadException extends java.lang.Exception {
+  int code; // violation
+
+  public SecondBadException(int code) {
+    this.code = code;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.txt
deleted file mode 100644
index 876e50fff03..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MutableException">
-      <property name="format" value="^.*Exception$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class FirstClass extends Exception {
-  private int code; // OK, class name doesn't match with given pattern
-
-  public FirstClass() {
-    code = 1;
-  }
-}
-
-class MyException extends Exception {
-  private int code; // violation, The field 'code' must be declared final
-
-  public MyException() {
-    code = 2;
-  }
-}
-
-class MyThrowable extends Throwable {
-  final int code; // OK, class name doesn't match with given pattern
-  String message; // OK, class name doesn't match with given pattern
-
-  public MyThrowable(int code, String message) {
-    this.code = code;
-    this.message = message;
-  }
-}
-
-class BadException extends java.lang.Exception {
-  int code; // violation, The field 'code' must be declared final
-
-  public BadException(int code) {
-    this.code = code;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.java
new file mode 100644
index 00000000000..1722390c5e7
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.java
@@ -0,0 +1,47 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MutableException">
+      <property name="extendedClassNameFormat" value="^.*Throwable$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.design.mutableexception;
+
+// xdoc section -- start
+class Example3 extends Exception {
+  private int code; // OK, extended class name doesn't match with given pattern
+
+  public Example3() {
+    code = 1;
+  }
+}
+
+class ThirdException extends Exception {
+  private int code; // OK, extended class name doesn't match with given pattern
+
+  public ThirdException() {
+    code = 2;
+  }
+}
+
+class ThirdThrowable extends Throwable {
+  final int code; // OK
+  String message; // violation
+
+  public ThirdThrowable(int code, String message) {
+    this.code = code;
+    this.message = message;
+  }
+}
+
+class ThirdBadException extends java.lang.Exception {
+  int code; // OK, extended class name doesn't match with given pattern
+
+  public ThirdBadException(int code) {
+    this.code = code;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.txt
deleted file mode 100644
index b2142767ebb..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MutableException">
-      <property name="extendedClassNameFormat" value="^.*Throwable$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class FirstClass extends Exception {
-  private int code; // OK, extended class name doesn't match with given pattern
-
-  public FirstClass() {
-    code = 1;
-  }
-}
-
-class MyException extends Exception {
-  private int code; // OK, extended class name doesn't match with given pattern
-
-  public MyException() {
-    code = 2;
-  }
-}
-
-class MyThrowable extends Throwable {
-  final int code; // OK
-  String message; // violation, The field 'message' must be declared final
-
-  public MyThrowable(int code, String message) {
-    this.code = code;
-    this.message = message;
-  }
-}
-
-class BadException extends java.lang.Exception {
-  int code; // OK, extended class name doesn't match with given pattern
-
-  public BadException(int code) {
-    this.code = code;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.java
new file mode 100644
index 00000000000..692b4bb57b5
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="FinalParameters"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.finalparameters;
+
+// xdoc section -- start
+public class Example1 {
+  public Example1() { }
+  public Example1(final int m) { }
+  public Example1(final int m, int n) { } // violation, 'n should be final'
+  public void methodOne(final int x) { }
+  public void methodTwo(int x) { } // violation, 'x should be final'
+  public static void main(String[] args) { } // violation, 'args should be final'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.txt
deleted file mode 100644
index 9857311cd4a..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="FinalParameters"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Point {
-  public Point() { } // ok
-  public Point(final int m) { } // ok
-  public Point(final int m,int n) { } // violation, n should be final
-  public void methodOne(final int x) { } // ok
-  public void methodTwo(int x) { } // violation, x should be final
-  public static void main(String[] args) { } // violation, args should be final
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.java
new file mode 100644
index 00000000000..af1aac4a734
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="FinalParameters">
+      <property name="tokens" value="CTOR_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.finalparameters;
+
+// xdoc section -- start
+public class Example2 {
+  public Example2() { }
+  public Example2(final int m) { }
+  public Example2(final int m, int n) { } // violation, 'n should be final'
+  public void methodOne(final int x) { }
+  public void methodTwo(int x) { }
+  public static void main(String[] args) { }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.txt
deleted file mode 100644
index 79c554d9fac..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="FinalParameters">
-      <property name="tokens" value="CTOR_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Point {
-  public Point() { } // ok
-  public Point(final int m) { } // ok
-  public Point(final int m,int n) { } // violation, n should be final
-  public void methodOne(final int x) { } // ok
-  public void methodTwo(int x) { } // ok
-  public static void main(String[] args) { } // ok
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.java
new file mode 100644
index 00000000000..a7f9efd2df4
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="FinalParameters">
+      <property name="ignorePrimitiveTypes" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.finalparameters;
+
+// xdoc section -- start
+public class Example3 {
+  public Example3() { }
+  public Example3(final int m) { }
+  public Example3(final int m, int n) { }
+  public void methodOne(final int x) { }
+  public void methodTwo(int x) { }
+  public static void main(String[] args) { } // violation, 'args should be final'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.txt
deleted file mode 100644
index 9809f3d0cca..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="FinalParameters">
-      <property name="ignorePrimitiveTypes" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Point {
-  public Point() { } // ok
-  public Point(final int m) { } // ok
-  public Point(final int m,int n) { } // ok
-  public void methodOne(final int x) { } // ok
-  public void methodTwo(int x) { } // ok
-  public static void main(String[] args) { } // violation, args should be final
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.java
new file mode 100644
index 00000000000..22734a90d1a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStarImport"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
+
+// xdoc section -- start
+import java.util.Scanner;
+import java.io.*;                 // violation
+import static java.lang.Math.*;   // violation
+import java.util.*;               // violation
+import java.net.*;                // violation
+// xdoc section -- end
+
+class Example1 {}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.txt
deleted file mode 100644
index b7fa82a74d2..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStarImport"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import java.util.Scanner;         // OK
-import java.io.*;                 // violation
-import static java.lang.Math.*;   // violation
-import java.util.*;               // violation
-import java.net.*;                // violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.java
new file mode 100644
index 00000000000..7b696bb15c0
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStarImport">
+      <property name="excludes" value="java.io,java.net,java.lang.Math"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
+
+// xdoc section -- start
+import java.util.Scanner;
+import java.io.*;
+import static java.lang.Math.*;
+import java.util.*;               // violation
+import java.net.*;
+// xdoc section -- end
+
+class Example2 {}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.txt
deleted file mode 100644
index 70a06ce068f..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStarImport">
-      <property name="excludes" value="java.io,java.net,java.lang.Math"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
-import static java.lang.Math.*;   // OK
-import java.util.*;               // violation
-import java.net.*;                // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.java
new file mode 100644
index 00000000000..eda6e21c357
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStarImport">
+      <property name="allowClassImports" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
+
+// xdoc section -- start
+import java.util.Scanner;
+import java.io.*;
+import static java.lang.Math.*;   // violation
+import java.util.*;
+import java.net.*;
+// xdoc section -- end
+
+class Example3 {}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.txt
deleted file mode 100644
index 046489d873c..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStarImport">
-      <property name="allowClassImports" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
-import static java.lang.Math.*;   // violation
-import java.util.*;               // OK
-import java.net.*;                // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.java
new file mode 100644
index 00000000000..1913cc78d32
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStarImport">
+      <property name="allowStaticMemberImports" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
+
+// xdoc section -- start
+import java.util.Scanner;
+import java.io.*;                 // violation
+import static java.lang.Math.*;
+import java.util.*;               // violation
+import java.net.*;                // violation
+// xdoc section -- end
+
+class Example4 {}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.txt
deleted file mode 100644
index 81340cd900d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStarImport">
-      <property name="allowStaticMemberImports" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import java.util.Scanner;         // OK
-import java.io.*;                 // violation
-import static java.lang.Math.*;   // OK
-import java.util.*;               // violation
-import java.net.*;                // violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.java
new file mode 100644
index 00000000000..f0dd34e6e65
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStarImport">
+      <property name="allowClassImports" value="true"/>
+      <property name="excludes" value="java.io,java.net"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
+
+// xdoc section -- start
+import java.util.Scanner;
+import java.io.*;
+import static java.lang.Math.*;   // violation
+import java.util.*;
+import java.net.*;
+// xdoc section -- end
+
+class Example5 {}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.txt
deleted file mode 100644
index fc5cb51851c..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStarImport">
-      <property name="allowClassImports" value="true"/>
-      <property name="excludes" value="java.io,java.net"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
-import static java.lang.Math.*;   // violation
-import java.util.*;               // OK
-import java.net.*;                // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.java
new file mode 100644
index 00000000000..a3ce575a174
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStarImport">
+      <property name="allowStaticMemberImports" value="true"/>
+      <property name="excludes" value="java.io,java.net"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
+
+// xdoc section -- start
+import java.util.Scanner;
+import java.io.*;
+import static java.lang.Math.*;
+import java.util.*;               // violation
+import java.net.*;
+// xdoc section -- end
+
+class Example6 {}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.txt
deleted file mode 100644
index 39b68646c8c..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStarImport">
-      <property name="allowStaticMemberImports" value="true"/>
-      <property name="excludes" value="java.io,java.net"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
-import static java.lang.Math.*;   // OK
-import java.util.*;               // violation
-import java.net.*;                // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.java
new file mode 100644
index 00000000000..f773d6eacd5
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.java
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStaticImport"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
+
+// xdoc section -- start
+import static java.lang.Math.pow;          // violation
+import static java.lang.System.*;          // violation
+import java.io.File;                       // OK
+import java.util.*;                        // OK
+// xdoc section -- end
+
+class Example1{}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.txt
deleted file mode 100644
index 654e4258e3d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStaticImport"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import static java.lang.Math.pow;          // violation
-import static java.lang.System.*;          // violation
-import java.io.File;                       // OK
-import java.util.*;                        // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.java
new file mode 100644
index 00000000000..0982cb03315
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AvoidStaticImport">
+      <property name="excludes" value="java.lang.System.out,java.lang.Math.*"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
+
+// xdoc section -- start
+import static java.lang.Math.*;            // OK
+import static java.lang.System.out;        // OK
+import static java.lang.Integer.parseInt;  // violation
+import java.io.*;                          // OK
+import java.util.*;                        // OK
+// xdoc section -- end
+
+class Example2{}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.txt
deleted file mode 100644
index 9097e277ef8..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AvoidStaticImport">
-      <property name="excludes" value="java.lang.System.out,java.lang.Math.*"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-import static java.lang.Math.*;            // OK
-import static java.lang.System.out;        // OK
-import static java.lang.Integer.parseInt;  // violation
-import java.io.*;                          // OK
-import java.util.*;                        // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example10.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example10.txt
index f917cf10b6c..29837b8bd15 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example10.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example10.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+        value="THIRD_PARTY_PACKAGE, SPECIAL_IMPORTS, STANDARD_JAVA_PACKAGE, STATIC"/>
       <property name="specialImportsRegExp" value="^javax\."/>
       <property name="standardPackageRegExp" value="^java\."/>
       <property name="sortImportsInGroupAlphabetically" value="true"/>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example12.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example12.txt
index e815a62312a..4ebc525eb77 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example12.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example12.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###SAME_PACKAGE(3)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
+        value="STATIC, SAME_PACKAGE(3), THIRD_PARTY_PACKAGE, STANDARD_JAVA_PACKAGE"/>
       <property name="thirdPartyPackageRegExp" value="^(com|org)\."/>
       <property name="standardPackageRegExp" value="^(java|javax)\."/>
     </module>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example15.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example15.txt
index 91fc170804c..1ebe3682fa1 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example15.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example15.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="SAME_PACKAGE(3)###THIRD_PARTY_PACKAGE###STATIC###SPECIAL_IMPORTS"/>
+        value="SAME_PACKAGE(3), THIRD_PARTY_PACKAGE, STATIC, SPECIAL_IMPORTS"/>
       <property name="specialImportsRegExp" value="^android\."/>
     </module>
   </module>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example2.txt
index c95f0921aa7..210e8803808 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example2.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example2.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE"/>
+        value="STATIC, STANDARD_JAVA_PACKAGE, THIRD_PARTY_PACKAGE"/>
     </module>
   </module>
 </module>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example3.txt
index 82c910f3c8d..de5a64718d2 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example3.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example3.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE"/>
+        value="STATIC, STANDARD_JAVA_PACKAGE, THIRD_PARTY_PACKAGE"/>
       <property name="standardPackageRegExp" value="^java\."/>
     </module>
   </module>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example4.txt
index b69650a5c32..833262489ab 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example4.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example4.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+        value="STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE"/>
       <property name="thirdPartyPackageRegExp" value="^com\."/>
     </module>
   </module>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example5.txt
index 3f546784493..c01a14e5483 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example5.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example5.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE"/>
+        value="STATIC, SPECIAL_IMPORTS, STANDARD_JAVA_PACKAGE"/>
       <property name="specialImportsRegExp" value="^org\."/>
     </module>
   </module>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example6.txt
index cf3a3fcc988..a5d3a7bff69 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example6.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example6.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+        value="STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE"/>
       <property name="specialImportsRegExp" value="^org\."/>
       <property name="thirdPartyPackageRegExp" value="^com\."/>
       <property name="separateLineBetweenGroups" value="true"/>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example7.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example7.txt
index 8fca2051058..48bfee32002 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example7.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example7.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+        value="STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE"/>
       <property name="specialImportsRegExp" value="^org\."/>
       <property name="thirdPartyPackageRegExp" value="^com\."/>
       <property name="separateLineBetweenGroups" value="false"/>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example8.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example8.txt
index b96564b1182..9d0f3081a0c 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example8.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example8.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/>
+        value="STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS"/>
       <property name="specialImportsRegExp" value="^org\."/>
       <property name="sortImportsInGroupAlphabetically" value="true"/>
       <property name="separateLineBetweenGroups" value="true"/>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example9.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example9.txt
index ab08b929a64..e12a376543e 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example9.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/customimportorder/Example9.txt
@@ -3,7 +3,7 @@
   <module name="TreeWalker">
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-        value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+        value="STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE"/>
       <property name="specialImportsRegExp" value="^org\."/>
       <property name="thirdPartyPackageRegExp" value="^com\."/>
       <property name="sortImportsInGroupAlphabetically" value="true"/>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.java
new file mode 100644
index 00000000000..e1f05e93855
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.java
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="RedundantImport"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.redundantimport;
+
+// xdoc section -- start
+import static com.puppycrawl.tools.checkstyle.checks.imports.redundantimport.Example1.*; // OK, static import
+import static java.lang.Integer.MAX_VALUE; // OK, static import
+
+// violation below, 'Redundant import from the same package'
+import com.puppycrawl.tools.checkstyle.checks.imports.redundantimport.Example1;
+import java.lang.String; // violation, "Redundant import from the java.lang package"
+import java.util.Scanner;
+import java.util.Scanner; // violation 'Duplicate import to line 18 - java.util.Scanner'
+
+public class Example1{ }
+// xdoc section -- end
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.txt
deleted file mode 100644
index 5ff16d28a26..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="RedundantImport"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-package Test;
-import static Test.MyClass.*; // OK, static import
-import static java.lang.Integer.MAX_VALUE; // OK, static import
-
-import Test.MyClass; // violation, imported from the same package as the current package
-import java.lang.String; // violation, the class imported is from the 'java.lang' package
-import java.util.Scanner; // OK
-import java.util.Scanner; // violation, it is a duplicate of another import
-public class MyClass{ };
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java
new file mode 100644
index 00000000000..59a70d1fd90
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java
@@ -0,0 +1,39 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UnusedImports"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
+
+// xdoc section -- start
+// limitation as it match field name in code
+import java.awt.Component; //OK
+
+// no ability to recognize what import is not used
+import static java.util.Map.copyOf; //OK
+import static java.util.Arrays.copyOf; //OK
+
+import java.lang.String; // violation
+
+import java.util.Stack;
+import java.util.Map;   // violation
+
+import java.util.List;
+import java.util.function.Function;
+
+import static java.lang.Integer.parseInt; // violation
+
+/**
+* {@link List}
+*/
+class Example1{
+  Stack stack = new Stack();
+  private Object Component;
+  int[] arr = {0,0};
+  int[] array = copyOf(arr , 1);
+  Function <String, Integer> stringToInteger = Integer::parseInt;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt
deleted file mode 100644
index 15a120e1723..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UnusedImports"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// limitation as it match field name in code
-import java.awt.Component; //OK
-
-// no ability to recognize what import is not used
-import static java.util.Map.copyOf; //OK
-import static java.util.Arrays.copyOf; //OK
-
-import java.lang.String; // violation
-
-import java.util.Stack;  // OK
-import java.util.Map;   // violation
-
-import java.util.List; // OK
-
-/**
-* @link List
-*/
-class MyClass{
-    Stack stack = new Stack();
-    private Object Component;
-    int[] arr = {0,0};
-    int[] array = copyOf(arr , 1);
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java
new file mode 100644
index 00000000000..c4e48958441
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java
@@ -0,0 +1,41 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UnusedImports">
+      <property name="processJavadoc" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
+
+// xdoc section -- start
+// limitation as it match field name in code
+import java.awt.Component; //OK
+
+// no ability to recognize what import is not used
+import static java.util.Map.copyOf; //OK
+import static java.util.Arrays.copyOf; //OK
+
+import java.lang.String; // violation
+
+import java.util.Stack;
+import java.util.Map;   // violation
+
+import java.util.List; // violation
+import java.util.function.Function;
+
+import static java.lang.Integer.parseInt; // violation
+
+/**
+* {@link List}
+*/
+class Example2{
+  Stack stack = new Stack();
+  private Object Component;
+  int[] arr = {0,0};
+  int[] array = copyOf(arr , 1);
+  Function <String, Integer> stringToInteger = Integer::parseInt;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt
deleted file mode 100644
index f218d6f0bdc..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UnusedImports">
-      <property name="processJavadoc" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// limitation as it match field name in code
-import java.awt.Component; //OK
-
-// no ability to recognize what import is not used
-import static java.util.Map.copyOf; //OK
-import static java.util.Arrays.copyOf; //OK
-
-import java.lang.String; // violation
-
-import java.util.Stack;  // OK
-import java.util.Map;   // violation
-
-import java.util.List; // violation
-
-/**
-* @link List
-*/
-class MyClass{
-    Stack stack = new Stack();
-    private Object Component;
-    int[] arr = {0,0};
-    int[] array = copyOf(arr , 1);
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.java
new file mode 100644
index 00000000000..d64bbcfa38e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.java
@@ -0,0 +1,58 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AtclauseOrder"/>
+  </module>
+</module>
+*/
+
+
+
+
+
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
+
+import java.io.Serializable;
+
+// xdoc section -- start
+/**
+* Some javadoc.
+*
+* @author Some javadoc.
+* @version Some javadoc.
+* @param Some javadoc.
+* @return Some javadoc.
+* @throws Some javadoc.
+* @exception Some javadoc.
+* @see Some javadoc.
+* @since Some javadoc.
+* @serial Some javadoc.
+* @serialField
+* @serialData
+*/
+public class Example1 {}
+
+class Valid1 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc. // violation
+ * @deprecated
+ * @see Some javadoc. // violation
+ */
+class Invalid1 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc. // violation
+ * @deprecated
+ * @see Some javadoc. // violation
+ * @author max // violation
+ */
+enum Test1 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.txt
deleted file mode 100644
index 707d711c678..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="AtclauseOrder"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-/**
-* Some javadoc. // OK
-*
-* @author Some javadoc. // OK
-* @version Some javadoc. // OK
-* @param Some javadoc. // OK
-* @return Some javadoc. // OK
-* @throws Some javadoc. // OK
-* @exception Some javadoc. // OK
-* @see Some javadoc. // OK
-* @since Some javadoc. // OK
-* @serial Some javadoc. // OK
-* @serialField // OK
-* @serialData // OK
-* @deprecated Some javadoc. // OK
-*/
-
-class Valid implements Serializable
-{
-}
-
-/**
-* Some javadoc.
-*
-* @since Some javadoc. // OK
-* @version Some javadoc. // Violation - wrong order
-* @deprecated
-* @see Some javadoc. // Violation - wrong order
-* @author Some javadoc. // Violation - wrong order
-*/
-
-class Invalid implements Serializable
-{
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example2.java
new file mode 100644
index 00000000000..542c4d9f0fd
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example2.java
@@ -0,0 +1,58 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AtclauseOrder">
+      <property name="tagOrder"
+                value="@author, @since, @version, @param, @return,
+                       @throws, @exception, @deprecated,
+                       @see, @serial, @serialField, @serialData"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
+
+import java.io.Serializable;
+
+// xdoc section -- start
+/**
+* Some javadoc.
+*
+* @author Some javadoc.
+* @version Some javadoc.
+* @param Some javadoc.
+* @return Some javadoc.
+* @throws Some javadoc.
+* @exception Some javadoc.
+* @see Some javadoc.
+* @since Some javadoc. // violation
+* @serial Some javadoc.
+* @serialField
+* @serialData
+*/
+public class Example2 {}
+
+class Valid2 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated
+ * @see Some javadoc.
+ */
+class Invalid2 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated Some javadoc.
+ * @see Some javadoc.
+ * @author max // violation
+ */
+enum Test2 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example3.java
new file mode 100644
index 00000000000..956c77a1581
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example3.java
@@ -0,0 +1,58 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="AtclauseOrder">
+      <property name="target" value="ENUM_DEF"/>
+      <property name="tagOrder"
+                value="@author, @since, @version, @param, @return,
+                       @throws, @exception, @deprecated,
+                       @see, @serial, @serialField, @serialData"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.javadoc.atclauseorder;
+
+import java.io.Serializable;
+
+// xdoc section -- start
+/**
+* Some javadoc.
+*
+* @author Some javadoc.
+* @version Some javadoc.
+* @param Some javadoc.
+* @return Some javadoc.
+* @throws Some javadoc.
+* @exception Some javadoc.
+* @see Some javadoc.
+* @since Some javadoc.
+* @serial Some javadoc.
+* @serialField
+* @serialData
+*/
+public class Example3 {}
+
+class Valid3 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated
+ * @see Some javadoc.
+ */
+class Invalid3 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated
+ * @see Some javadoc.
+ * @author Some javadoc. // violation
+ */
+enum Test3 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.java
new file mode 100644
index 00000000000..88638f13f06
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InvalidJavadocPosition"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.invalidjavadocposition;
+
+// xdoc section -- start
+@SuppressWarnings("serial")
+// violation below, 'Javadoc comment is placed in the wrong location'
+/**
+ * This comment looks like Javadoc but it is at an invalid location.
+ * Therefore, the text will not get into TestClass.html.
+ * And, the check will produce a violation.
+ */
+public class Example1 {
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.txt
deleted file mode 100644
index 764620dd8e2..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="InvalidJavadocPosition"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@SuppressWarnings("serial")
-/**
- * This comment looks like javadoc but it at an invalid location.
- * Therefore, the text will not get into TestClass.html and the check will produce a violation.
- */
-public class TestClass {
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.java
new file mode 100644
index 00000000000..8590c318530
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocBlockTagLocation"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocblocktaglocation;
+
+class Example1 {
+// xdoc section -- start
+/**
+ * Escaped tag &#64;version (OK)
+ * Plain text with {@code @see} (OK)
+ * A @custom tag (OK)
+ *
+ */
+// xdoc section -- end
+
+}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.txt
deleted file mode 100644
index 64d9d2e723d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocBlockTagLocation"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-/**
- * Escaped tag &#64;version (OK)
- * Plain text with {@code @see} (OK)
- * A @custom tag (OK)
- *
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.java
new file mode 100644
index 00000000000..aefc22513d7
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocBlockTagLocation">
+      <property name="tags" value="apiNote, implSpec, implNote"/>
+    </module>
+  </module>
+</module>
+*/
+
+
+
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocblocktaglocation;
+
+class Example2 {
+// xdoc section -- start
+// xdoc section -- end
+}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.txt
deleted file mode 100644
index c574c0ab470..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocBlockTagLocation">
-      <property name="tags" value="apiNote, implSpec, implNote"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-<module name="JavadocBlockTagLocation">
-  <!-- default tags -->
-  <property name="tags" value="author, deprecated, exception, hidden"/>
-  <property name="tags" value="param, provides, return, see, serial"/>
-  <property name="tags" value="serialData, serialField, since, throws"/>
-  <property name="tags" value="uses, version"/>
-  <!-- additional tags used in the project -->
-  <property name="tags" value="noinspection"/>
-</module>
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example3.java
new file mode 100644
index 00000000000..d57a7ae3a93
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example3.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocBlockTagLocation">
+      <!-- default tags -->
+      <property name="tags" value="author, deprecated, exception, hidden"/>
+      <property name="tags" value="param, provides, return, see, serial"/>
+      <property name="tags" value="serialData, serialField, since, throws"/>
+      <property name="tags" value="uses, version"/>
+      <!-- additional tags used in the project -->
+      <property name="tags" value="noinspection"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocblocktaglocation;
+
+public class Example3 {
+// xdoc section -- start
+// xdoc section -- end
+}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.java
new file mode 100644
index 00000000000..d188b553519
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.java
@@ -0,0 +1,29 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocContentLocation"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoccontentlocation;
+
+// xdoc section -- start
+class Example1 {
+
+  // violation below 'Javadoc content should start from the next line.'
+  /** This comment causes a violation because it starts from the first line
+   * and spans several lines.
+   */
+  private int field1;
+
+  /**
+   * This comment is OK because it starts from the second line.
+   */
+  private int field12;
+
+  /** This comment is OK because it is on the single-line. */
+  private int field3;
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.txt
deleted file mode 100644
index 8bb9f69d564..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocContentLocationCheck"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-/** This comment causes a violation because it starts from the first line
-  * and spans several lines.
-  */
-/**
-  * This comment is OK because it starts from the second line.
-  */
-/** This comment is OK because it is on the single-line. */
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.java
new file mode 100644
index 00000000000..9427153337a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.java
@@ -0,0 +1,31 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocContentLocation">
+      <property name="location" value="first_line"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoccontentlocation;
+
+// xdoc section -- start
+class Example2 {
+
+  /** This comment is OK because it starts on the first line.
+   * There may be additional text.
+   */
+  private int field1;
+
+  // violation below, 'Javadoc content should start from the same line.'
+  /**
+   * This comment causes a violation because it starts on the second line.
+   */
+  private int field2;
+
+  /** This single-line comment also is OK. */
+  private int field3;
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.txt
deleted file mode 100644
index e469428203e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocContentLocationCheck">
-      <property name="location" value="first_line"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-/** This comment is OK because it starts on the first line.
-   * There may be additional text.
-   */
-/**
-  * This comment causes a violation because it starts on the second line.
-  */
-/** This single-line comment also is OK. */
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.java
new file mode 100644
index 00000000000..74fa72b0166
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.java
@@ -0,0 +1,49 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocMissingLeadingAsterisk"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocmissingleadingasterisk;
+
+// xdoc section -- start
+/**
+ * Valid Java-style comment.
+ *
+ * <pre>
+ *   int value = 0;
+ * </pre>
+ */
+class JavaStyle {}
+
+/** Valid Scala-style comment.
+  * Some description here.
+  **/
+class ScalaStyle {}
+
+/** **
+  * Asterisks on first and last lines are optional.
+  * */
+class Asterisks {}
+
+/** No asterisks are required for single-line comments. */
+class SingleLine {}
+
+/**
+
+ */ // violation above, 'Javadoc line should start with leading asterisk'
+class BlankLine {}
+
+/** Wrapped
+    single-line comment */
+// violation above, 'Javadoc line should start with leading asterisk'
+class Wrapped {}
+
+/**
+  * <pre>
+    int value; // violation, 'Javadoc line should start with leading asterisk'
+  * </pre>
+  */
+class Example1 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.txt
deleted file mode 100644
index e440c5bbfe7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocMissingLeadingAsterisk"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-/**
- * Valid Java-style comment.
- *
- * <pre>
- *   int value = 0;
- * </pre>
- */
-class JavaStyle {} // ok
-
-/** Valid Scala-style comment.
-  * Some description here.
-  **/
-class ScalaStyle {} // ok
-
-/** **
-  * Asterisks on first and last lines are optional.
-  * */
-class Asterisks {} // ok
-
-/** No asterisks are required for single-line comments. */
-class SingleLine {} // ok
-
-/** // violation on next blank line, javadoc has lines without leading asterisk.
-
- */
-class BlankLine {}
-
-/** Wrapped
-    single-line comment */ // violation, javadoc has lines without leading asterisk.
-class Wrapped {}
-
-/**
-  * <pre>
-    int value; // violation, javadoc has lines without leading asterisk.
-  * </pre>
-  */
-class Code {}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/Example1.txt
index e1351801bb0..2211fe65168 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/Example1.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocstyle/Example1.txt
@@ -13,6 +13,16 @@ public class Test {
      */
     private void methodWithValidCommentStyle() {}
 
+    // ok below, @return tag automatically inserts a period after the text
+    /**
+     * {@return {@code true} if this object
+     * has been initialized, {@code false} otherwise}
+     */
+    private boolean isInitialized()
+    {
+       return true;
+    }
+
     /**
      * Some description here // violation, the sentence must end with a proper punctuation
      */
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.java
new file mode 100644
index 00000000000..01c7ea94056
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.java
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocVariable"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
+
+// xdoc section -- start
+public class Example1 {
+  private int a; // violation
+
+  /**
+   * Some description here
+   */
+  private int b;
+  protected int c; // violation
+  public int d; // violation
+  /*package*/ int e; // violation
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.txt
deleted file mode 100644
index 92da2e2d3ee..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocVariable"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-private int a; // violation, missing javadoc for private member
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // violation, missing javadoc for protected member
-public int d; // violation, missing javadoc for public member
-/*package*/ int e; // violation, missing javadoc for package member
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java
new file mode 100644
index 00000000000..e19d834316f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java
@@ -0,0 +1,24 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocVariable">
+      <property name="scope" value="public"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
+
+// xdoc section -- start
+public class Example2 {
+  private int a;
+
+  /**
+   * Some description here
+   */
+  private int b;
+  protected int c;
+  public int d; // violation
+  /*package*/ int e;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.txt
deleted file mode 100644
index a90726663e3..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocVariable">
-      <property name="scope" value="public"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-private int a; // OK
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // OK
-public int d; // violation, missing javadoc for public member
-/*package*/ int e; // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java
new file mode 100644
index 00000000000..dad03f68d39
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java
@@ -0,0 +1,25 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocVariable">
+      <property name="scope" value="private"/>
+      <property name="excludeScope" value="protected"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
+
+// xdoc section -- start
+public class Example3 {
+  private int a; // violation
+
+  /**
+   * Some description here
+   */
+  private int b;
+  protected int c;
+  public int d;
+  /*package*/ int e; // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.txt
deleted file mode 100644
index 741085ec04f..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocVariable">
-      <property name="scope" value="private"/>
-      <property name="excludeScope" value="protected"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-private int a; // violation, missing javadoc for private member
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // OK
-public int d; // OK
-/*package*/ int e; // violation, missing javadoc for package member
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.java
new file mode 100644
index 00000000000..6c3b70e1326
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.java
@@ -0,0 +1,24 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="JavadocVariable">
+      <property name="ignoreNamePattern" value="log|logger"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
+
+// xdoc section -- start
+public class Example4 {
+  private int a; // violation
+
+  /**
+   * Some description here
+  */
+  private int b;
+  protected int c; // violation
+  public int d; // violation
+  /*package*/ int e; // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.txt
deleted file mode 100644
index 5abc6656354..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="JavadocVariable">
-      <property name="ignoreNamePattern" value="log|logger"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test {
-private int a; // violation, missing javadoc for private member
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // violation, missing javadoc for protected member
-public int d; // violation, missing javadoc for public member
-/*package*/ int e; // violation, missing javadoc for package member
-private int log; // OK
-private int logger; // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example1.txt
index a0291de3582..f742f948e5b 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example1.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example1.txt
@@ -13,4 +13,14 @@ class Test
   /**
   * Some summary.
   *
+  * <code>@param</code> a Some description
+  * <code>@param</code> b
+  * <code>@deprecated</code>
+  * <code>@throws</code> Exception
+  * <code>@return</code>
+  */
+  public int method(String a, int b) throws Exception {
+    return 1;
+  }
+}
 // xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example2.txt
index ec2675d3e14..fa6aad0ab98 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example2.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/nonemptyatclausedescription/Example2.txt
@@ -15,4 +15,14 @@ class Test
   /**
   * Some summary.
   *
+  * <code>@param</code> a Some description
+  * <code>@param</code> b
+  * <code>@deprecated</code>
+  * <code>@throws</code> Exception
+  * <code>@return</code>
+  */
+  public int method(String a, int b) throws Exception {
+    return 1;
+  }
+}
 // xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.java
new file mode 100644
index 00000000000..c79309bd93b
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.java
@@ -0,0 +1,29 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="BooleanExpressionComplexity"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
+
+// xdoc section -- start
+public class Example1
+{
+  public static void main(String ... args)
+  {
+    boolean a = true;
+    boolean b = false;
+
+    boolean c = (a & b) | (b ^ a); // OK, 1(&) + 1(|) + 1(^) = 3 (max allowed 3)
+
+    boolean d = (a & b) | (b ^ a) | (a ^ b);
+    // violation above, 'Boolean expression complexity is 5 (max allowed is 3)'
+    // 1(&) + 1(|) + 1(^) + 1(|) + 1(^) = 5
+
+    boolean e = a ^ (a || b) ^ (b || a) & (a | b);
+    // violation above, 'Boolean expression complexity is 6 (max allowed is 3)'
+    // 1(^) + 1(||) + 1(^) + 1(||) + 1(&) + 1(|) = 6
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.txt
deleted file mode 100644
index c0018d13d96..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="BooleanExpressionComplexity"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test
-{
-  public static void main(String ... args)
-  {
-    boolean a = true;
-    boolean b = false;
-
-    boolean c = (a & b) | (b ^ a);       // OK, 1(&) + 1(|) + 1(^) = 3 (max allowed 3)
-
-    boolean d = (a & b) ^ (a || b) | a;  // violation, 1(&) + 1(^) + 1(||) + 1(|) = 4
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.java
new file mode 100644
index 00000000000..177d3374785
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="BooleanExpressionComplexity">
+      <property name="max" value="5"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
+
+// xdoc section -- start
+public class Example2
+{
+  public static void main(String ... args)
+  {
+    boolean a = true;
+    boolean b = false;
+
+    boolean c = (a & b) | (b ^ a); // OK, 1(&) + 1(|) + 1(^) = 3 (max allowed 5)
+
+    boolean d = (a & b) | (b ^ a) | (a ^ b);
+    // OK above, 1(&) + 1(|) + 1(^) + 1(|) + 1(^) = 5
+
+    boolean e = a ^ (a || b) ^ (b || a) & (a | b);
+    // violation above, 'Boolean expression complexity is 6 (max allowed is 5)'
+    // 1(^) + 1(||) + 1(^) + 1(||) + 1(&) + 1(|) = 6
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.txt
deleted file mode 100644
index e59eef791fa..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="BooleanExpressionComplexity">
-      <property name="max" value="5"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test
-{
-  public static void main(String ... args)
-  {
-    boolean a = true;
-    boolean b = false;
-
-    boolean c = (a & b) | (b ^ a) | (a ^ b);   // OK, 1(&) + 1(|) + 1(^) + 1(|) + 1(^) = 5
-
-    boolean d = (a | b) ^ (a | b) ^ (a || b) & b; // violation,
-                                                 // 1(|) + 1(^) + 1(|) + 1(^) + 1(||) + 1(&) = 6
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.java
new file mode 100644
index 00000000000..c88ff83b6d9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="BooleanExpressionComplexity">
+      <property name="tokens" value="BXOR,LAND,LOR"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.metrics.booleanexpressioncomplexity;
+
+// xdoc section -- start
+public class Example3
+{
+  public static void main(String ... args)
+  {
+    boolean a = true;
+    boolean b = false;
+
+    boolean c = (a & b) | (b ^ a); // OK, 1(^) = 1 (max allowed 3)
+
+    boolean d = (a & b) | (b ^ a) | (a ^ b);
+    // OK above, 1(^) + 1(^) = 2, & and | are ignored here
+
+    boolean e = a ^ (a || b) ^ (b || a) & (a | b);
+    // violation above, 'Boolean expression complexity is 4 (max allowed is 3)'
+    // 1(^) + 1(||) + 1(^) + 1(||) = 4, & and | are ignored here
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.txt
deleted file mode 100644
index dc767a3be11..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="BooleanExpressionComplexity">
-      <property name="tokens" value="BXOR,LAND,LOR"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test
-{
-  public static void main(String ... args)
-  {
-    boolean a = true;
-    boolean b = false;
-
-    boolean c = (!a && b) | (a || !b) ^ a;    // OK, 1(&&) + 1(||) + 1(^) = 3
-                                              // | is ignored here
-
-    boolean d = a ^ (a || b) ^ (b || a) & a; // violation, 1(^) + 1(||) + 1(^) + 1(||) = 4
-                                             // & is ignored here
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.java
new file mode 100644
index 00000000000..b9268f91140
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.java
@@ -0,0 +1,32 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="CatchParameterName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.catchparametername;
+
+// xdoc section -- start
+public class Example1 {
+  public void myTest() {
+    try {
+      throw new InterruptedException();
+    } catch (ArithmeticException e) {
+    } catch (ArrayIndexOutOfBoundsException ex) {
+    } catch (IndexOutOfBoundsException e123) {
+      // violation above, 'Name 'e123' must match pattern'
+    } catch (NullPointerException ab) {
+      // violation above, 'Name 'ab' must match pattern'
+    } catch (ArrayStoreException abc) {
+    } catch (InterruptedException aBC) {
+      // violation above, 'Name 'aBC' must match pattern'
+    } catch (RuntimeException abC) {
+    } catch (Exception EighthException) {
+      // violation above, 'Name 'EighthException' must match pattern'
+    } catch (Throwable t) {
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.txt
deleted file mode 100644
index 2800bdfa4ca..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="CatchParameterName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class MyTest {
-  public void myTest() {
-    try {
-      // ...
-    } catch (ArithmeticException e) { // OK
-      // ...
-    } catch (ArrayIndexOutOfBoundsException ex) { // OK
-      // ...
-    } catch (Throwable t) { // OK
-      // ...
-    } catch (IndexOutOfBoundsException e123) { // violation, digits
-                                               // not allowed
-      // ...
-    } catch (NullPointerException ab) { // violation, should have at least
-                                        // three characters if not e|t|ex
-      // ...
-    } catch (ArrayStoreException abc) { // OK
-      // ...
-    } catch (InterruptedException aBC) { // violation, first two characters
-                                         // should be in lowercase
-      // ...
-    } catch (RuntimeException abC) { // OK
-      // ...
-    } catch (Exception abCD) { // OK
-      // ...
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.java
new file mode 100644
index 00000000000..7d2d4b93689
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.java
@@ -0,0 +1,33 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="CatchParameterName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.catchparametername;
+
+// xdoc section -- start
+public class Example2 {
+  public void myTest() {
+    try {
+      throw new InterruptedException();
+    } catch (ArithmeticException e) {
+      // violation above, 'Name 'e' must match pattern'
+    } catch (ArrayIndexOutOfBoundsException ex) {
+    } catch (IndexOutOfBoundsException e123) {
+    } catch (NullPointerException ab) {
+    } catch (ArrayStoreException abc) {
+    } catch (InterruptedException aBC) {
+    } catch (RuntimeException abC) {
+    } catch (Exception EighthException) {
+      // violation above, 'Name 'EighthException' must match pattern'
+    } catch (Throwable t) {
+      // violation above, 'Name 't' must match pattern'
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.txt
deleted file mode 100644
index 5f54ad3f929..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="CatchParameterName">
-      <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class MyTest {
-  public void myTest() {
-    try {
-      // ...
-    } catch (ArithmeticException ex) { // OK
-      // ...
-    } catch (ArrayIndexOutOfBoundsException ex2) { // OK
-      // ...
-    } catch (IOException thirdException) { // OK
-      // ...
-    } catch (Exception FourthException) { // violation, the initial letter
-                                          // should be lowercase
-      // ...
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.java
new file mode 100644
index 00000000000..4749e73a3ee
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ClassTypeParameterName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.classtypeparametername;
+
+// xdoc section -- start
+class Example1 {
+  class MyClass1<T> {}
+  class MyClass2<t> {}        // violation
+  class MyClass3<abc> {}      // violation
+  class MyClass4<LISTENER> {} // violation
+  class MyClass5<RequestT> {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.txt
deleted file mode 100644
index 47797fbdb8d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ClassTypeParameterName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass1<T> {}        // OK
-class MyClass2<t> {}        // violation
-class MyClass3<abc> {}      // violation
-class MyClass4<LISTENER> {} // violation
-class MyClass5<RequestT> {} // violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.java
new file mode 100644
index 00000000000..d1c250f96c1
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ClassTypeParameterName">
+      <property name="format" value="^[A-Z]{2,}$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.classtypeparametername;
+
+// xdoc section -- start
+class Example2 {
+  class MyClass1<T> {}        // violation
+  class MyClass2<t> {}        // violation
+  class MyClass3<abc> {}      // violation
+  class MyClass4<LISTENER> {}
+  class MyClass5<RequestT> {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.txt
deleted file mode 100644
index bb398f2effd..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ClassTypeParameterName">
-      <property name="format" value="^[A-Z]{2,}$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass1<T> {}        // violation
-class MyClass2<t> {}        // violation
-class MyClass3<abc> {}      // violation
-class MyClass4<LISTENER> {} // OK
-class MyClass5<RequestT> {} // violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.java
new file mode 100644
index 00000000000..b826e1e4fac
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ClassTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.classtypeparametername;
+
+// xdoc section -- start
+class Example3 {
+  class MyClass1<T> {}
+  class MyClass2<t> {}        // violation
+  class MyClass3<abc> {}      // violation
+  class MyClass4<LISTENER> {} // violation
+  class MyClass5<RequestT> {}
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.txt
deleted file mode 100644
index 98b6dd1a378..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ClassTypeParameterName">
-      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass1<T> {}        // violation
-class MyClass2<t> {}        // violation
-class MyClass3<abc> {}      // violation
-class MyClass4<LISTENER> {} // violation
-class MyClass5<RequestT> {} // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.txt
deleted file mode 100644
index fd4c265c7aa..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="IllegalIdentifierName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class TestClass {
-    public static void main(String... args) {
-        var var = 4; // violation, "var" should not be used as an identifier.
-        int record = 15; // violation, "record" should not be used as an identifier.
-        String yield = "yield"; // violation, "yield" should not be used as an identifier.
-
-        record Record // violation, "Record" should not be used as an identifier.
-        (Record record) { // violation, "record" should not be used as an identifier.
-        }
-
-        String yieldString = "yieldString"; // ok, part of another word
-        record MyRecord(){} // ok, part of another word
-        var variable = 2; // ok, part of another word
-        String _; // violation, underscore should not be used as an identifier.
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.txt
deleted file mode 100644
index b7dadfd05cf..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="IllegalIdentifierName">
-        <property name="format" value="(?i)^(?!(record|yield|var
-                        |permits|sealed|open|transitive|_)$).+$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class TestClass {
-    public static void main(String... args) {
-
-    int open = 4; // violation, "open" should not be used as an identifier
-    Object transitive = "transitive"; // violation, "transitive" should not
-                                      // be used as an identifier
-
-    int openInt = 4; // ok, "open" is part of another word
-    Object transitiveObject = "transitiveObject"; // ok, "transitive" is part of another word
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.java
new file mode 100644
index 00000000000..d20ca0496f9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.java
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InterfaceTypeParameterName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.interfacetypeparametername;
+
+// xdoc section -- start
+class Example1 {
+  interface FirstInterface<T> {}
+  interface SecondInterface<t> {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.txt
deleted file mode 100644
index b3ed14d059e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="InterfaceTypeParameterName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-interface FirstInterface<T> {} // OK
-interface SecondInterface<t> {} // violation, name 't' must match pattern '^[A-Z]$'
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.java
new file mode 100644
index 00000000000..933f0a5a0ce
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="InterfaceTypeParameterName">
+       <property name="format" value="^[a-zA-Z]$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.interfacetypeparametername;
+
+// xdoc section -- start
+class Example2 {
+  interface FirstInterface<T> {}
+  interface SecondInterface<t> {}
+  interface ThirdInterface<type> {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.txt
deleted file mode 100644
index 27c4bbc909e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="InterfaceTypeParameterName">
-       <property name="format" value="^[a-zA-Z]$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-interface FirstInterface<T> {} // OK
-interface SecondInterface<t> {} // OK
-interface ThirdInterface<type> {} // violation, name 'type' must
-                                        // match pattern '^[a-zA-Z]$'
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.java
new file mode 100644
index 00000000000..768c7f1ad15
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LambdaParameterName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.lambdaparametername;
+
+import java.util.function.Function;
+
+// xdoc section -- start
+class Example1 {
+  Function<String, String> function1 = s -> s.toLowerCase();
+  Function<String, String> function2 =
+          S -> S.toLowerCase(); // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.txt
deleted file mode 100644
index 82547b66972..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LambdaParameterName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-Function<String, String> function1 = s -> s.toLowerCase(); // OK
-Function<String, String> function2 = S -> S.toLowerCase(); // violation, name 'S'
-                                               // must match pattern '^[a-z][a-zA-Z0-9]*$'
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.java
new file mode 100644
index 00000000000..0883ef6ec7d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LambdaParameterName">
+      <property name="format" value="^[a-z]([a-zA-Z]+)*$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.lambdaparametername;
+
+import java.util.function.Function;
+
+import java.util.stream.Stream;
+
+// xdoc section -- start
+class Example2 {
+  Function<String, String> function1 = str -> str.toUpperCase().trim();
+  Function<String, String> function2 = _s -> _s.trim(); // violation
+
+  public boolean myMethod(String sentence) {
+    return Stream.of(sentence.split(" "))
+            .map(word -> word.trim())
+            .anyMatch(Word -> "in".equals(Word)); // violation
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.txt
deleted file mode 100644
index c1311d2ad6c..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LambdaParameterName">
-      <property name="format" value="^[a-z]([a-zA-Z]+)*$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  Function<String, String> function1 = str -> str.toUpperCase().trim(); // OK
-  Function<String, String> function2 = _s -> _s.trim(); // violation, name '_s'
-                                             // must match pattern '^[a-z]([a-zA-Z]+)*$'
-
-  public boolean myMethod(String sentence) {
-    return Stream.of(sentence.split(" "))
-            .map(word -> word.trim()) // OK
-            .anyMatch(Word -> "in".equals(Word)); // violation, name 'Word'
-                                   // must match pattern '^[a-z]([a-zA-Z]+)*$'
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.java
new file mode 100644
index 00000000000..08f6d0905bb
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.java
@@ -0,0 +1,25 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalFinalVariableName">
+       <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localfinalvariablename;
+
+// xdoc section -- start
+class Example1{
+  void MyMethod() {
+    try {
+      final int VAR1 = 5; // violation
+      final int var1 = 10;
+    } catch (Exception ex) {
+      final int VAR2 = 15; // violation
+      final int var2 = 20;
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.txt
deleted file mode 100644
index 0bebeed4bbe..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalFinalVariableName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.java
new file mode 100644
index 00000000000..c5e1ee69f28
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.java
@@ -0,0 +1,25 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalFinalVariableName">
+      <property name="format" value="^[A-Z][A-Z0-9]*$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localfinalvariablename;
+
+// xdoc section -- start
+class Example2 {
+  void MyMethod() {
+    try {
+      final int VAR1 = 5;
+      final int var1 = 10; // violation
+    } catch (Exception ex) {
+      final int VAR2 = 15;
+      final int var2 = 20; // violation
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.txt
deleted file mode 100644
index 3fd4d5b1551..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalFinalVariableName">
-      <property name="format" value="^[A-Z][A-Z0-9]*$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void MyMethod() {
-    try {
-      final int VAR1 = 5; // OK
-      final int var1 = 10; // violation,  name 'var1' must match pattern "^[A-Z][A-Z0-9]*$"
-    } catch (Exception ex) {
-      final int VAR2 = 15; // OK
-      final int var2 = 20; // violation,  name 'var2' must match pattern "^[A-Z][A-Z0-9]*$"
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.java
new file mode 100644
index 00000000000..632a790662c
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalFinalVariableName">
+      <property name="format" value="^[A-Z][A-Z0-9]*$"/>
+      <property name="tokens" value="PARAMETER_DEF,RESOURCE"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localfinalvariablename;
+
+import java.util.Scanner;
+
+// xdoc section -- start
+class Example3 {
+  void MyMethod() {
+    try(Scanner scanner = new Scanner(System.in)) { // violation
+
+      final int VAR1 = 5;
+      final int var1 = 10;
+    } catch (final Exception ex) { // violation
+
+      final int VAR2 = 15;
+      final int var2 = 20;
+    }
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.txt
deleted file mode 100644
index 4d4f93932c2..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalFinalVariableName">
-      <property name="format" value="^[A-Z][A-Z0-9]*$"/>
-      <property name="tokens" value="PARAMETER_DEF,RESOURCE"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void MyMethod() {
-    try(Scanner scanner = new Scanner()) { // violation, name 'scanner' must
-                                           // match pattern '^[A-Z][A-Z0-9]*$'
-      final int VAR1 = 5; // OK
-      final int var1 = 10; // OK
-    } catch (final Exception ex) { // violation, name 'ex'
-                                   // must match pattern '^[A-Z][A-Z0-9]*$'
-      final int VAR2 = 15; // OK
-      final int var2 = 20; // OK
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.java
new file mode 100644
index 00000000000..accce3f6fc3
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalVariableName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localvariablename;
+
+// xdoc section -- start
+class Example1 {
+  void MyMethod() {
+    for (int var = 1; var < 10; var++) {}
+    for (int VAR = 1; VAR < 10; VAR++) {} // violation
+    for (int i = 1; i < 10; i++) {}
+    for (int var_1 = 0; var_1 < 10; var_1++) {} // violation
+  }
+}
+// xdoc section -- end
+
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.txt
deleted file mode 100644
index 13c64c51b5e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalVariableName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void MyMethod() {
-    for (int var = 1; var < 10; var++) {} // OK
-    for (int VAR = 1; VAR < 10; VAR++) {} // violation, name 'VAR' must match
-                                          // pattern '^[a-z][a-zA-Z0-9]*$'
-    for (int i = 1; i < 10; i++) {} // OK
-    for (int var_1 = 0; var_1 < 10; var_1++) {} // violation, name 'var_1' must match
-                                                   // pattern '^[a-z][a-zA-Z0-9]*$'
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.java
new file mode 100644
index 00000000000..0f651e91d8e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.java
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localvariablename;
+
+// xdoc section -- start
+class Example2 {
+  void MyMethod() {
+    for (int var = 1; var < 10; var++) {}
+    for (int VAR = 1; VAR < 10; VAR++) {} // violation
+    for (int i = 1; i < 10; i++) {}
+    for (int var_1 = 0; var_1 < 10; var_1++) {}
+  }
+}
+// xdoc section -- end
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.txt
deleted file mode 100644
index eeb778034a0..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalVariableName">
-      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void MyMethod() {
-    for (int var = 1; var < 10; var++) {} // OK
-    for (int VAR = 1; VAR < 10; VAR++) {} // violation, name 'VAR' must match
-                                             // pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-    for (int i = 1; i < 10; i++) {} // OK
-    for (int var_1 = 0; var_1 < 10; var_1++) {} // OK
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.java
new file mode 100644
index 00000000000..ac9e3fa7dcc
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.java
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localvariablename;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// xdoc section -- start
+class Example3 {
+  void myMethod () {
+    for(int i = 1; i < 10; i++) {}
+    for(int K = 1; K < 10; K++) {} // violation
+    List list = new ArrayList();
+    for (Object o : list) {}
+    for (Object O : list) {} // violation
+  }
+}
+// xdoc section -- end
+
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.txt
deleted file mode 100644
index 68e445ddcc0..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalVariableName">
-      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-for(int i = 1; i < 10; i++) {}
-for(int K = 1; K < 10; K++) {}
-List list = new ArrayList();
-for (Object o : list) {}
-for (Object O : list) {}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.java
new file mode 100644
index 00000000000..e5be248ec6f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.java
@@ -0,0 +1,39 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z][_a-zA-Z0-9]+$"/>
+      <property name="allowOneCharVarInForLoop" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localvariablename;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// xdoc section -- start
+class Example4 {
+  void MyMethod() {
+    int good = 1;
+    int g = 0; // violation
+    for (int v = 1; v < 10; v++) {
+      int a = 1; // violation
+    }
+    for (int V = 1; V < 10; V++) {
+      int I = 1; // violation
+    }
+    List list = new ArrayList();
+    for (Object o : list) {
+      String a = ""; // violation
+    }
+    for (Object O : list) {
+      String A = ""; // violation
+    }
+  }
+}
+// xdoc section -- end
+
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.txt
deleted file mode 100644
index e1790d6edb7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalVariableName">
-      <property name="format" value="^[a-z][_a-zA-Z0-9]+$"/>
-      <property name="allowOneCharVarInForLoop" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void MyMethod() {
-    int good = 1;
-    int g = 0; // violation
-    for (int v = 1; v < 10; v++) { // OK
-        int a = 1; // violation
-    }
-    for (int V = 1; V < 10; V++) { // OK
-        int I = 1; // violation
-    }
-    List list = new ArrayList();
-    for (Object o : list) { // OK
-        String a = ""; // violation
-    }
-    for (Object O : list) { // OK
-        String A = ""; // violation
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.java
new file mode 100644
index 00000000000..ce9b5f499e0
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.java
@@ -0,0 +1,26 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z][_a-zA-Z0-9]{2,}$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.localvariablename;
+
+// xdoc section -- start
+class Example5 {
+  void MyMethod() {
+    int goodName = 0;
+    int i = 1; // violation
+    for (int var = 1; var < 10; var++) {
+      int j = 1; // violation
+    }
+  }
+}
+// xdoc section -- end
+
+
+
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.txt
deleted file mode 100644
index 786c52425b0..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="LocalVariableName">
-      <property name="format" value="^[a-z][_a-zA-Z0-9]{2,}$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void MyMethod() {
-    int goodName = 0;
-    int i = 1; // violation
-    for (int var = 1; var < 10; var++) { //OK
-      int j = 1; // violation
-    }
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.java
new file mode 100644
index 00000000000..82cd49ae7f5
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.java
@@ -0,0 +1,30 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MemberName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.membername;
+
+// xdoc section -- start
+class Example1 {
+  public int num1;
+  protected int num2;
+  final int num3 = 3;
+  private int num4;
+
+  static int num5;
+  public static final int CONSTANT = 1;
+
+  public int NUM1; // violation
+
+  protected int NUM2; // violation
+
+  int NUM3; // violation
+
+  private int NUM4; // violation
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.txt
deleted file mode 100644
index effa41dbb9b..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MemberName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public int num1; // OK
-  protected int num2; // OK
-  final int num3 = 3; // OK
-  private int num4; // OK
-
-  static int num5; // ignored: not an instance variable
-  public static final int CONSTANT = 1; // ignored: not an instance variable
-
-  public int NUM1; // violation, name 'NUM1'
-                   // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  protected int NUM2; // violation, name 'NUM2'
-                      // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  final int NUM3; // violation, name 'NUM3'
-                  // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  private int NUM4; // violation, name 'NUM4'
-                    // must match pattern '^[a-z][a-zA-Z0-9]*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.java
new file mode 100644
index 00000000000..fa40d467c0e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.java
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MemberName">
+      <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
+      <property name="applyToProtected" value="false"/>
+      <property name="applyToPackage" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.naming.membername;
+
+// xdoc section -- start
+class Example2 {
+  public int num1; // violation
+
+  protected int num2;
+  int num3;
+  private int num4; // violation
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.txt
deleted file mode 100644
index 12692128584..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MemberName">
-      <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-      <property name="applyToProtected" value="false"/>
-      <property name="applyToPackage" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public int num1; // violation, name 'num1'
-                   // must match pattern '^m[A-Z][a-zA-Z0-9]*$'
-  protected int num2; // OK
-  int num3; // OK
-  private int num4; // violation, name 'num4'
-                    // must match pattern '^m[A-Z][a-zA-Z0-9]*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.java
new file mode 100644
index 00000000000..4e43bfc9f53
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MemberName">
+      <property name="applyToPublic" value="false"/>
+      <property name="applyToPrivate" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.naming.membername;
+
+// xdoc section -- start
+class Example3 {
+  public int NUM1;
+  protected int NUM2; // violation
+
+  int NUM3; // violation
+
+  private int NUM4;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.txt
deleted file mode 100644
index 0f4e44ff8d9..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MemberName">
-      <property name="applyToPublic" value="false"/>
-      <property name="applyToPrivate" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public int NUM1; // OK
-  protected int NUM2; // violation, name 'NUM2'
-                      // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  int NUM3; // violation, name 'NUM3'
-            // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  private int NUM4; // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.java
new file mode 100644
index 00000000000..9e61922c6b3
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.java
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.methodname;
+
+// xdoc section -- start
+class Example1 {
+  public void method1() {}
+  protected void method2() {}
+  private void Method3() {} // violation
+  public void Method4() {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.txt
deleted file mode 100644
index a602e83cd22..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public void firstMethod1() {} // OK
-  protected void secondMethod() {} // OK
-  private void ThirdMethod() {} // violation, method name must match to the
-                                // default pattern '^[a-z][a-zA-Z0-9]*$'
-  public void fourth_Method4() {} // violation, method name must match to the
-                                 // default pattern '^[a-z][a-zA-Z0-9]*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.java
new file mode 100644
index 00000000000..11c8e74b669
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.java
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodName">
+       <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.methodname;
+
+// xdoc section -- start
+class Example2 {
+  public void method1() {}
+  public void Method2() {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.txt
deleted file mode 100644
index fe7916a7ee7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodName">
-       <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public void myMethod() {} // OK
-  public void MyMethod() {} // violation, name "MyMethod"
-                            // should match the pattern "^[a-z](_?[a-zA-Z0-9]+)*$"
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.java
new file mode 100644
index 00000000000..0d9381c93be
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodName">
+       <property name="format" value="^[a-zA-Z](_?[a-zA-Z0-9]+)*$"/>
+       <property name="allowClassName" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.methodname;
+
+// xdoc section -- start
+class Example3 {
+  public Example3() {}
+  public void Example3() {}
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.txt
deleted file mode 100644
index 259cfa669bf..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodName">
-       <property name="format" value="^[a-zA-Z](_?[a-zA-Z0-9]+)*$"/>
-       <property name="allowClassName" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public MyClass() {} // OK
-  public void MyClass() {} // OK, method Name 'MyClass' is allowed to be
-                           // equal to the enclosing class name
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.java
new file mode 100644
index 00000000000..de1f30f7833
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodName">
+       <property name="format" value="^[a-zA-Z](_?[a-zA-Z0-9]+)*$"/>
+       <property name="allowClassName" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.methodname;
+
+// xdoc section -- start
+class Example4 {
+  public Example4() {}
+  public void Example4() {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.txt
deleted file mode 100644
index 8caa069e99a..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodName">
-       <property name="format" value="^[a-zA-Z](_?[a-zA-Z0-9]+)*$"/>
-       <property name="allowClassName" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public MyClass() {} // OK
-  public void MyClass() {} // violation, method Name 'MyClass' must not
-                           // equal the enclosing class name
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.java
new file mode 100644
index 00000000000..a00fa4a539f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodName">
+       <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+       <property name="applyToPublic" value="false"/>
+       <property name="applyToProtected" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.methodname;
+
+// xdoc section -- start
+class Example5 {
+  public void Method1() {}
+  protected void Method2() {}
+  private void Method3() {} // violation
+  void Method4() {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.txt
deleted file mode 100644
index 6da1081ca84..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodName">
-       <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-       <property name="applyToPublic" value="false"/>
-       <property name="applyToProtected" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public void FirstMethod() {} // OK
-  protected void SecondMethod() {} // OK
-  private void ThirdMethod() {} // violation, name 'ThirdMethod' must match
-                                // pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-  void FourthMethod() {} // violation, name 'FourthMethod' must match
-                         // pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.java
new file mode 100644
index 00000000000..a16ea5d93b9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.java
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodTypeParameterName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.methodtypeparametername;
+
+// xdoc section -- start
+class Example1 {
+  public <T> void method1() {}
+  public <a> void method2() {} // violation
+  public <K, V> void method3() {}
+  public <k, V> void method4() {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.txt
deleted file mode 100644
index 04296878c90..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodTypeParameterName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public <T> void method1() {} // OK
-  public <a> void method2() {} // violation, name 'a' must match pattern '^[A-Z]$'
-  public <K, V> void method3() {} // OK
-  public <k, V> void method4() {} // violation, name 'k' must match pattern '^[A-Z]$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.java
new file mode 100644
index 00000000000..66f33ed0da2
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.java
@@ -0,0 +1,20 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodTypeParameterName">
+       <property name="format" value="^[a-zA-Z]$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.methodtypeparametername;
+
+// xdoc section -- start
+class Example2 {
+  public <T> void method1() {}
+  public <a> void method2() {}
+  public <K, V> void method3() {}
+  public <k, V> void method4() {}
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.txt
deleted file mode 100644
index 6752f78c67f..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodTypeParameterName">
-       <property name="format" value="^[a-zA-Z]$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public <T> void method1() {} // OK
-  public <a> void method2() {} // OK
-  public <K, V> void method3() {} // OK
-  public <k, V> void method4() {} // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.java
new file mode 100644
index 00000000000..0d5e7cdfb31
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.java
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.parametername;
+
+// xdoc section -- start
+class Example1 {
+  void method1(int v1) {}
+  void method2(int V2) {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.txt
deleted file mode 100644
index 9cea9c1f5d4..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int V2) {} // violation, name 'V2' must match pattern '^[a-z][a-zA-Z0-9]*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.java
new file mode 100644
index 00000000000..883a9fc47d0
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterName">
+      <property name="format" value="^[a-z][_a-zA-Z0-9]+$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.parametername;
+
+// xdoc section -- start
+class Example2 {
+  void method1(int v1) {}
+  void method2(int v_2) {}
+  void method3(int V3) {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.txt
deleted file mode 100644
index 4cffbc45d3b..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterName">
-      <property name="format" value="^[a-z][_a-zA-Z0-9]+$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int v_2) {} // OK
-  void method3(int V3) {} // violation, name 'V3' must match pattern '^[a-z][_a-zA-Z0-9]+$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.java
new file mode 100644
index 00000000000..016c44675f5
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterName">
+      <property name="ignoreOverridden" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.parametername;
+
+// xdoc section -- start
+class Example3 {
+  void method1(int v1) {}
+  void method2(int V2) {} // violation
+  @Override
+  public boolean equals(Object V3) { // OK
+    return true;
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.txt
deleted file mode 100644
index ec0eefbbcbd..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterName">
-      <property name="ignoreOverridden" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int V2) {} // violation, name 'V2' must match pattern '^[a-z][a-zA-Z0-9]*$'
-  @Override
-  public boolean equals(Object V3) { // OK
-    return true;
-  }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.java
new file mode 100644
index 00000000000..45b6d645e0d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.parametername;
+
+// xdoc section -- start
+class Example4 {
+  void method1(int v1) {}
+  void method2(int v_2) {} // violation
+  void method3(int V3) {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.txt
deleted file mode 100644
index e76ad80cefb..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterName">
-      <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int v_2) {} // violation, name 'v_2' must match pattern '^[a-z][a-zA-Z0-9]+$'
-  void method3(int V3) {} // violation, name 'V3' must match pattern '^[a-z][a-zA-Z0-9]+$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.java
new file mode 100644
index 00000000000..70dde48c225
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.java
@@ -0,0 +1,29 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <property name="accessModifiers" value="protected, package, private"/>
+      <message key="name.invalidPattern"
+        value="Parameter name ''{0}'' must match pattern ''{1}''"/>
+    </module>
+    <module name="ParameterName">
+      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+      <property name="accessModifiers" value="public"/>
+      <message key="name.invalidPattern"
+        value="Parameter name ''{0}'' must match pattern ''{1}''"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.parametername;
+
+// xdoc section -- start
+class Example5 {
+  void fn1(int v1) {}
+  protected void fn2(int V2) {} // violation "Parameter name 'V2' must match pattern"
+  private void fn3(int a) {}
+  public void fn4(int b) {} // violation "Parameter name 'b' must match pattern"
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.txt
deleted file mode 100644
index 8deb0618331..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterName">
-      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-      <property name="accessModifiers" value="protected, package, private"/>
-      <message key="name.invalidPattern"
-        value="Parameter name ''{0}'' must match pattern ''{1}''"/>
-    </module>
-    <module name="ParameterName">
-      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-      <property name="accessModifiers" value="public"/>
-      <message key="name.invalidPattern"
-        value="Parameter name ''{0}'' must match pattern ''{1}''"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  void method1(int v1) {} // OK
-  protected method2(int V2) {} // violation, Parameter name 'V2'
-                               // must match pattern '^[a-z]([a-z0-9][a-zA-Z0-9]*)?$'
-  private method3(int a) {} // OK
-  public method4(int b) {} // violation, Parameter name 'b'
-                           // must match pattern '^[a-z][a-z0-9][a-zA-Z0-9]*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.txt
deleted file mode 100644
index 0b5f1ebe178..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="PatternVariableName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-    MyClass(Object o1){
-        if (o1 instanceof String STRING) { // violation, name 'STRING' must
-        // match pattern '^[a-z][a-zA-Z0-9]*$'
-        }
-        if (o1 instanceof Integer num) { // OK
-        }
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.txt
deleted file mode 100644
index 93186f30979..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="PatternVariableName">
-        <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-    MyClass(Object o1){
-        if (o1 instanceof String STR) { // violation, name 'STR' must
-        // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-        }
-        if (o1 instanceof Integer num) { // OK
-        }
-        if (o1 instanceof Integer num_1) { // OK
-        }
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.txt
deleted file mode 100644
index b6dc88031f0..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="PatternVariableName">
-        <property name="format" value="^[a-z][_a-zA-Z0-9]{2,}$"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-    MyClass(Object o1){
-        if (o1 instanceof String s) { // violation, name 's' must
-        // match pattern '^[a-z][_a-zA-Z0-9]{2,}$'
-        }
-        if (o1 instanceof Integer num) { // OK
-        }
-    }
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.java
new file mode 100644
index 00000000000..bb73d145414
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.java
@@ -0,0 +1,27 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="StaticVariableName"/>
+  </module>
+</module>
+*/
+
+
+
+
+
+package com.puppycrawl.tools.checkstyle.checks.naming.staticvariablename;
+
+// xdoc section -- start
+class Example1 {
+  public static int goodStatic = 2;
+  private static int badStatic = 2;
+  public static int ItStatic1 = 2; // violation, 'must match pattern'
+  protected static int ItStatic2 = 2; // violation, 'must match pattern'
+  private static int ItStatic = 2; // violation, 'must match pattern'
+  public static int it_static = 2; // violation, 'must match pattern'
+  public static int It_Static = 2; // violation, 'must match pattern'
+  private static int It_Static1 = 2; // violation, 'must match pattern'
+  static int It_Static2 = 2; // violation, 'must match pattern'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.txt
deleted file mode 100644
index 604719e1d3e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="StaticVariableName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public static int goodStatic = 2; // OK
-  private static int BadStatic = 2; // violation, name 'BadStatic'
-                                    // must match pattern '^[a-z][a-zA-Z0-9]*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.java
new file mode 100644
index 00000000000..f683410334b
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.java
@@ -0,0 +1,27 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="StaticVariableName">
+      <property name="applyToPublic" value="false"/>
+      <property name="applyToProtected" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+
+package com.puppycrawl.tools.checkstyle.checks.naming.staticvariablename;
+
+// xdoc section -- start
+class Example2 {
+  public static int goodStatic = 2;
+  private static int badStatic = 2;
+  public static int ItStatic1 = 2;
+  protected static int ItStatic2 = 2;
+  private static int ItStatic = 2; // violation, 'must match pattern'
+  public static int it_static = 2;
+  public static int It_Static = 2;
+  private static int It_Static1 = 2; // violation, 'must match pattern'
+  static int It_Static2 = 2; // violation, 'must match pattern'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.txt
deleted file mode 100644
index 59cb81f8fa7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="StaticVariableName">
-      <property name="applyToPublic" value="false"/>
-      <property name="applyToProtected" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public static int GoodStatic1 = 2; // OK
-  protected static int GoodStatic2 = 2; //OK
-  private static int goodStatic = 2 // OK
-  private static int BadStatic = 2; // violation, name 'BadStatic'
-                                    // must match pattern '^[a-z][a-zA-Z0-9]*$'
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.java
new file mode 100644
index 00000000000..c08a876d60f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.java
@@ -0,0 +1,27 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="StaticVariableName">
+      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+      <property name="applyToPrivate" value="false"/>
+      <property name="applyToPackage" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.staticvariablename;
+
+// xdoc section -- start
+class Example3 {
+  public static int goodStatic = 2;
+  private static int badStatic = 2;
+  public static int ItStatic1 = 2; // violation, 'must match pattern'
+  protected static int ItStatic2 = 2; // violation, 'must match pattern'
+  private static int ItStatic = 2;
+  public static int it_static = 2;
+  public static int It_Static = 2; // violation, 'must match pattern'
+  private static int It_Static1 = 2;
+  static int It_Static2 = 2;
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.txt
deleted file mode 100644
index e1cd68b82ca..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="StaticVariableName">
-      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-      <property name="applyToPrivate" value="false"/>
-      <property name="applyToPackage" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class MyClass {
-  public static int good_static = 2; // OK
-  public static int Bad_Static = 2; // violation, name 'Bad_Static'
-                                    // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-  private static int Good_Static1 = 2; // OK
-  static int Good_Static2 = 2; // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.java
new file mode 100644
index 00000000000..59744ba1a97
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.java
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="TypeName"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.typename;
+
+// xdoc section -- start
+class Example1 {
+  public interface FirstName {}
+  protected class SecondName {}
+  enum Third_Name {} // violation
+  private class FourthName_ {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.txt
deleted file mode 100644
index e11d352a4f5..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="TypeName"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public interface FirstName {} // OK
-protected class SecondName {} // OK
-enum Third_Name {} // violation, name 'Third_Name' must match pattern '^[A-Z][a-zA-Z0-9]*$'
-private class FourthName_ {} // violation, name 'FourthName_'
-                            // must match pattern '^[A-Z][a-zA-Z0-9]*$'
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.java
new file mode 100644
index 00000000000..b6961a7c874
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.java
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="TypeName">
+      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+      <property name="applyToProtected" value="false"/>
+      <property name="applyToPrivate" value="false"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.typename;
+
+// xdoc section -- start
+class Example2 {   // violation
+  public interface firstName {}
+  public class SecondName {} // violation
+  protected class ThirdName {}
+  private class FourthName {}
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.txt
deleted file mode 100644
index a56e9c532fd..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="TypeName">
-      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-      <property name="applyToProtected" value="false"/>
-      <property name="applyToPrivate" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public interface firstName {} // OK
-public class SecondName {} // violation, name 'SecondName'
-                          // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-protected class ThirdName {} // OK
-private class FourthName {} // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.java
new file mode 100644
index 00000000000..6c2e7f72ac9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="TypeName">
+      <property name="format"
+        value="^I_[a-zA-Z0-9]*$"/>
+      <property name="tokens"
+        value="INTERFACE_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.naming.typename;
+
+// xdoc section -- start
+class Example3 {
+  public interface I_firstName {}
+  interface SecondName {} // violation
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.txt
deleted file mode 100644
index 6e968da67e7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="TypeName">
-      <property name="format"
-        value="^I_[a-zA-Z0-9]*$"/>
-      <property name="tokens"
-        value="INTERFACE_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public interface I_firstName {} // OK
-interface SecondName {} // violation, name 'SecondName'
-                       // must match pattern '^I_[a-zA-Z0-9]*$'
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.java
new file mode 100644
index 00000000000..0a352ee36e2
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.java
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="NewlineAtEndOfFile"/>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;
+// xdoc section -- start
+public class Example1 { // ⤶
+// ⤶
+} // ⤶ // ok, file ends with a new line.
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.txt
deleted file mode 100644
index 590970f1263..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="NewlineAtEndOfFile"/>
-</module>
-*/
-
-// xdoc section -- start
-// File ending with a new line
-public class Test {⤶
-⤶
-}⤶ // ok
-Note: The comment // ok is a virtual, not actually present in the file
-
-// File ending without a new line
-public class Test1 {⤶
-⤶
-} // violation, the file does not end with a new line
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.java
new file mode 100644
index 00000000000..3b951220f61
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.java
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="NewlineAtEndOfFile"/>
+</module>
+*/
+// violation 5 lines above 'File does not end with a newline.'
+package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;
+// xdoc section -- start
+public class Example2 { // ⤶
+// ⤶
+} // no ⤶ below it is violation
+// xdoc section -- end
\ No newline at end of file
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.txt
deleted file mode 100644
index 0d5841a6f18..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="NewlineAtEndOfFile">
-    <property name="lineSeparator" value="lf"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// File ending with a new line
-public class Test {⤶
-⤶
-}⤶ // ok
-Note: The comment // ok is a virtual, not actually present in the file
-
-// File ending without a new line
-public class Test1 {⤶
-⤶
-}␍⤶ // violation, expected line ending for file is LF(\n), but CRLF(\r\n) is detected
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.java
new file mode 100644
index 00000000000..28a92e4e0f9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.java
@@ -0,0 +1,13 @@
+/*xml
+<module name="Checker">
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator" value="lf"/>
+  </module>
+</module>
+*/
+// violation 7 lines above 'ending for file is LF(\\n), but CRLF(\\r\\n) is'
+package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;
+// xdoc section -- start
+public class Example3 { // ⤶
+} // ␍⤶  it is violation as line ending is different from expected
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.txt
deleted file mode 100644
index f4495b74062..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="NewlineAtEndOfFile">
-    <property name="fileExtensions" value="java, xml, py"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// Any java file
-public class Test {⤶
-} // violation, file should end with a new line.
-
-// Any py file
-print("Hello World") // violation, file should end with a new line.
-
-// Any txt file
-This is a sample text file. // ok, this file is not specified in the config.
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example4.py b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example4.py
new file mode 100644
index 00000000000..f99d1dca7fd
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example4.py
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="NewlineAtEndOfFile">
+    <property name="fileExtensions" value="java, xml, py"/>
+  </module>
+</module>
+*/
+// violation 7 lines above 'File does not end with a newline.'
+// xdoc section -- start
+print("Hello world!")
+# no ⤶ below it is violation
+// xdoc section -- end
\ No newline at end of file
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example5.java
new file mode 100644
index 00000000000..c41cf72664f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example5.java
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="NewlineAtEndOfFile"/>
+</module>
+*/
+// violation 5 lines above 'File does not end with a newline.'
+package com.puppycrawl.tools.checkstyle.checks.newlineatendoffile;
+// xdoc section -- start
+public class Example5 { // ⤶
+// ⤶
+} // no ⤶ below it is violation
+// xdoc section -- end
\ No newline at end of file
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example6.txt
new file mode 100644
index 00000000000..8a9c458c6d7
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example6.txt
@@ -0,0 +1,10 @@
+/*xml
+<module name="Checker">
+  <module name="NewlineAtEndOfFile">
+    <property name="fileExtensions" value="java, xml, py"/>
+  </module>
+</module>
+*/
+// xdoc section -- start
+Sample txt file. // ok, this file is not specified in the config.
+// xdoc section -- end
\ No newline at end of file
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.java
new file mode 100644
index 00000000000..7585d4af18a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.java
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NoCodeInFile"/>
+  </module>
+</module>
+*/
+
+// violation 8 lines above
+
+// xdoc section -- start
+// the violation is on first line of file
+// public class Example1 {
+// single-line comment is not code
+// }
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.txt
deleted file mode 100644
index 7d1b1385ea3..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NoCodeInFile"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// single-line comment // violation
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.java
new file mode 100644
index 00000000000..53b1d610260
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.java
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="NoCodeInFile"/>
+  </module>
+</module>
+*/
+
+// violation 8 lines above
+
+// xdoc section -- start
+// the violation is on first line of file
+/*
+ public class Example2 {
+ block comment is not code
+ }
+*/
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.txt
deleted file mode 100644
index 3f64a98c17a..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="NoCodeInFile"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-/* // violation
- block comment
-*/
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.java
new file mode 100644
index 00000000000..83fb5befbed
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.java
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="OuterTypeFilename"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
+
+// xdoc section -- start
+public class Example1 {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.txt
deleted file mode 100644
index 9b2e3e5e740..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="OuterTypeFilename"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class Test { // OK
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.java
new file mode 100644
index 00000000000..c16af411c10
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.java
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="OuterTypeFilename"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
+
+// xdoc section -- start
+class Example2ButNotSameName {} // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.txt
deleted file mode 100644
index caf3e21828f..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="OuterTypeFilename"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Foo { // violation
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.java
new file mode 100644
index 00000000000..b44e9dabcd1
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.java
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="OuterTypeFilename"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
+
+// xdoc section -- start
+interface Example3ButNotSameName {} // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.txt
deleted file mode 100644
index db10ee962a7..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="OuterTypeFilename"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-interface Foo { // violation
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.java
new file mode 100644
index 00000000000..7939044d985
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.java
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="OuterTypeFilename"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
+
+// xdoc section -- start
+enum Example4ButNotSameName {} // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.txt
deleted file mode 100644
index 3c941edd642..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="OuterTypeFilename"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-enum Foo { // violation
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.java
new file mode 100644
index 00000000000..1956182396a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.java
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="OuterTypeFilename"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
+
+// xdoc section -- start
+class Example5ButNotSameName {} // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.txt
deleted file mode 100644
index 7b76cb2a42c..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="OuterTypeFilename"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-record Foo { // violation
-
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.java
new file mode 100644
index 00000000000..544ec61794f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.java
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="FileLength"/>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.filelength;
+
+// xdoc section -- start
+public class Example1 {
+  public void myTest() {
+    // small class less than 2000 lines
+    String test = "Some content";
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.txt
deleted file mode 100644
index 7f13343fdfc..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="FileLength"/>
-</module>
-*/
-
-// xdoc section -- start
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.java
new file mode 100644
index 00000000000..9b0d6606ffd
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.java
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="FileLength">
+    <property name="max" value="5"/>
+  </module>
+</module>
+*/
+// violation 7 lines above
+package com.puppycrawl.tools.checkstyle.checks.sizes.filelength;
+
+// xdoc section -- start
+public class Example2 {
+  public void myTest() {
+    // small class with more than 5 lines
+    String test = "Some content"; // there is violation
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.txt
deleted file mode 100644
index 08845cdfb11..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="FileLength">
-    <property name="max" value="1500"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example3.java
new file mode 100644
index 00000000000..ffc0577eaeb
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example3.java
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="FileLength">
+    <property name="max" value="5"/>
+    <property name="fileExtensions" value="txt"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.filelength;
+
+// xdoc section -- start
+public class Example3 {
+  public void myTest() {
+    // small class with more than 5 lines
+    String test = "Some content"; // no violation as only txt files are validated
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.txt
deleted file mode 100644
index 5547de9b340..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodLength"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class MyClass {
-  public MyClass() {  // constructor (line 1)
-      /* line 2
-          ...
-         line 150 */
-  } // line 151, violation, as it is over 150
-
-  public void firstExample() { // line 1
-
-      // line 3
-      System.out.println("line 4");
-      /* line 5
-         line 6 */
-  } // line 7, OK, as it is less than 150
-
-  public void secondExample() { // line 1
-      // line 2
-      System.out.println("line 3");
-
-      /* line 5
-          ...
-         line 150 */
-  } // line 151, violation, as it is over 150
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.txt
deleted file mode 100644
index a8912308df1..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodLength">
-      <property name="tokens" value="METHOD_DEF"/>
-      <property name="max" value="4"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class MyTest {
-  public MyTest()  {          // constructor (line 1)
-      int var1 = 2;           // line 2
-      int var2 = 4;           // line 3
-      int sum = var1 + var2;  // line 4
-  } // line 5, OK, constructor is not mentioned in the tokens
-
-  public void firstMethod() { // line 1
-      // comment (line 2)
-      System.out.println("line 3");
-  } // line 4, OK, as it allows at most 4 lines
-
-  public void secondMethod() { // line 1
-      int index = 0;   // line 2
-      if (index < 5) { // line 3
-          index++;     // line 4
-      }                // line 5
-  } // line 6, violation, as it is over 4 lines
-
-  public void thirdMethod() { // line 1
-
-      // comment (line 3)
-      System.out.println("line 4");
-  } // line 5, violation, as it is over 4 lines
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.txt
deleted file mode 100644
index e7c2e42a19d..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MethodLength">
-      <property name="tokens" value="METHOD_DEF"/>
-      <property name="max" value="4"/>
-      <property name="countEmpty" value="false"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-public class MyTest {
-  public MyTest()  {          // constructor (line 1)
-      int var1 = 2;           // line 2
-      int var2 = 4;           // line 3
-      int sum = var1 + var2;  // line 4
-  } // line 5, OK, constructor is not mentioned in the tokens
-
-  public void firstMethod() { // line 1
-      // comment - not counted as line
-      System.out.println("line 2");
-  } // line 3, OK, as it allows at most 4 lines
-
-  public void secondMethod() { // line 1
-      int index = 0;   // line 2
-      if (index < 5) { // line 3
-          index++;     // line 4
-      }                // line 5
-  } // line 6, violation, as it is over 4 lines
-
-  public void thirdMethod() { // line 1
-
-      // comment - not counted as line
-      System.out.println("line 2");
-  } // line 3, OK, as it allows at most 4 lines
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.java
new file mode 100644
index 00000000000..9d3d009c556
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.java
@@ -0,0 +1,38 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterNumber"/>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber;
+
+// xdoc section -- start
+class Example1 extends ExternalService1 {
+
+  @JsonCreator
+  // violation below, 'More than 7 parameters (found 8)'
+  Example1(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // violation below, 'More than 7 parameters (found 8)'
+  Example1(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
+
+  @Override
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService1 {
+
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+// xdoc section -- end
+@interface JsonCreator {}
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.txt
deleted file mode 100644
index 12e8df5c37f..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterNumber"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.java
new file mode 100644
index 00000000000..e73ee8735f5
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.java
@@ -0,0 +1,40 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterNumber">
+      <property name="max" value="10"/>
+      <property name="tokens" value="METHOD_DEF"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber;
+
+// xdoc section -- start
+class Example2 extends ExternalService2 {
+
+  @JsonCreator
+  // ok below, constructor is not in tokens to check
+  Example2(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // ok below, constructor is not in tokens to check
+  Example2(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
+
+  @Override
+  // ok below, less than 10 parameters (found 8)
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService2 {
+
+  // ok below, less than 10 parameters (found 8)
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.txt
deleted file mode 100644
index 383b50d4c35..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterNumber">
-      <property name="max" value="10"/>
-      <property name="tokens" value="METHOD_DEF"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.java
new file mode 100644
index 00000000000..575268332a0
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.java
@@ -0,0 +1,39 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterNumber">
+      <property name="ignoreOverriddenMethods" value="true"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber;
+
+// xdoc section -- start
+class Example3 extends ExternalService3 {
+
+  @JsonCreator
+  // violation below, 'More than 7 parameters (found 8)'
+  Example3(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // violation below, 'More than 7 parameters (found 8)'
+  Example3(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
+
+  @Override
+  // ok below, overridden method is ignored
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService3 {
+
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.txt
deleted file mode 100644
index d0c05336787..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="ParameterNumber">
-      <property name="ignoreOverriddenMethods" value="true"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-@Override
-public void needsLotsOfParameters(int a,
-    int b, int c, int d, int e, int f, int g, int h) {
-    ...
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example4.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example4.java
new file mode 100644
index 00000000000..80dc5ea35a2
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example4.java
@@ -0,0 +1,39 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="ParameterNumber">
+      <property name="ignoreAnnotatedBy" value="JsonCreator"/>
+    </module>
+  </module>
+</module>
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.sizes.parameternumber;
+
+// xdoc section -- start
+class Example4 extends ExternalService4 {
+
+  @JsonCreator
+  // ok below, constructor annotated with JsonCreator annotation is ignored
+  Example4(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // violation below, 'More than 7 parameters (found 8)'
+  Example4(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
+
+  @Override
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService4 {
+
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.java
new file mode 100644
index 00000000000..71d18fbc6a4
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.java
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="TodoComment"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.todocomment;
+
+// xdoc section -- start
+public class Example1 {
+  int i;
+  int x;
+  public void test() {
+    i++;   // TODO: do differently in future    // violation
+    i++;   // todo: do differently in future
+    i=i/x; // FIXME: handle x = 0 case
+    i=i/x; // FIX :  handle x = 0 case
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.txt
deleted file mode 100644
index 24d49e9a72e..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="TodoComment"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-i++; // TODO: do differently in future   // violation
-i++; // todo: do differently in future   // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.java
new file mode 100644
index 00000000000..455bb2039e0
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.java
@@ -0,0 +1,24 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="TodoComment">
+      <property name="format" value="(TODO)|(FIXME)"/>
+    </module>
+  </module>
+</module>
+*/
+// violation 9 lines above
+package com.puppycrawl.tools.checkstyle.checks.todocomment;
+
+// xdoc section -- start
+public class Example2 {
+  int i;
+  int x;
+  public void test() {
+    i++;   // TODO: do differently in future    // violation
+    i++;   // todo: do differently in future
+    i=i/x; // FIXME: handle x = 0 case          // violation
+    i=i/x; // FIX :  handle x = 0 case
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.txt
deleted file mode 100644
index 916dfe6dcc2..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="TodoComment">
-      <property name="format" value="(TODO)|(FIXME)"/>
-    </module>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-i++;   // TODO: do differently in future   // violation
-i++;   // todo: do differently in future   // OK
-i=i/x; // FIXME: handle x = 0 case         // violation
-i=i/x; // FIX :  handle x = 0 case         // OK
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.java
new file mode 100644
index 00000000000..903bd64575f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.java
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="UpperEll"/>
+  </module>
+</module>
+*/
+package com.puppycrawl.tools.checkstyle.checks.upperell;
+
+// xdoc section -- start
+class Example1 {
+  long var1 = 508987; // OK
+  long var2 = 508987l; // violation
+  long var3 = 508987L; // OK
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.txt
deleted file mode 100644
index 3fc2a5f0014..00000000000
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*xml
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="UpperEll"/>
-  </module>
-</module>
-*/
-
-// xdoc section -- start
-class Test {
-  long var1 = 508987; // OK
-  long var2 = 508987l; // violation
-  long var3 = 508987L; // OK
-}
-// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example1.txt
index 817da24ad96..34f9200b8b1 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example1.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example1.txt
@@ -23,4 +23,6 @@ List<T> list = ImmutableList.Builder<T>::new;
 sort(list, Comparable::<String>compareTo);
 // Constructor call
 MyClass obj = new <String>MyClass();
+// Record header
+record License<T>() {}
 // xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example2.txt
index 50bb4742157..9187707127f 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example2.txt
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/genericwhitespace/Example2.txt
@@ -14,4 +14,6 @@ public<T> void foo() {} // violation, "<" not preceded with whitespace
 List a = new ArrayList<> (); // violation, ">" followed by whitespace
 Map<Integer, String>m; // violation, ">" not followed by whitespace
 Pair<Integer, Integer > p; // violation, ">" preceded with whitespace
+
+record License<T> () {} // violation, ">" followed by whitespace
 // xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/severitymatchfilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/severitymatchfilter/Example1.txt
new file mode 100644
index 00000000000..dd0cf5813aa
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/severitymatchfilter/Example1.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SeverityMatchFilter">
+    <property name="severity" value="info"/>
+    <property name="acceptOnMatch" value="false"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example1.txt
new file mode 100644
index 00000000000..408fc3aa3f4
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example1.txt
@@ -0,0 +1,42 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter"/>
+    <module name="MemberName"/>
+    <module name="ConstantName"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //CHECKSTYLE:OFF
+  int VAR2; // suppressed violation
+  //CHECKSTYLE:ON
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  //CHECKSTYLE:OFF
+  public static final int var4; // suppressed violation
+  //CHECKSTYLE:ON
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+
+    //CHECKSTYLE:OFF
+
+    try {}
+    catch(Exception ex) {} // suppressed violation
+    catch(Error err) {} // suppressed violation
+
+    //CHECKSTYLE:ON
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example2.txt
new file mode 100644
index 00000000000..ec0966969ff
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example2.txt
@@ -0,0 +1,46 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="stop constant check"/>
+      <property name="onCommentFormat" value="resume constant check"/>
+      <property name="checkFormat" value="ConstantNameCheck"/>
+    </module>
+    <module name="MemberName"/>
+    <module name="ConstantName"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //stop constant check
+  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
+  //resume constant check
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  //stop constant check
+  public static final int var4; // suppressed violation
+  //resume constant check
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+
+    //stop constant check
+
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+    catch(Error err) {} // violation , Catching 'Error' is not allowed
+
+    //resume constant check
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example3.txt
new file mode 100644
index 00000000000..2e67caf5ec9
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example3.txt
@@ -0,0 +1,48 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="ILLEGAL OFF\: (\w+)"/>
+      <property name="onCommentFormat" value="ILLEGAL ON\: (\w+)"/>
+      <property name="checkFormat" value="IllegalCatch"/>
+      <property name="messageFormat" value="^Catching '$1' is not allowed.$"/>
+    </module>
+    <module name="MemberName"/>
+    <module name="ConstantName"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //ILLEGAL OFF: Exception
+  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
+  //ILLEGAL ON: Exception
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  //ILLEGAL OFF: Exception
+  public static final int var4;
+  // violation above ,  Name 'var4' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+  //ILLEGAL ON: Exception
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+
+    //ILLEGAL OFF: Exception
+
+    try {}
+    catch(Exception ex) {} // suppressed violation
+    catch(Error err) {} // violation , Catching 'Error' is not allowed
+
+    //ILLEGAL ON: Exception
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example4.txt
new file mode 100644
index 00000000000..110bf33b282
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example4.txt
@@ -0,0 +1,46 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
+      <property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
+    <module name="MemberName"/>
+    <module name="ConstantName"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //CSOFF: MemberName
+  int VAR2; // suppressed violation
+  //CSON: MemberName
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  //CSOFF: ConstantName
+  public static final int var4; // suppressed violation
+  //CSON: ConstantName
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+
+    //CSOFF: IllegalCatch
+
+    try {}
+    catch(Exception ex) {} // suppressed violation
+    catch(Error err) {} // suppressed violation
+
+    //CSON: IllegalCatch
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example5.txt
new file mode 100644
index 00000000000..200a5ea9efd
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example5.txt
@@ -0,0 +1,47 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE_OFF: ALMOST_ALL"/>
+      <property name="onCommentFormat" value="CHECKSTYLE_ON: ALMOST_ALL"/>
+      <property name="checkFormat" value="^((?!(ConstantName)).)*$"/>
+    </module>
+    <module name="MemberName"/>
+    <module name="ConstantName"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //CHECKSTYLE_OFF: ALMOST_ALL
+  int VAR2; // suppressed violation
+  //CHECKSTYLE_ON: ALMOST_ALL
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  //CHECKSTYLE_OFF: ALMOST_ALL
+  public static final int var4;
+  // violation above ,  Name 'var4' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+  //CHECKSTYLE_ON: ALMOST_ALL
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+
+    //CHECKSTYLE_OFF: ALMOST_ALL
+
+    try {}
+    catch(Exception ex) {} // suppressed violation
+    catch(Error err) {} // suppressed violation
+
+    //CHECKSTYLE_ON: ALMOST_ALL
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example6.txt
new file mode 100644
index 00000000000..29d3ba2809e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example6.txt
@@ -0,0 +1,52 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CSOFF (\w+)"/>
+      <property name="onCommentFormat" value="CSON (\w+)"/>
+      <property name="idFormat" value="$1"/>
+    </module>
+    <module name="MemberName">
+    <property name="id" value="MemberID"/>
+    </module>
+    <module name="ConstantName">
+      <property name="id" value="ConstantID"/>
+    </module>
+    <module name="IllegalCatch">
+      <property name="id" value="IllegalID"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //CSOFF MemberID
+  int VAR2; // suppressed violation
+  //CSON: MemberID
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  //CSOFF ConstantID
+  public static final int var4; // suppressed violation
+  //CSON ConstantID
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+
+    //CSOFF IllegalID
+
+    try {}
+    catch(Exception ex) {} // suppressed violation
+    catch(Error err) {} // suppressed violation
+
+    //CSON IllegalID
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example7.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example7.txt
new file mode 100644
index 00000000000..1907a26e32b
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example7.txt
@@ -0,0 +1,47 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="csoff (\w+)"/>
+      <property name="onCommentFormat" value="cson (\w+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
+    <module name="MemberName"/>
+    <module name="ConstantName"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //csoff MemberName
+  int VAR2; // suppressed violation
+  //cson MemberName
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  //csoff ConstantName
+  //csoff IllegalCatch
+
+  public static final int var4; // suppressed violation
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // suppressed violation
+
+    try {}
+    catch(Exception ex) {} // suppressed violation
+    catch(Error err) {} // suppressed violation
+  }
+
+  //cson ConstantName
+  //cson IllegalCatch
+
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example8.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example8.txt
new file mode 100644
index 00000000000..a20e6b89094
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example8.txt
@@ -0,0 +1,45 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionCommentFilter">
+      <property name="checkC" value="true"/>
+      <property name="checkCPP" value="false"/>
+    </module>
+    <module name="MemberName"/>
+    <module name="ConstantName"/>
+    <module name="IllegalCatch"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+class InputSuppressionCommentFilter
+{
+  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
+
+  //CHECKSTYLE:OFF
+  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
+  //CHECKSTYLE:ON
+
+  public static final int var3;
+  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
+
+  /*CHECKSTYLE:OFF*/
+  public static final int var4; // suppressed violation
+  /*CHECKSTYLE:ON*/
+
+  public void method1()
+  {
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+
+    //CHECKSTYLE:OFF
+
+    try {}
+    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
+    catch(Error err) {} // violation , Catching 'Error' is not allowed
+
+    //CHECKSTYLE:ON
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example1.txt
new file mode 100644
index 00000000000..4517c955194
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example1.txt
@@ -0,0 +1,20 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="checks" value="JavadocStyleCheck"/>
+    <property name="files" value="AbstractComplexityCheck.java"/>
+    <property name="lines" value="82,108-122"/>
+  </module>
+  <module name="SuppressionSingleFilter">
+    <property name="checks" value="MagicNumberCheck"/>
+    <property name="files" value="JavadocStyleCheck.java"/>
+    <property name="lines" value="221"/>
+  </module>
+  <module name="SuppressionSingleFilter">
+    <property name="message" value="Missing a Javadoc comment"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example10.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example10.txt
new file mode 100644
index 00000000000..a9fecbc037d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example10.txt
@@ -0,0 +1,10 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="message" value="Name 'log' must match pattern"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example2.txt
new file mode 100644
index 00000000000..7348a477018
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example2.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="id" value="stringEqual"/>
+    <property name="files" value="SomeTestCode.java"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example3.txt
new file mode 100644
index 00000000000..26f458acb19
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example3.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="files" value="[/\\]\..+"/>
+    <property name="checks" value=".*"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example4.txt
new file mode 100644
index 00000000000..613c5eb8875
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example4.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="files" value="[/\\]target[/\\]"/>
+    <property name="checks" value=".*"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example5.txt
new file mode 100644
index 00000000000..a30577f920e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example5.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="files" value=".+\.(?:jar|zip|war|class|tar|bin)$"/>
+    <property name="checks" value=".*"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example6.txt
new file mode 100644
index 00000000000..60e0680593a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example6.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="files" value=".+\.(?:png|gif|jpg|jpeg)$"/>
+    <property name="checks" value=".*"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example7.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example7.txt
new file mode 100644
index 00000000000..8c6dfe09863
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example7.txt
@@ -0,0 +1,12 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="files"
+      value=".+\.(?:txt|xml|csv|sh|thrift|html|sql|eot|ttf|woff|css|png)$"/>
+    <property name="checks" value=".*"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example8.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example8.txt
new file mode 100644
index 00000000000..c51bebff08c
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example8.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="files" value="com[\\/]mycompany[\\/]app[\\/]gen[\\/]"/>
+    <property name="checks" value=".*"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example9.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example9.txt
new file mode 100644
index 00000000000..57f00573c64
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example9.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressionSingleFilter">
+    <property name="files" value="com[\\/]mycompany[\\/]app[\\/].*IT.java"/>
+    <property name="checks" value="FileLength"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example1.txt
new file mode 100644
index 00000000000..f785dcccc7f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example1.txt
@@ -0,0 +1,28 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="files" value="File(One|Two)\.java"/>
+      <property name="checks" value="MethodName"/>
+      <property name="query" value="(//CLASS_DEF[@text='FileOne']/OBJBLOCK/
+                METHOD_DEF[@text='MyMethod']/IDENT)|
+                (//CLASS_DEF[@text='FileTwo']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class FileOne {
+  public void MyMethod() {} // OK
+}
+
+public class FileTwo {
+  public void MyMethod() {} // OK
+}
+
+public class FileThree {
+  public void MyMethod() {} // violation, name 'MyMethod'
+                            // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example10.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example10.txt
new file mode 100644
index 00000000000..84b8e8ff65d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example10.txt
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="LeftCurly"/>
+      <property name="query" value="//CLASS_DEF[@text='TestClass']/OBJBLOCK
+            /METHOD_DEF[@text='testMethod1']/SLIST"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class TestClass {
+  public void testMethod1()
+  { // OK
+  }
+
+  public void testMethod2()
+  { // violation, '{' should be on the previous line
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example11.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example11.txt
new file mode 100644
index 00000000000..b25fba7f583
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example11.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="RequireThis"/>
+      <property name="query" value="//CLASS_DEF[@text='InputTest']
+            //METHOD_DEF[@text='changeAge']//ASSIGN[@text='age']/IDENT"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class InputTest {
+  private int age = 23;
+
+  public void changeAge() {
+    age = 24; // violation will be suppressed
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example12.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example12.txt
new file mode 100644
index 00000000000..94d8984c9a1
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example12.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="IllegalThrows"/>
+      <property name="query" value="//LITERAL_THROWS/IDENT[
+          ..[@text='RuntimeException'] and ./ancestor::METHOD_DEF[@text='throwsMethod']]"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class InputTest {
+  public void throwsMethod() throws RuntimeException { // violation will be suppressed
+  }
+
+  public void sampleMethod() throws RuntimeException { // will throw violation here
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example13.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example13.txt
new file mode 100644
index 00000000000..8597877a9ea
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example13.txt
@@ -0,0 +1,25 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value=".*"/>
+      <property name="query" value="//METHOD_DEF[@text='TestMethod1']
+            /descendant-or-self::node()"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class TestClass {
+  public void TestMethod1() { // OK
+    final int num = 10; // OK
+  }
+
+  public void TestMethod2() { // violation of the MethodName check,
+                              // name 'TestMethod2' must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+    final int num = 10; // violation of the LocalFinalVariableName check,
+                        // name 'num' must match pattern '^[A-Z][A-Z0-9]*$'
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example14.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example14.txt
new file mode 100644
index 00000000000..103a2967f61
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example14.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="files" value="[\\/]src[\\/]test[\\/]java[\\/]"/>
+      <property name="checks" value="Javadoc*"/>
+    </module>
+    <module name="SuppressionXpathSingleFilter">
+      <property name="files" value=".*Tests\.java"/>
+      <property name="checks" value="Javadoc*"/>
+    </module>
+    <module name="SuppressionXpathSingleFilter">
+      <property name="files" value="generated-sources"/>
+      <property name="checks" value="[a-zA-Z0-9]*"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example2.txt
new file mode 100644
index 00000000000..e6cfd695f9d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example2.txt
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="MethodName"/>
+      <property name="message" value="MyMethod[0-9]"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class FileOne {
+  public void MyMethod1() {} // OK
+  public void MyMethod2() {} // OK
+  public void MyMethodA() {} // violation, name 'MyMethodA' must
+                             // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example3.txt
new file mode 100644
index 00000000000..e26ea9ff23e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example3.txt
@@ -0,0 +1,24 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="MethodName">
+      <property name="id" value="MethodName1"/>
+      <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
+    </module>
+    <module name="SuppressionXpathSingleFilter">
+      <property name="files" value="FileOne.java"/>
+      <property name="id" value="MethodName1"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class FileOne {
+  public void MyMethod() {} // OK
+}
+public class FileTwo {
+  public void MyMethod() {} // violation,  name 'MyMethod' must
+                            //match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example4.txt
new file mode 100644
index 00000000000..57ab017b55c
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example4.txt
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="PackageName"/>
+      <property name="query" value="/PACKAGE_DEF[@text='File']/IDENT"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+package File; // OK
+
+public class FileOne {}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example5.txt
new file mode 100644
index 00000000000..0a0b5a02720
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example5.txt
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="RedundantModifier"/>
+      <property name="query" value="//INTERFACE_DEF//*"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public interface TestClass {
+  public static final int CONSTANT1 = 1;  // OK
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example6.txt
new file mode 100644
index 00000000000..db876233d8a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example6.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="files" value="FileOne.java"/>
+      <property name="checks" value="MyMethod"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class FileOne {
+  public void MyMethod() {} // OK
+}
+
+public class FileTwo {
+  public void MyMethod() {} // violation, name 'MyMethod'
+                            // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example7.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example7.txt
new file mode 100644
index 00000000000..f76e96aa67f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example7.txt
@@ -0,0 +1,24 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value=".*"/>
+      <property name="query"
+                value="(//CLASS_DEF[@text='FileOne'])|
+                (//CLASS_DEF[@text='FileOne']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+abstract class FileOne { // OK
+  public void MyMethod() {} // OK
+}
+
+abstract class FileTwo { // violation of the AbstractClassName check,
+                         // it should match the pattern "^Abstract.+$"
+  public void MyMethod() {} // violation, name 'MyMethod'
+                            // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example8.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example8.txt
new file mode 100644
index 00000000000..c46865ef294
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example8.txt
@@ -0,0 +1,20 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="MethodName"/>
+      <property name="query" value="//CLASS_DEF[@text='FileOne']/OBJBLOCK/
+                METHOD_DEF[@text='MyMethod1' or @text='MyMethod2']/IDENT"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class FileOne {
+  public void MyMethod1() {} // OK
+  public void MyMethod2() {} // OK
+  public void MyMethod3() {} // violation, name 'MyMethod3' must
+                             // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example9.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example9.txt
new file mode 100644
index 00000000000..34653a4ea7c
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example9.txt
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressionXpathSingleFilter">
+      <property name="checks" value="LocalFinalVariableName"/>
+      <property name="query" value="//CLASS_DEF[@text='TestClass']/OBJBLOCK
+            /METHOD_DEF[@text='testMethod']/SLIST
+            /VARIABLE_DEF[@text='testVariable1']/IDENT"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public class TestClass {
+  public void testMethod() {
+    final int testVariable1 = 10; // OK
+    final int testVariable2 = 10; // violation of the LocalFinalVariableName check,
+                                  // name 'testVariable2' must match pattern '^[A-Z][A-Z0-9]*$'
+  }
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example1.txt
new file mode 100644
index 00000000000..3e5b47e15ae
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example1.txt
@@ -0,0 +1,17 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWarningsHolder" />
+  </module>
+  <module name="SuppressWarningsFilter" />
+</module>
+*/
+
+// xdoc section -- start
+@SuppressWarnings({"memberName"})
+private int J; // should NOT fail MemberNameCheck
+
+@SuppressWarnings({"MemberName"})
+@SuppressWarnings({"NoWhitespaceAfter"})
+private int [] ARRAY; // should NOT fail MemberNameCheck and NoWhitespaceAfterCheck
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example2.txt
new file mode 100644
index 00000000000..475bdfc3cbc
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example2.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWarningsHolder" />
+    <module name="RegexpSinglelineJava">
+      <property name="id" value="systemout"/>
+      <property name="format" value="^.*System\.(out|err).*$"/>
+      <property name="message"
+        value="Don't use System.out/err, use SLF4J instead."/>
+    </module>
+  </module>
+  <module name="SuppressWarningsFilter" />
+</module>
+*/
+
+// xdoc section -- start
+@SuppressWarnings("checkstyle:systemout")
+public static void foo() {
+  System.out.println("Debug info."); // should NOT fail RegexpSinglelineJava
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example1.txt
new file mode 100644
index 00000000000..5cdab78118b
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example1.txt
@@ -0,0 +1,11 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+private int [] array; // SUPPRESS CHECKSTYLE
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example2.txt
new file mode 100644
index 00000000000..60ab6f5d6a1
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example2.txt
@@ -0,0 +1,15 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/>
+      <property name="checkFormat" value=".*"/>
+      <property name="influenceFormat" value="0"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public static final int lowerCaseConstant; // CHECKSTYLE IGNORE THIS LINE
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example3.txt
new file mode 100644
index 00000000000..47e75141e82
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example3.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat" value="OK to catch (\w+) here"/>
+      <property name="checkFormat" value="IllegalCatchCheck"/>
+      <property name="messageFormat" value="$1"/>
+      <property name="influenceFormat" value="-1"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+. . .
+catch (RuntimeException re) {
+// OK to catch RuntimeException here
+}
+catch (Throwable th) { ... }
+. . .
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example4.txt
new file mode 100644
index 00000000000..2d94ac962ce
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example4.txt
@@ -0,0 +1,20 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat"
+          value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
+      <property name="checkFormat" value="$1"/>
+      <property name="influenceFormat" value="$2"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+static final int lowerCaseConstant; // CHECKSTYLE IGNORE ConstantNameCheck FOR NEXT 3 LINES
+static final int lowerCaseConstant1;
+static final int lowerCaseConstant2;
+static final int lowerCaseConstant3;
+static final int lowerCaseConstant4; // will warn here
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example5.txt
new file mode 100644
index 00000000000..e8d88e0e083
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example5.txt
@@ -0,0 +1,18 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat"
+        value="ALLOW (\\w+) ON PREVIOUS LINE"/>
+      <property name="checkFormat" value="$1"/>
+      <property name="influenceFormat" value="-1"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+private int D2;
+// ALLOW MemberName ON PREVIOUS LINE
+. . .
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example6.txt
new file mode 100644
index 00000000000..1894ea39fdb
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example6.txt
@@ -0,0 +1,16 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat"
+        value="@cs\.suppress \[(\w+(\|\w+)*)\] \w[-\.'`,:;\w ]{14,}"/>
+      <property name="checkFormat" value="$1"/>
+      <property name="influenceFormat" value="1"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+public static final int [] array; // @cs.suppress [ConstantName|NoWhitespaceAfter] A comment here
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example7.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example7.txt
new file mode 100644
index 00000000000..3a7e5f2916a
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example7.txt
@@ -0,0 +1,33 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat"
+        value="@cs\.suppress \[(\w+(\|\w+)*)\] \w[-\.'`,:;\w ]{14,}"/>
+      <property name="checkFormat" value="$1"/>
+      <property name="influenceFormat" value="1"/>
+    </module>
+    <module name="RegexpSinglelineJava">
+      <property name="id" value="ignore"/>
+      <property name="format" value="^.*@Ignore\s*$"/>
+      <property name="message" value="@Ignore should have a reason."/>
+    </module>
+
+    <module name="RegexpSinglelineJava">
+      <property name="id" value="systemout"/>
+      <property name="format" value="^.*System\.(out|err).*$"/>
+      <property name="message" value="Don't use System.out/err, use SLF4J instead."/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+@Ignore // @cs-: ignore (test has not been implemented yet)
+@Test
+public void testMethod() { }
+
+public static void foo() {
+  System.out.println("Debug info."); // @cs-: systemout (should not fail RegexpSinglelineJava)
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example8.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example8.txt
new file mode 100644
index 00000000000..c1e0674aaeb
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example8.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat" value="@cs-\: ([\w\|]+) influence (\d+)"/>
+      <property name="checkFormat" value="$1"/>
+      <property name="influenceFormat" value="$2"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// @cs-: ClassDataAbstractionCoupling influence 2
+// @cs-: MagicNumber influence 4
+@Service // no violations from ClassDataAbstractionCoupling here
+@Transactional
+public class UserService {
+  private int value = 10022; // no violations from MagicNumber here
+}
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example1.txt
new file mode 100644
index 00000000000..8f36444b62b
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example1.txt
@@ -0,0 +1,13 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter"/>
+  <module name="TreeWalker">
+    <module name="MagicNumber"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+int hoursInDay = 24; // SUPPRESS CHECKSTYLE because it is too obvious
+int daysInWeek = 7; // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example2.txt
new file mode 100644
index 00000000000..f88461f5534
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example2.txt
@@ -0,0 +1,15 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="nearbyTextPattern" value="DO NOT CHECK THIS LINE"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="MagicNumber"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+int a = 42; // DO NOT CHECK THIS LINE
+int b = 43; // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example3.txt
new file mode 100644
index 00000000000..c2d91924524
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example3.txt
@@ -0,0 +1,15 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="messagePattern" value=".*Line.*"/>
+    <property name="nearbyTextPattern" value=".*"/>
+  </module>
+  <module name="LineLength">
+    <property name="max" value="10"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+export FOO=BAR # ok, because violation message is matching suppress pattern
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example4.txt
new file mode 100644
index 00000000000..d859f281e79
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example4.txt
@@ -0,0 +1,20 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="idPattern" value="ignoreMe"/>
+  </module>
+  <module name="LineLength">
+    <property name="max" value="55"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="MagicNumber">
+      <property name="id" value="ignoreMe"/>
+    </module>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+int a = 42; // SUPPRESS CHECKSTYLE because i want to
+static final int LONG_VAR_NAME_TO_TAKE_MORE_THAN_55_CHARS = 22; // LineLength violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example5.txt
new file mode 100644
index 00000000000..e0054fbfba7
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example5.txt
@@ -0,0 +1,15 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="lineRange" value="2"/>
+  </module>
+  <module name="UniqueProperties"/>
+</module>
+*/
+
+// xdoc section -- start
+key.one=41 # SUPPRESS CHECKSTYLE because I want to
+key.one=42 # ok
+key.one=43 # ok
+key.one=44 # violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example6.txt
new file mode 100644
index 00000000000..8437f28ba46
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example6.txt
@@ -0,0 +1,15 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="lineRange" value="-1"/>
+  </module>
+  <module name="UniqueProperties"/>
+</module>
+*/
+
+// xdoc section -- start
+key.one=41 # violation
+key.one=42 # ok
+key.one=43 # SUPPRESS CHECKSTYLE because I want to
+key.one=44 # violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example7.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example7.txt
new file mode 100644
index 00000000000..0b5c6345c83
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example7.txt
@@ -0,0 +1,17 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="nearbyTextPattern"
+      value="-@cs\[(\w+)\] (\w+)"/>
+    <property name="checkPattern" value="$1"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="MagicNumber"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+int a = 42; // -@cs[MagicNumber] We do not consider this number as magic for some reason.
+int b = 43; // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example8.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example8.txt
new file mode 100644
index 00000000000..736e2de7d25
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example8.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="nearbyTextPattern"
+      value="@cs-: (\w+) for ([+-]\d+) lines"/>
+    <property name="checkPattern" value="$1"/>
+    <property name="lineRange" value="$2"/>
+  </module>
+  <module name="TreeWalker">
+    <module name="MagicNumber"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+int a = 42; // @cs-: MagicNumber for +3 lines
+int b = 43;
+int c = 44;
+int d = 45;
+int e = 46; // violation
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example9.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example9.txt
new file mode 100644
index 00000000000..901ab2ceb2f
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example9.txt
@@ -0,0 +1,21 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithNearbyTextFilter">
+    <property name="checkPattern" value="LineLength"/>
+    <property name="nearbyTextPattern"
+      value="&lt;a href=&quot;[^&quot;]+&quot;&gt;"/>
+  </module>
+  <module name="LineLength">
+    <property name="max" value="90"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+/**
+* Flag description.
+*
+* Disabled until <a href="www.github.com/owner/repo/issue/9#comment"> // ok
+*/
+public static final boolean SOME_FLAG = false;
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example1.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example1.txt
new file mode 100644
index 00000000000..4b67f21232e
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example1.txt
@@ -0,0 +1,8 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithPlainTextCommentFilter"/>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example2.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example2.txt
new file mode 100644
index 00000000000..285e941f10b
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example2.txt
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <property name="fileExtensions" value="properties"/>
+
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="BEGIN GENERATED CONTENT"/>
+    <property name="onCommentFormat" value="END GENERATED CONTENT"/>
+  </module>
+
+</module>
+*/
+
+// xdoc section -- start
+//BEGIN GENERATED CONTENT
+my.property=value1 // No violation events will be reported
+my.property=value2 // No violation events will be reported
+//END GENERATED CONTENT
+. . .
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example3.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example3.txt
new file mode 100644
index 00000000000..77d95a518e1
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example3.txt
@@ -0,0 +1,19 @@
+/*xml
+<module name="Checker">
+  <property name="fileExtensions" value="sql"/>
+
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="stop tab check"/>
+    <property name="onCommentFormat" value="resume tab check"/>
+    <property name="checkFormat" value="FileTabCharacterCheck"/>
+  </module>
+
+</module>
+*/
+
+// xdoc section -- start
+-- stop tab check
+  SELECT * FROM users // won't warn here if there is a tab character on line
+-- resume tab check
+  SELECT 1 // will warn here if there is a tab character on line
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example4.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example4.txt
new file mode 100644
index 00000000000..1d3873f3a44
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example4.txt
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <property name="fileExtensions" value="xml"/>
+
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
+    <property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
+    <property name="checkFormat" value="$1"/>
+  </module>
+
+</module>
+*/
+
+// xdoc section -- start
+// CSOFF: RegexpSinglelineCheck
+ // RegexpSingleline check won't warn any lines below here if the line matches regexp
+<condition property="checkstyle.ant.skip">
+  <isset property="checkstyle.ant.skip"/>
+</condition>
+// CSON: RegexpSinglelineCheck
+// RegexpSingleline check will warn below here if the line matches regexp
+<property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example5.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example5.txt
new file mode 100644
index 00000000000..adf95b62f35
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example5.txt
@@ -0,0 +1,23 @@
+/*xml
+<module name="Checker">
+  <property name="fileExtensions" value="java"/>
+
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat"
+      value="CHECKSTYLE_OFF: ALMOST_ALL"/>
+    <property name="onCommentFormat"
+      value="CHECKSTYLE_ON: ALMOST_ALL"/>
+    <property name="checkFormat"
+      value="^((?!(FileTabCharacterCheck)).)*$"/>
+  </module>
+
+</module>
+*/
+
+// xdoc section -- start
+// CHECKSTYLE_OFF: ALMOST_ALL
+public static final int array [];
+private String [] strArray;
+// CHECKSTYLE_ON: ALMOST_ALL
+private int array1 [];
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example6.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example6.txt
new file mode 100644
index 00000000000..c6db413a2be
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example6.txt
@@ -0,0 +1,14 @@
+/*xml
+<module name="Checker">
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="stop"/>
+    <property name="onCommentFormat" value="resume"/>
+    <property name="checkFormat" value="FileTabCharacterCheck"/>
+    <property name="messageFormat"
+        value="^File contains tab characters (this is the first instance)\.$"/>
+  </module>
+</module>
+*/
+
+// xdoc section -- start
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example7.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example7.txt
new file mode 100644
index 00000000000..1d2e63dc09d
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example7.txt
@@ -0,0 +1,40 @@
+/*xml
+<module name="Checker">
+  <property name="fileExtensions" value="sql"/>
+
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="CSOFF (\w+) \(\w+\)"/>
+    <property name="onCommentFormat" value="CSON (\w+)"/>
+    <property name="idFormat" value="$1"/>
+  </module>
+
+  <module name="TreeWalker">
+    <module name="RegexpSinglelineJava">
+      <property name="id" value="count"/>
+      <property name="format" value="^.*COUNT(*).*$"/>
+      <property name="message"
+        value="Don't use COUNT(*), use COUNT(1) instead."/>
+    </module>
+
+    <module name="RegexpSinglelineJava">
+      <property name="id" value="join"/>
+      <property name="format" value="^.*JOIN\s.+\s(ON|USING)$"/>
+      <property name="message"
+        value="Don't use JOIN, use sub-select instead."/>
+    </module>
+  </module>
+
+</module>
+*/
+
+// xdoc section -- start
+-- CSOFF join (it is ok to use join here for performance reasons)
+SELECT name, job_name
+FROM users AS u
+JOIN jobs AS j ON u.job_id = j.id
+-- CSON join
+
+-- CSOFF count (test query execution plan)
+EXPLAIN SELECT COUNT(*) FROM restaurants
+-- CSON count
+// xdoc section -- end
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example8.txt b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example8.txt
new file mode 100644
index 00000000000..81f29cd8c62
--- /dev/null
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example8.txt
@@ -0,0 +1,22 @@
+/*xml
+<module name="Checker">
+  <property name="fileExtensions" value="sql"/>
+
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="@cs-\: ([\w\|]+)"/>
+    <property name="checkFormat" value="$1"/>
+  </module>
+
+</module>
+*/
+
+// xdoc section -- start
+-- @cs-: RegexpSinglelineCheck
+-- @cs-: FileTabCharacterCheck
+CREATE TABLE STATION (
+  ID INTEGER PRIMARY KEY,
+  CITY CHAR(20),
+  STATE CHAR(2),
+  LAT_N REAL,
+  LONG_W REAL);
+// xdoc section -- end
diff --git a/src/xdocs/anttask.xml.vm b/src/xdocs/anttask.xml.vm
index 515d7f58b93..ef2cba48570 100644
--- a/src/xdocs/anttask.xml.vm
+++ b/src/xdocs/anttask.xml.vm
@@ -21,7 +21,7 @@
       <p>
         This task runs Checkstyle over specified Java files.
         The latest version of checkstyle can be found at
-        <a href="https://checkstyle.org/">https://checkstyle.org/</a>.
+        <a href="./index.html">https://checkstyle.org/</a>.
 
         This task is included in the checkstyle distribution.
       </p>
diff --git a/src/xdocs/beginning_development.xml b/src/xdocs/beginning_development.xml
index 430acf61387..08301e92a43 100644
--- a/src/xdocs/beginning_development.xml
+++ b/src/xdocs/beginning_development.xml
@@ -17,22 +17,22 @@
     </section>
     <section name="Before development">
       <p>
-        1. Ensure that Git, Java JDK >= 11 until JDK 17, maven >= 3.3.9 are installed.<br/>
+        1. Ensure that Git, Java JDK >= 11 until JDK 17, maven >= 3.6.3 are installed.<br/>
         You can find information about development environment preparation here:
         <a href="https://github.com/sevntu-checkstyle/sevntu.checkstyle/wiki/Prepare-Development-Environment-in-Ubuntu-12.04">
         Prepare development environment in Ubuntu</a>.<br/>
         2. Fork Checkstyle upstream project. As it is described
         <a href="https://help.github.com/articles/fork-a-repo/"> here</a><br/>
-        3. Checkout the current source code from: https://github.com/you_user_name/checkstyle/<br/>
-        by running
+        3. Clone your forked repository to your computer:
       </p>
       <div class="wrap-content">
         <source>
-            git clone git@github.com:you_user_name/checkstyle.git
+            git clone git@github.com:your_user_name/checkstyle.git
         </source>
       </div>
       <p>
-        4. Before opening project in IDE do build in terminal by running in repository root folder
+        4. Before opening project in your IDE, build the project in your terminal to download<br/>
+        all needed artifacts. From the repository root folder, run:
       </p>
       <div class="wrap-content">
         <source>
@@ -49,9 +49,16 @@
         <a href="idea.html">IntelliJ IDEA IDE</a><br/>
       </p>
 
+      <p>
+        Community video walk throughs of these instructions are available in SteLeo1602's
+        <a href="https://www.youtube.com/playlist?list=PLHM9s_lN4X0hzOQ0sUmGdroxW0HfREAqj">
+           playlist on YouTube.</a>
+      </p>
+
       <p>
         Follow these instructions of Git usage and creating a Pull Request:<br/>
-           1) Configure remotes:
+           1) Configure remotes by pointing to the official checkstyle repository,<br/>
+        naming it "upstream":
       </p>
       <div class="wrap-content">
         <source>
@@ -107,7 +114,7 @@
         </source>
       </div>
       <p>
-           7) Rebase your branch over your updated master
+           7) Rebase your branch on your updated master:
       </p>
       <div class="wrap-content">
         <source>
@@ -118,9 +125,10 @@
       <p>
            8) In the process of the rebase, it may discover conflicts.<br/>
            In that case it will stop and allow you to fix the conflicts.<br/>
-           After fixing conflicts, use git add . to update the index with those contents,<br/>
-           and then just run:
+           After fixing conflicts, use
       </p>
+      <source>git add .</source>
+      <p> to update the index with those contents, and then just run:</p>
       <div class="wrap-content">
         <source>
           git rebase --continue
diff --git a/src/xdocs/checks.xml b/src/xdocs/checks.xml
index 9dc8ce06ec2..e1784914f97 100644
--- a/src/xdocs/checks.xml
+++ b/src/xdocs/checks.xml
@@ -208,6 +208,14 @@
             <td><a href="checks/naming/constantname.html#ConstantName">ConstantName</a></td>
             <td>Checks that constant names conform to a specified pattern.</td>
           </tr>
+          <tr>
+            <td>
+              <a href="checks/coding/constructorsdeclarationgrouping.html#ConstructorsDeclarationGrouping">
+                ConstructorsDeclarationGrouping
+              </a>
+            </td>
+            <td>Checks that all constructors are grouped together.</td>
+          </tr>
           <tr>
             <td>
               <a href="checks/coding/covariantequals.html#CovariantEquals">
diff --git a/src/xdocs/checks/annotation/annotationlocation.xml b/src/xdocs/checks/annotation/annotationlocation.xml
index 53c1b9d5307..b0e965b6ae6 100644
--- a/src/xdocs/checks/annotation/annotationlocation.xml
+++ b/src/xdocs/checks/annotation/annotationlocation.xml
@@ -58,22 +58,20 @@ public String getNameIfPresent() { ... }
               <td><code>false</code></td>
               <td>6.0</td>
             </tr>
-            <tr>
-              <td>allowSamelineSingleParameterlessAnnotation</td>
-              <td>Allow single parameterless annotation to be located on the same line as
-                  target element.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.1</td>
-            </tr>
             <tr>
               <td>allowSamelineParameterizedAnnotation</td>
-              <td>Allow one and only parameterized annotation to be located on the same line as
-                  target element.</td>
+              <td>Allow one and only parameterized annotation to be located on the same line as target element.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>6.4</td>
             </tr>
+            <tr>
+              <td>allowSamelineSingleParameterlessAnnotation</td>
+              <td>Allow single parameterless annotation to be located on the same line as target element.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>6.1</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
@@ -134,108 +132,138 @@ public String getNameIfPresent() { ... }
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the default check to allow one single parameterless annotation on the same
             line:
         </p>
         <source>
-&lt;module name=&quot;AnnotationLocation&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationLocation&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>
-          Example for above configuration:
-        </p>
+        <p id="Example1-code">Example:</p>
         <source>
-@NotNull private boolean field1; //ok
-@Override public int hashCode() { return 1; } //ok
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //ok
-@SuppressWarnings(&quot;deprecation&quot;) DataLoader loader; //violation
-@SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; } //violation
-@NotNull @Mock DataLoader loader; //violation
+class Example1 {
+  @Nonnull
+  private boolean field1; // ok
+  @Override public int hashCode() { return 1; } // ok
+  @Nonnull // ok
+  private boolean field2;
+  @Override // ok
+  public boolean equals(Object obj) { return true; }
+  @Mock DataLoader loader1; // ok
+  @SuppressWarnings(&quot;deprecation&quot;) DataLoader loader2;
+  // violation above, 'Annotation 'SuppressWarnings' should be alone on line'
+  @SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; }
+  // violation above, 'Annotation 'SuppressWarnings' should be alone on line'
+  @Nonnull @Mock DataLoader loader3;
+  // violation above, 'Annotation 'Mock' should be alone on line'
+}
         </source>
-        <p>
+        <p id="Example2-config">
           Use the following configuration to allow multiple annotations on the same line:
         </p>
         <source>
-&lt;module name=&quot;AnnotationLocation&quot;&gt;
-  &lt;property name=&quot;allowSamelineMultipleAnnotations&quot; value=&quot;true&quot;/&gt;
-  &lt;property name=&quot;allowSamelineSingleParameterlessAnnotation&quot;
-    value=&quot;false&quot;/&gt;
-  &lt;property name=&quot;allowSamelineParameterizedAnnotation&quot; value=&quot;false&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationLocation&quot;&gt;
+      &lt;property name=&quot;allowSamelineSingleParameterlessAnnotation&quot;
+                value=&quot;false&quot;/&gt;
+      &lt;property name=&quot;allowSamelineParameterizedAnnotation&quot; value=&quot;false&quot;/&gt;
+      &lt;property name=&quot;allowSamelineMultipleAnnotations&quot; value=&quot;true&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example to allow any location multiple annotations:
-        </p>
+        <p id="Example2-code">Example:</p>
         <source>
-@NotNull private boolean field1; //ok
-@Override public int hashCode() { return 1; } //ok
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //ok
-@SuppressWarnings(&quot;deprecation&quot;) DataLoader loader; //ok
-@SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; } //ok
-@NotNull @Mock DataLoader loader; //ok
+class Example2 {
+  @Nonnull
+  private boolean field1;
+  @Override public int hashCode() { return 1; } // ok
+  @Nonnull
+  private boolean field2;
+  @Override
+  public boolean equals(Object obj) { return true; }
+  @Mock
+  DataLoader loader1;
+  @SuppressWarnings(&quot;deprecation&quot;) DataLoader loader;
+  @SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; } // ok
+  @Nonnull @Mock DataLoader loader2;
+  // ok above as 'allowSamelineMultipleAnnotations' set to true
+}
         </source>
-        <p>
+        <p id="Example3-config">
           Use the following configuration to allow only one and only parameterized annotation
           on the same line:
         </p>
         <source>
-&lt;module name=&quot;AnnotationLocation&quot;&gt;
-  &lt;property name=&quot;allowSamelineMultipleAnnotations&quot; value=&quot;false&quot;/&gt;
-  &lt;property name=&quot;allowSamelineSingleParameterlessAnnotation&quot;
-    value=&quot;false&quot;/&gt;
-  &lt;property name=&quot;allowSamelineParameterizedAnnotation&quot; value=&quot;true&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationLocation&quot;&gt;
+      &lt;property name=&quot;allowSamelineMultipleAnnotations&quot; value=&quot;false&quot;/&gt;
+      &lt;property name=&quot;allowSamelineSingleParameterlessAnnotation&quot;
+                value=&quot;false&quot;/&gt;
+      &lt;property name=&quot;allowSamelineParameterizedAnnotation&quot; value=&quot;true&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example to allow only one and only parameterized annotation on the same line:
-        </p>
+        <p id="Example3-code">Example:</p>
         <source>
-@NotNull private boolean field1; //violation
-@Override public int hashCode() { return 1; } //violation
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //violation
-@SuppressWarnings(&quot;deprecation&quot;) DataLoader loader; //ok
-@SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; } //ok
-@NotNull @Mock DataLoader loader; //violation
+class Example3 {
+  // violation below, 'Annotation 'Nonnull' should be alone on line.'
+  @Nonnull private boolean field1;
+  // violation below, 'Annotation 'Override' should be alone on line.'
+  @Override public int hashCode() { return 1; }
+  @Nonnull
+  private boolean field2;
+  @Override
+  public boolean equals(Object obj) { return true; }
+  @Mock
+  DataLoader loader;
+  @SuppressWarnings(&quot;deprecation&quot;) DataLoader loader1;
+  @SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; }
+  // violation below, 'Annotation 'Nonnull' should be alone on line.'
+  @Nonnull @Mock DataLoader loader2;
+  // violation above, 'Annotation 'Mock' should be alone on line.'
+}
         </source>
-        <p>
+        <p id="Example4-config">
           Use the following configuration to only validate annotations on methods to allow one
           single parameterless annotation on the same line:
         </p>
         <source>
-&lt;module name=&quot;AnnotationLocation&quot;&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;METHOD_DEF&quot;/&gt;
-  &lt;property name=&quot;allowSamelineMultipleAnnotations&quot; value=&quot;false&quot;/&gt;
-  &lt;property name=&quot;allowSamelineSingleParameterlessAnnotation&quot;
-    value=&quot;true&quot;/&gt;
-  &lt;property name=&quot;allowSamelineParameterizedAnnotation&quot; value=&quot;false&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationLocation&quot;&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;METHOD_DEF&quot;/&gt;
+      &lt;property name=&quot;allowSamelineMultipleAnnotations&quot; value=&quot;false&quot;/&gt;
+      &lt;property name=&quot;allowSamelineSingleParameterlessAnnotation&quot;
+                value=&quot;true&quot;/&gt;
+      &lt;property name=&quot;allowSamelineParameterizedAnnotation&quot; value=&quot;false&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example for above configuration to check only methods:
-        </p>
+        <p id="Example4-code">Example:</p>
         <source>
-@NotNull private boolean field1; //ok
-@Override public int hashCode() { return 1; } //ok
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //ok
-@SuppressWarnings(&quot;deprecation&quot;) DataLoader loader; //ok
-@SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; } //violation
-@NotNull @Mock DataLoader loader; //ok
+class Example4 {
+  @NotNull private boolean field1; // ok, as 'tokens' property set to METHOD_DEF only
+  @Override public int hashCode() { return 1; }
+  @NotNull
+  private boolean field2;
+  @Override
+  public boolean equals(Object obj) { return true; }
+  @Mock
+  DataLoader loader1;
+  @SuppressWarnings(&quot;deprecation&quot;) DataLoader loader;
+  @SuppressWarnings(&quot;deprecation&quot;) public int foo() { return 1; }
+  // violation above, 'Annotation 'SuppressWarnings' should be alone on line.'
+  @NotNull @Mock DataLoader loader2;
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/annotation/annotationlocation.xml.template b/src/xdocs/checks/annotation/annotationlocation.xml.template
index adc24f2a962..4641638f0de 100644
--- a/src/xdocs/checks/annotation/annotationlocation.xml.template
+++ b/src/xdocs/checks/annotation/annotationlocation.xml.template
@@ -43,200 +43,73 @@ public String getNameIfPresent() { ... }
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowSamelineMultipleAnnotations</td>
-              <td>Allow annotation(s) to be located on the same line as target element.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.0</td>
-            </tr>
-            <tr>
-              <td>allowSamelineSingleParameterlessAnnotation</td>
-              <td>Allow single parameterless annotation to be located on the same line as
-                  target element.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.1</td>
-            </tr>
-            <tr>
-              <td>allowSamelineParameterizedAnnotation</td>
-              <td>Allow one and only parameterized annotation to be located on the same line as
-                  target element.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.4</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                    PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                    ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                    ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                    ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                    PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                    ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>6.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the default check to allow one single parameterless annotation on the same
             line:
         </p>
-        <source>
-&lt;module name="AnnotationLocation"/&gt;
-        </source>
-        <p>
-          Example for above configuration:
-        </p>
-        <source>
-@NotNull private boolean field1; //ok
-@Override public int hashCode() { return 1; } //ok
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //ok
-@SuppressWarnings("deprecation") DataLoader loader; //violation
-@SuppressWarnings("deprecation") public int foo() { return 1; } //violation
-@NotNull @Mock DataLoader loader; //violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           Use the following configuration to allow multiple annotations on the same line:
         </p>
-        <source>
-&lt;module name="AnnotationLocation"&gt;
-  &lt;property name="allowSamelineMultipleAnnotations" value="true"/&gt;
-  &lt;property name="allowSamelineSingleParameterlessAnnotation"
-    value="false"/&gt;
-  &lt;property name="allowSamelineParameterizedAnnotation" value="false"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example to allow any location multiple annotations:
-        </p>
-        <source>
-@NotNull private boolean field1; //ok
-@Override public int hashCode() { return 1; } //ok
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //ok
-@SuppressWarnings("deprecation") DataLoader loader; //ok
-@SuppressWarnings("deprecation") public int foo() { return 1; } //ok
-@NotNull @Mock DataLoader loader; //ok
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           Use the following configuration to allow only one and only parameterized annotation
           on the same line:
         </p>
-        <source>
-&lt;module name="AnnotationLocation"&gt;
-  &lt;property name="allowSamelineMultipleAnnotations" value="false"/&gt;
-  &lt;property name="allowSamelineSingleParameterlessAnnotation"
-    value="false"/&gt;
-  &lt;property name="allowSamelineParameterizedAnnotation" value="true"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example to allow only one and only parameterized annotation on the same line:
-        </p>
-        <source>
-@NotNull private boolean field1; //violation
-@Override public int hashCode() { return 1; } //violation
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //violation
-@SuppressWarnings("deprecation") DataLoader loader; //ok
-@SuppressWarnings("deprecation") public int foo() { return 1; } //ok
-@NotNull @Mock DataLoader loader; //violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           Use the following configuration to only validate annotations on methods to allow one
           single parameterless annotation on the same line:
         </p>
-        <source>
-&lt;module name="AnnotationLocation"&gt;
-  &lt;property name="tokens" value="METHOD_DEF"/&gt;
-  &lt;property name="allowSamelineMultipleAnnotations" value="false"/&gt;
-  &lt;property name="allowSamelineSingleParameterlessAnnotation"
-    value="true"/&gt;
-  &lt;property name="allowSamelineParameterizedAnnotation" value="false"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example for above configuration to check only methods:
-        </p>
-        <source>
-@NotNull private boolean field1; //ok
-@Override public int hashCode() { return 1; } //ok
-@NotNull //ok
-private boolean field2;
-@Override //ok
-public boolean equals(Object obj) { return true; }
-@Mock DataLoader loader; //ok
-@SuppressWarnings("deprecation") DataLoader loader; //ok
-@SuppressWarnings("deprecation") public int foo() { return 1; } //violation
-@NotNull @Mock DataLoader loader; //ok
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/Example4.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/annotation/annotationonsameline.xml b/src/xdocs/checks/annotation/annotationonsameline.xml
index 817bc9d5eb7..024a7a695f3 100644
--- a/src/xdocs/checks/annotation/annotationonsameline.xml
+++ b/src/xdocs/checks/annotation/annotationonsameline.xml
@@ -60,10 +60,10 @@
                     DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
                     ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>
@@ -92,58 +92,67 @@
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
         <source>
-&lt;module name=&quot;AnnotationOnSameLine&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationOnSameLine&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example1-code">Example:</p>
         <source>
-class Foo {
+class Example1 {
 
-  @SuppressWarnings(&quot;deprecation&quot;)  // violation, annotation should be on the same line
-  public Foo() {
+  @SuppressWarnings(&quot;deprecation&quot;) // violation
+  public Example1() {
   }
 
   @SuppressWarnings(&quot;unchecked&quot;) public void fun2() {  // OK
   }
 
+  public void fun1() {
+  }
+
 }
 
-@SuppressWarnings(&quot;unchecked&quot;) class Bar extends Foo {  // OK
+@SuppressWarnings(&quot;unchecked&quot;) class Test1 extends Example1 {  // OK
 
-  @Deprecated public Bar() {  // OK
+  @Deprecated public Test1() {  // OK
   }
 
-  @Override  // violation, annotation should be on the same line
+  @Override // violation
   public void fun1() {
   }
 
-  @Before @Override public void fun2() {  // OK
+  @Before // violation
+  @Override public void fun2() {  // OK
   }
 
-  @SuppressWarnings(&quot;deprecation&quot;)  // violation, annotation should be on the same line
+  @SuppressWarnings(&quot;deprecation&quot;) // violation
   @Before public void fun3() {
   }
 
 }
         </source>
-        <p>
+
+        <p id="Example2-config">
           To configure the check to check for annotations applied on
           interfaces, variables and constructors:
         </p>
         <source>
-&lt;module name=&quot;AnnotationOnSameLine&quot;&gt;
-  &lt;property name=&quot;tokens&quot;
-      value=&quot;INTERFACE_DEF, VARIABLE_DEF, CTOR_DEF&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationOnSameLine&quot;&gt;
+      &lt;property name=&quot;tokens&quot;
+                value=&quot;INTERFACE_DEF, VARIABLE_DEF, CTOR_DEF&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example2-code">Example:</p>
         <source>
 @Deprecated interface Foo {  // OK
 
@@ -151,17 +160,17 @@ class Foo {
 
 }
 
-class Bar implements Foo {
+class Example2 implements Foo {
 
-  @SuppressWarnings(&quot;deprecation&quot;)  // violation, annotation should be on the same line
-  public Bar() {
+  @SuppressWarnings(&quot;deprecation&quot;) // violation
+  public Example2() {
   }
 
   @Override  // OK
   public void doSomething() {
   }
 
-  @Nullable  // violation, annotation should be on the same line
+  @Nullable // violation
   String s;
 
 }
diff --git a/src/xdocs/checks/annotation/annotationonsameline.xml.template b/src/xdocs/checks/annotation/annotationonsameline.xml.template
index fd8bca3d9a2..771020a6021 100644
--- a/src/xdocs/checks/annotation/annotationonsameline.xml.template
+++ b/src/xdocs/checks/annotation/annotationonsameline.xml.template
@@ -18,154 +18,44 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                    PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                    ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                    TYPECAST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_THROWS">
-                    LITERAL_THROWS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPLEMENTS_CLAUSE">
-                    IMPLEMENTS_CLAUSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_ARGUMENT">
-                    TYPE_ARGUMENT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                    LITERAL_NEW</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                    DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                    ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>8.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationOnSameLineCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
-        <source>
-&lt;module name="AnnotationOnSameLine"/&gt;
-        </source>
-        <p>
-          Example:
-        </p>
-        <source>
-class Foo {
-
-  @SuppressWarnings("deprecation")  // violation, annotation should be on the same line
-  public Foo() {
-  }
-
-  @SuppressWarnings("unchecked") public void fun2() {  // OK
-  }
-
-}
-
-@SuppressWarnings("unchecked") class Bar extends Foo {  // OK
-
-  @Deprecated public Bar() {  // OK
-  }
-
-  @Override  // violation, annotation should be on the same line
-  public void fun1() {
-  }
-
-  @Before @Override public void fun2() {  // OK
-  }
-
-  @SuppressWarnings("deprecation")  // violation, annotation should be on the same line
-  @Before public void fun3() {
-  }
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-}
-        </source>
-        <p>
+        <p id="Example2-config">
           To configure the check to check for annotations applied on
           interfaces, variables and constructors:
         </p>
-        <source>
-&lt;module name="AnnotationOnSameLine"&gt;
-  &lt;property name="tokens"
-      value="INTERFACE_DEF, VARIABLE_DEF, CTOR_DEF"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example:
-        </p>
-        <source>
-@Deprecated interface Foo {  // OK
-
-  void doSomething();
-
-}
-
-class Bar implements Foo {
-
-  @SuppressWarnings("deprecation")  // violation, annotation should be on the same line
-  public Bar() {
-  }
-
-  @Override  // OK
-  public void doSomething() {
-  }
-
-  @Nullable  // violation, annotation should be on the same line
-  String s;
-
-}
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationonsameline/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/annotation/annotationusestyle.xml b/src/xdocs/checks/annotation/annotationusestyle.xml
index 1d9d23d1668..e606032a976 100644
--- a/src/xdocs/checks/annotation/annotationusestyle.xml
+++ b/src/xdocs/checks/annotation/annotationusestyle.xml
@@ -86,160 +86,163 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>elementStyle</td>
-              <td>
-                Define the annotation element styles.
-              </td>
-              <td>
-                <a href="../../property_types.html#ElementStyleOption">ElementStyleOption</a>
-              </td>
-              <td>
-                <code>compact_no_array</code>
-              </td>
+              <td>closingParens</td>
+              <td>Define the policy for ending parenthesis.</td>
+              <td><a href="../../property_types.html#ClosingParensOption">ClosingParensOption</a></td>
+              <td><code>never</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>closingParens</td>
-              <td>
-                Define the policy for ending parenthesis.
-              </td>
-              <td>
-                <a href="../../property_types.html#ClosingParensOption">ClosingParensOption</a>
-              </td>
-              <td>
-                <code>never</code>
-              </td>
+              <td>elementStyle</td>
+              <td>Define the annotation element styles.</td>
+              <td><a href="../../property_types.html#ElementStyleOption">ElementStyleOption</a></td>
+              <td><code>compact_no_array</code></td>
               <td>5.0</td>
             </tr>
             <tr>
               <td>trailingArrayComma</td>
-              <td>
-                Define the policy for trailing comma in arrays.
-              </td>
-              <td>
-                <a href="../../property_types.html#TrailingArrayCommaOption">
-                  TrailingArrayCommaOption
-                </a>
-              </td>
-              <td>
-                <code>never</code>
-              </td>
+              <td>Define the policy for trailing comma in arrays.</td>
+              <td><a href="../../property_types.html#TrailingArrayCommaOption">TrailingArrayCommaOption</a></td>
+              <td><code>never</code></td>
               <td>5.0</td>
             </tr>
           </table>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
+        <p id="Example1-config">
+          To configure the check:
+        </p>
         <source>
-&lt;module name=&quot;AnnotationUseStyle&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationUseStyle&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example1-code">Example:</p>
         <source>
-@SuppressWarnings(&quot;unchecked&quot;) // OK
-@Deprecated // OK
-@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;}) // OK
-public class TestOne
+@SuppressWarnings(&quot;unchecked&quot;) // ok as it's in implied style
+@Deprecated // ok as it matches closingParens default property
+@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;}) // ok as it's in implied style
+public class Example1
 {
 
 }
 
-@SuppressWarnings(value={&quot;unchecked&quot;}) // Violation - parameter 'value' shouldn't be used
-@Deprecated() // Violation - cannot have a closing parenthesis
-@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,}) // Violation - cannot have a trailing array comma
-class TestTwo {
+// violation below 'Annotation style must be 'COMPACT_NO_ARRAY''
+@SuppressWarnings(value={&quot;unchecked&quot;})
+@Deprecated() // violation 'Annotation cannot have closing parenthesis'
+// violation below 'Annotation array values cannot contain trailing comma'
+@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,})
+class TestStyle1
+{
 
 }
         </source>
-        <p>
+
+        <p id="Example2-config">
           To configure the check to enforce an <code>expanded</code> style,
-            with a closing parenthesis and a trailing array comma set to <code>never</code>.
+          with a closing parenthesis and a trailing array comma set to <code>never</code>.
         </p>
         <source>
-&lt;module name=&quot;AnnotationUseStyle&quot;&gt;
-  &lt;property name=&quot;elementStyle&quot; value=&quot;expanded&quot;/&gt;
-  &lt;property name=&quot;closingParens&quot; value=&quot;never&quot;/&gt;
-  &lt;property name=&quot;trailingArrayComma&quot; value=&quot;never&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationUseStyle&quot;&gt;
+      &lt;property name=&quot;elementStyle&quot; value=&quot;expanded&quot;/&gt;
+      &lt;property name=&quot;closingParens&quot; value=&quot;never&quot;/&gt;
+      &lt;property name=&quot;trailingArrayComma&quot; value=&quot;never&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example2-code">Example:</p>
         <source>
-@SuppressWarnings(&quot;unchecked&quot;) // Violation - parameters should be referenced
-@Deprecated // OK
-@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;}) // Violation - parameters should be referenced
-public class TestOne
+@SuppressWarnings(&quot;unchecked&quot;) // violation 'Annotation style must be 'EXPANDED''
+@Deprecated // ok as closingParens property set to never
+// violation below 'Annotation style must be 'EXPANDED''
+@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;})
+public class Example2
 {
 
 }
 
-@SuppressWarnings(value={&quot;unchecked&quot;}) // OK
-@Deprecated() // Violation - cannot have a closing parenthesis
-@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,}) // Violation - cannot have a trailing array comma
-class TestTwo {
+@SuppressWarnings(value={&quot;unchecked&quot;}) // ok as elementStyle set to expanded
+@Deprecated() // violation 'Annotation cannot have closing parenthesis'
+// violation below 'Annotation array values cannot contain trailing comma'
+@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,})
+class TestStyle2 {
 
 }
         </source>
-        <p>
-          To configure the check to enforce a <code>compact</code> style,
-            with always including a closing parenthesis and ignoring a trailing array comma.
+
+        <p id="Example3-config">
+          To configure the check to enforce an <code>expanded</code> style,
+          with a closing parenthesis and a trailing array comma set to <code>never</code>.
         </p>
         <source>
-&lt;module name=&quot;AnnotationUseStyle&quot;&gt;
-  &lt;property name=&quot;elementStyle&quot; value=&quot;compact&quot;/&gt;
-  &lt;property name=&quot;closingParens&quot; value=&quot;always&quot;/&gt;
-  &lt;property name=&quot;trailingArrayComma&quot; value=&quot;ignore&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationUseStyle&quot;&gt;
+      &lt;property name=&quot;elementStyle&quot; value=&quot;compact&quot;/&gt;
+      &lt;property name=&quot;closingParens&quot; value=&quot;always&quot;/&gt;
+      &lt;property name=&quot;trailingArrayComma&quot; value=&quot;ignore&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example3-code">Example:</p>
         <source>
-@SuppressWarnings(&quot;unchecked&quot;) // OK
-@Deprecated // Violation - must have a closing parenthesis
-@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;}) // OK
-public class TestOne
+@SuppressWarnings(&quot;unchecked&quot;) // ok as element style set to compact
+@Deprecated // violation 'Annotation must have closing parenthesis'
+@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;}) // ok as it's in compact style
+public class Example3
 {
 
 }
 
-@SuppressWarnings(value={&quot;unchecked&quot;}) // Violation - parameter 'value' shouldn't be used
-@Deprecated() // OK
-@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,}) // Violation - parameter 'value' shouldn't be used
-class TestTwo {
+// violation below 'Annotation style must be 'COMPACT''
+@SuppressWarnings(value={&quot;unchecked&quot;})
+@Deprecated() // ok as closingParens set to always
+// violation below 'Annotation style must be 'COMPACT''
+@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,})
+class TestStyle3 {
 
 }
         </source>
-        <p>
+
+        <p id="Example4-config">
           To configure the check to enforce a trailing array comma,
-            with ignoring the elementStyle and a closing parenthesis.
+          with ignoring the elementStyle and a closing parenthesis.
         </p>
         <source>
-&lt;module name=&quot;AnnotationUseStyle&quot;&gt;
-  &lt;property name=&quot;elementStyle&quot; value=&quot;ignore&quot;/&gt;
-  &lt;property name=&quot;closingParens&quot; value=&quot;ignore&quot;/&gt;
-  &lt;property name=&quot;trailingArrayComma&quot; value=&quot;always&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AnnotationUseStyle&quot;&gt;
+      &lt;property name=&quot;elementStyle&quot; value=&quot;ignore&quot;/&gt;
+      &lt;property name=&quot;closingParens&quot; value=&quot;ignore&quot;/&gt;
+      &lt;property name=&quot;trailingArrayComma&quot; value=&quot;always&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example4-code">Example:</p>
         <source>
-@SuppressWarnings(&quot;unchecked&quot;) // OK
-@Deprecated // OK
-@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;}) // Violation - must have a trailing array comma
-public class TestOne
+@SuppressWarnings(&quot;unchecked&quot;) // ok as element style set to 'ignore'
+@Deprecated // ok as 'closingParens' is set to 'ignore
+// violation below 'Annotation array values must contain trailing comma'
+@SomeArrays({&quot;unchecked&quot;,&quot;unused&quot;})
+public class Example4
 {
 
 }
 
-@SuppressWarnings(value={&quot;unchecked&quot;}) // Violation - must have a trailing array comma
-@Deprecated() // OK
-@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,}) // OK
-class TestTwo {
+// violation below 'Annotation array values must contain trailing comma'
+@SuppressWarnings(value={&quot;unchecked&quot;})
+@Deprecated() // ok as 'closingParens' is set to 'ignore
+// ok below as it has a trailing array comma
+@SomeArrays(value={&quot;unchecked&quot;,&quot;unused&quot;,})
+class TestStyle4 {
 
 }
         </source>
diff --git a/src/xdocs/checks/annotation/annotationusestyle.xml.template b/src/xdocs/checks/annotation/annotationusestyle.xml.template
index 197d3299c9c..abca17b0a46 100644
--- a/src/xdocs/checks/annotation/annotationusestyle.xml.template
+++ b/src/xdocs/checks/annotation/annotationusestyle.xml.template
@@ -77,172 +77,75 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>elementStyle</td>
-              <td>
-                Define the annotation element styles.
-              </td>
-              <td>
-                <a href="../../property_types.html#ElementStyleOption">ElementStyleOption</a>
-              </td>
-              <td>
-                <code>compact_no_array</code>
-              </td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>closingParens</td>
-              <td>
-                Define the policy for ending parenthesis.
-              </td>
-              <td>
-                <a href="../../property_types.html#ClosingParensOption">ClosingParensOption</a>
-              </td>
-              <td>
-                <code>never</code>
-              </td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>trailingArrayComma</td>
-              <td>
-                Define the policy for trailing comma in arrays.
-              </td>
-              <td>
-                <a href="../../property_types.html#TrailingArrayCommaOption">
-                  TrailingArrayCommaOption
-                </a>
-              </td>
-              <td>
-                <code>never</code>
-              </td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
-        <source>
-&lt;module name="AnnotationUseStyle"/&gt;
-        </source>
-        <p>
-          Example:
+        <p id="Example1-config">
+          To configure the check:
         </p>
-        <source>
-@SuppressWarnings("unchecked") // OK
-@Deprecated // OK
-@SomeArrays({"unchecked","unused"}) // OK
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // Violation - parameter 'value' shouldn't be used
-@Deprecated() // Violation - cannot have a closing parenthesis
-@SomeArrays(value={"unchecked","unused",}) // Violation - cannot have a trailing array comma
-class TestTwo {
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-}
-        </source>
-        <p>
+        <p id="Example2-config">
           To configure the check to enforce an <code>expanded</code> style,
-            with a closing parenthesis and a trailing array comma set to <code>never</code>.
-        </p>
-        <source>
-&lt;module name="AnnotationUseStyle"&gt;
-  &lt;property name="elementStyle" value="expanded"/&gt;
-  &lt;property name="closingParens" value="never"/&gt;
-  &lt;property name="trailingArrayComma" value="never"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example:
+          with a closing parenthesis and a trailing array comma set to <code>never</code>.
         </p>
-        <source>
-@SuppressWarnings("unchecked") // Violation - parameters should be referenced
-@Deprecated // OK
-@SomeArrays({"unchecked","unused"}) // Violation - parameters should be referenced
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // OK
-@Deprecated() // Violation - cannot have a closing parenthesis
-@SomeArrays(value={"unchecked","unused",}) // Violation - cannot have a trailing array comma
-class TestTwo {
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-}
-        </source>
-        <p>
-          To configure the check to enforce a <code>compact</code> style,
-            with always including a closing parenthesis and ignoring a trailing array comma.
-        </p>
-        <source>
-&lt;module name="AnnotationUseStyle"&gt;
-  &lt;property name="elementStyle" value="compact"/&gt;
-  &lt;property name="closingParens" value="always"/&gt;
-  &lt;property name="trailingArrayComma" value="ignore"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example:
+        <p id="Example3-config">
+          To configure the check to enforce an <code>expanded</code> style,
+          with a closing parenthesis and a trailing array comma set to <code>never</code>.
         </p>
-        <source>
-@SuppressWarnings("unchecked") // OK
-@Deprecated // Violation - must have a closing parenthesis
-@SomeArrays({"unchecked","unused"}) // OK
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // Violation - parameter 'value' shouldn't be used
-@Deprecated() // OK
-@SomeArrays(value={"unchecked","unused",}) // Violation - parameter 'value' shouldn't be used
-class TestTwo {
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-}
-        </source>
-        <p>
+        <p id="Example4-config">
           To configure the check to enforce a trailing array comma,
-            with ignoring the elementStyle and a closing parenthesis.
+          with ignoring the elementStyle and a closing parenthesis.
         </p>
-        <source>
-&lt;module name="AnnotationUseStyle"&gt;
-  &lt;property name="elementStyle" value="ignore"/&gt;
-  &lt;property name="closingParens" value="ignore"/&gt;
-  &lt;property name="trailingArrayComma" value="always"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example:
-        </p>
-        <source>
-@SuppressWarnings("unchecked") // OK
-@Deprecated // OK
-@SomeArrays({"unchecked","unused"}) // Violation - must have a trailing array comma
-public class TestOne
-{
-
-}
-
-@SuppressWarnings(value={"unchecked"}) // Violation - must have a trailing array comma
-@Deprecated() // OK
-@SomeArrays(value={"unchecked","unused",}) // OK
-class TestTwo {
-
-}
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationusestyle/Example4.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/annotation/missingdeprecated.xml b/src/xdocs/checks/annotation/missingdeprecated.xml
index 89d56d6e46b..4b5b96f5034 100644
--- a/src/xdocs/checks/annotation/missingdeprecated.xml
+++ b/src/xdocs/checks/annotation/missingdeprecated.xml
@@ -58,11 +58,8 @@
             </tr>
             <tr>
               <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.24</td>
@@ -71,66 +68,81 @@
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
+        <p id="Example1-config">
+          To configure the check:
+        </p>
         <source>
-&lt;module name=&quot;MissingDeprecated&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;MissingDeprecated&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example1-code">Example:</p>
         <source>
-@Deprecated
-public static final int MY_CONST = 13; // ok
+class Example1 {
+  @Deprecated
+  public static final int MY_CONST = 13; // ok
 
-/** This javadoc is missing deprecated tag. */
-@Deprecated
-public static final int COUNTER = 10; // violation
+  /** This javadoc is missing deprecated tag. */
+  // violation below '@deprecated Javadoc tag with description.'
+  @Deprecated
+  public static final int COUNTER = 10;
 
-/**
- * @deprecated
- * &lt;p&gt;&lt;/p&gt;
- */
-@Deprecated
-public static final int NUM = 123456; // ok
+  /**
+   * @deprecated
+   * &lt;p&gt;&lt;/p&gt;
+   */
+  @Deprecated
+    public static final int NUM = 123456; // ok
 
-/**
- * @deprecated
- *  &lt;p&gt;
- */
-@Deprecated
-public static final int CONST = 12; // ok
+  /**
+   * @deprecated
+   *  &lt;p&gt;
+   */
+  @Deprecated
+  public static final int CONST = 12; // ok
+}
         </source>
-        <p>
+
+        <p id="Example2-config">
           To configure the check such that it prints violation
           messages if tight HTML rules are not obeyed
         </p>
         <source>
-&lt;module name=&quot;MissingDeprecated&quot;&gt;
-  &lt;property name=&quot;violateExecutionOnNonTightHtml&quot; value=&quot;true&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;MissingDeprecated&quot;&gt;
+      &lt;property name=&quot;violateExecutionOnNonTightHtml&quot; value=&quot;true&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example2-code">Example:</p>
         <source>
-@Deprecated
-public static final int MY_CONST = 13; // ok
+class Example2 {
+  @Deprecated
+  public static final int MY_CONST = 13; // ok
 
-/** This javadoc is missing deprecated tag. */
-@Deprecated
-public static final int COUNTER = 10; // violation
+  /** This javadoc is missing deprecated tag. */
+  // violation below '@deprecated Javadoc tag with description.'
+  @Deprecated
+  public static final int COUNTER = 10;
 
-/**
- * @deprecated
- * &lt;p&gt;&lt;/p&gt;
- */
-@Deprecated
-public static final int NUM = 123456; // ok
+  /**
+   * @deprecated
+   * &lt;p&gt;&lt;/p&gt;
+   */
+  @Deprecated
+  public static final int NUM = 123456; // ok
 
-/**
- * @deprecated
- * &lt;p&gt;
- */
-@Deprecated
-public static final int CONST = 12; // violation, tight HTML rules not obeyed
+  /**
+   * @deprecated
+   * &lt;p&gt; // violation, 'Unclosed HTML tag found: p'
+  */
+  @Deprecated
+  public static final int CONST = 12;
+}
         </source>
       </subsection>
 
@@ -165,6 +177,11 @@ public static final int CONST = 12; // violation, tight HTML rules not obeyed
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fannotation%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fannotation%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/annotation/missingdeprecated.xml.template b/src/xdocs/checks/annotation/missingdeprecated.xml.template
index 47d42adfbf3..8ea2b6e227e 100644
--- a/src/xdocs/checks/annotation/missingdeprecated.xml.template
+++ b/src/xdocs/checks/annotation/missingdeprecated.xml.template
@@ -48,90 +48,43 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.24</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
-        <source>
-&lt;module name="MissingDeprecated"/&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-@Deprecated
-public static final int MY_CONST = 13; // ok
-
-/** This javadoc is missing deprecated tag. */
-@Deprecated
-public static final int COUNTER = 10; // violation
-
-/**
- * @deprecated
- * &lt;p&gt;&lt;/p&gt;
- */
-@Deprecated
-public static final int NUM = 123456; // ok
+        <p id="Example1-config">
+          To configure the check:
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-/**
- * @deprecated
- *  &lt;p&gt;
- */
-@Deprecated
-public static final int CONST = 12; // ok
-        </source>
-        <p>
+        <p id="Example2-config">
           To configure the check such that it prints violation
           messages if tight HTML rules are not obeyed
         </p>
-        <source>
-&lt;module name="MissingDeprecated"&gt;
-  &lt;property name="violateExecutionOnNonTightHtml" value="true"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example:
-        </p>
-        <source>
-@Deprecated
-public static final int MY_CONST = 13; // ok
-
-/** This javadoc is missing deprecated tag. */
-@Deprecated
-public static final int COUNTER = 10; // violation
-
-/**
- * @deprecated
- * &lt;p&gt;&lt;/p&gt;
- */
-@Deprecated
-public static final int NUM = 123456; // ok
-
-/**
- * @deprecated
- * &lt;p&gt;
- */
-@Deprecated
-public static final int CONST = 12; // violation, tight HTML rules not obeyed
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingdeprecated/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/annotation/missingoverride.xml b/src/xdocs/checks/annotation/missingoverride.xml
index a86cddcf947..327afb1f1e4 100644
--- a/src/xdocs/checks/annotation/missingoverride.xml
+++ b/src/xdocs/checks/annotation/missingoverride.xml
@@ -52,101 +52,100 @@
             </tr>
             <tr>
               <td>javaFiveCompatibility</td>
-              <td>
-                Enable java 5 compatibility mode.
-              </td>
-              <td>
-                <a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td>
-                <code>false</code>
-              </td>
+              <td>Enable java 5 compatibility mode.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
               <td>5.0</td>
             </tr>
           </table>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
+        <p id="Example1-config"> To configure the check:</p>
         <source>
-&lt;module name=&quot;MissingOverride&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;MissingOverride&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example1-code">Example:</p>
         <source>
-class Test extends SuperClass {
+class Example1 extends ParentClass1 {
 
-    /** {@inheritDoc} */
-    @Override
-    public void test1() { // OK
+  /** {@inheritDoc} */
+  @Override
+  public void test1() { // OK
 
-    }
+  }
 
-    /** {@inheritDoc} */
-    public void test2() { // violation, should be annotated with @Override
+  /** {@inheritDoc} */
+  public void test2() { // violation, 'include @java.lang.Override'
 
-    }
+  }
 
-    /** {@inheritDoc} */
-    private void test3() { // violation, using the @inheritDoc tag on private method
+  /** {@inheritDoc} */
+  // violation below '{@inheritDoc} tag is not valid at this location.'
+  private void test3() {
 
-    }
+  }
 
-    /** {@inheritDoc} */
-    public static void test4() { // violation, using the @inheritDoc tag on static method
+  /** {@inheritDoc} */
+  // violation below '{@inheritDoc} tag is not valid at this location.'
+  public static void test4() {
 
-    }
+  }
 }
         </source>
-        <p>
+        <p id="Example2-config">
           To configure the check for the <code>javaFiveCompatibility</code>
           mode:
         </p>
         <source>
-&lt;module name=&quot;MissingOverride&quot;&gt;
-  &lt;property name=&quot;javaFiveCompatibility&quot;
-      value=&quot;true&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;MissingOverride&quot;&gt;
+      &lt;property name=&quot;javaFiveCompatibility&quot;
+                value=&quot;true&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example2-code">Example:</p>
         <source>
-class Test1 {
-
-    /** {@inheritDoc} */
-    public void equals() { // violation, should be annotated with @Override
-
-    }
+class Example2 {
+  /** {@inheritDoc} */
+  public boolean equals(Object o) { // violation, 'include @java.lang.Override'
+    return o == this;
+  }
 }
 
-interface Test2 {
+interface B {
 
-    /** {@inheritDoc} */
-    void test(); // violation, should be annotated with @Override
+  /** {@inheritDoc} */
+  void test(); // violation, 'include @java.lang.Override'
 }
 
-class Test3 extends SuperClass {
+class C extends ParentClass2 {
+  /** {@inheritDoc} */
+  public void test() { // OK, is ignored because class extends other class
 
-    /** {@inheritDoc} */
-    public void test() { // OK, is ignored because class extends other class
+  }
+}
 
-    }
+class D implements B {
+  /** {@inheritDoc} */
+  public void test() { // OK, is ignored because class implements interface
+  }
 }
 
-class Test4 implements SuperInterface {
+class E {
+  Runnable r = new Runnable() {
 
     /** {@inheritDoc} */
-    public void test() { // OK, is ignored because class implements interface
-
+    public void run() { // OK, is ignored because class is anonymous class
     }
-}
-
-class Test5 {
-    Runnable r = new Runnable() {
-
-        /** {@inheritDoc} */
-        public void run() { // OK, is ignored because class is anonymous class
-
-        }
-    };
+  };
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/annotation/missingoverride.xml.template b/src/xdocs/checks/annotation/missingoverride.xml.template
index 8773d9558d6..229b6a372d9 100644
--- a/src/xdocs/checks/annotation/missingoverride.xml.template
+++ b/src/xdocs/checks/annotation/missingoverride.xml.template
@@ -42,113 +42,40 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>javaFiveCompatibility</td>
-              <td>
-                Enable java 5 compatibility mode.
-              </td>
-              <td>
-                <a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td>
-                <code>false</code>
-              </td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingOverrideCheck.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
-        <source>
-&lt;module name="MissingOverride"/&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-class Test extends SuperClass {
-
-    /** {@inheritDoc} */
-    @Override
-    public void test1() { // OK
-
-    }
-
-    /** {@inheritDoc} */
-    public void test2() { // violation, should be annotated with @Override
-
-    }
-
-    /** {@inheritDoc} */
-    private void test3() { // violation, using the @inheritDoc tag on private method
-
-    }
-
-    /** {@inheritDoc} */
-    public static void test4() { // violation, using the @inheritDoc tag on static method
-
-    }
-}
-        </source>
-        <p>
+        <p id="Example1-config"> To configure the check:</p>
+        <macro name="example">
+             <param name="path"
+                    value="/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.java"/>
+             <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure the check for the <code>javaFiveCompatibility</code>
           mode:
         </p>
-        <source>
-&lt;module name="MissingOverride"&gt;
-  &lt;property name="javaFiveCompatibility"
-      value="true"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-class Test1 {
-
-    /** {@inheritDoc} */
-    public void equals() { // violation, should be annotated with @Override
-
-    }
-}
-
-interface Test2 {
-
-    /** {@inheritDoc} */
-    void test(); // violation, should be annotated with @Override
-}
-
-class Test3 extends SuperClass {
-
-    /** {@inheritDoc} */
-    public void test() { // OK, is ignored because class extends other class
-
-    }
-}
-
-class Test4 implements SuperInterface {
-
-    /** {@inheritDoc} */
-    public void test() { // OK, is ignored because class implements interface
-
-    }
-}
-
-class Test5 {
-    Runnable r = new Runnable() {
-
-        /** {@inheritDoc} */
-        public void run() { // OK, is ignored because class is anonymous class
-
-        }
-    };
-}
-        </source>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/annotation/missingoverride/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/annotation/packageannotation.xml b/src/xdocs/checks/annotation/packageannotation.xml
index 1efa4dfb2e4..50e5661878b 100644
--- a/src/xdocs/checks/annotation/packageannotation.xml
+++ b/src/xdocs/checks/annotation/packageannotation.xml
@@ -37,19 +37,23 @@
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example1-code">Example of validating MyClass.java:</p>
+        <p id="Example1-code">Example of class with violation:</p>
         <source>
-@Deprecated
-package com.example.annotations.packageannotation; //violation
+@Deprecated // violation below
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation;
+
+class Example1 {}
         </source>
-        <p id="Example2-code">Example of fixing violation in MyClass.java:</p>
+        <p id="Example2-code">Example of class without violation:</p>
         <source>
-package com.example.annotations.packageannotation; //ok
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation;
+
+class Example2 {}
         </source>
-        <p id="Example3-code">Example of validating package-info.java:</p>
+        <p id="package-info-code">Example of validating package-info.java:</p>
         <source>
 @Deprecated
-package com.example.annotations.packageannotation; //ok
+package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation.example3;
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/annotation/packageannotation.xml.template b/src/xdocs/checks/annotation/packageannotation.xml.template
index 33089f9819b..9dd34c1a552 100644
--- a/src/xdocs/checks/annotation/packageannotation.xml.template
+++ b/src/xdocs/checks/annotation/packageannotation.xml.template
@@ -32,25 +32,25 @@
         <p id="Example1-config"> To configure the check:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example1-code">Example of validating MyClass.java:</p>
+        <p id="Example1-code">Example of class with violation:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
-        <p id="Example2-code">Example of fixing violation in MyClass.java:</p>
+        <p id="Example2-code">Example of class without violation:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
-        <p id="Example3-code">Example of validating package-info.java:</p>
+        <p id="package-info-code">Example of validating package-info.java:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/packageannotation/example3/package-info.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/annotation/suppresswarnings.xml b/src/xdocs/checks/annotation/suppresswarnings.xml
index 4ca126a52d9..0dc4ee77b20 100644
--- a/src/xdocs/checks/annotation/suppresswarnings.xml
+++ b/src/xdocs/checks/annotation/suppresswarnings.xml
@@ -59,25 +59,15 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>
-                 Specify the RegExp to match against warnings. Any warning
-                 being suppressed matching this pattern will be flagged.
-              </td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>&quot;^\s*+$&quot;</code>
-              </td>
+              <td>Specify the RegExp to match against warnings. Any warning being suppressed matching this pattern will be flagged.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^\s*+$&quot;</code></td>
               <td>5.0</td>
             </tr>
-
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
                     CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
@@ -104,7 +94,6 @@
                     RECORD_DEF</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
                     CLASS_DEF</a>
@@ -134,79 +123,102 @@
               </td>
               <td>5.0</td>
             </tr>
-
           </table>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
-        <source> &lt;module name=&quot;SuppressWarnings&quot;/&gt;
+        <p id="Example1-config">
+          To configure the check:
+        </p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWarnings&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-
-        <p>Example:</p>
+        <p id="Example1-code">Example:</p>
         <source>
-@SuppressWarnings(&quot;&quot;) // violation
-class TestA {
-  @SuppressWarnings(&quot;&quot;) // violation
+// violation below 'The warning '' cannot be suppressed at this location'
+@SuppressWarnings(&quot;&quot;)
+class Example1 {
+  // violation below 'The warning '' cannot be suppressed at this location'
+  @SuppressWarnings(&quot;&quot;)
   final int num1 = 1;
-  @SuppressWarnings(&quot;all&quot;) // ok
+  // ok below as default format only checks for a blank or empty string
+  @SuppressWarnings(&quot;all&quot;)
   final int num2 = 2;
-  @SuppressWarnings(&quot;unused&quot;) // ok
+  // ok below as default format only checks for a blank or empty string
+  @SuppressWarnings(&quot;unused&quot;)
   final int num3 = 3;
 
-  void foo1(@SuppressWarnings(&quot;unused&quot;) int param) {} // ok
+  void foo1(@SuppressWarnings(&quot;unused&quot;) int param) {}
 
-  @SuppressWarnings(&quot;all&quot;) // ok
+  @SuppressWarnings(&quot;all&quot;)
   void foo2(int param) {}
-  @SuppressWarnings(&quot;unused&quot;) // ok
+  @SuppressWarnings(&quot;unused&quot;)
   void foo3(int param) {}
-  @SuppressWarnings(true?&quot;all&quot;:&quot;unused&quot;) // ok
+  @SuppressWarnings(true?&quot;all&quot;:&quot;unused&quot;)
   void foo4(int param) {}
 }
-@SuppressWarnings(&quot;unchecked&quot;) // ok
-class TestB {}
+// ok below as default format only checks for a blank or empty string
+@SuppressWarnings(&quot;unchecked&quot;)
+class Test1 {}
         </source>
 
-        <p>
+        <p id="Example2-config">
           To configure the check so that the &quot;unchecked&quot; and &quot;unused&quot;
           warnings cannot be suppressed on anything
           but variable and parameter declarations.
         </p>
         <source>
-&lt;module name=&quot;SuppressWarnings&quot;&gt;
-  &lt;property name=&quot;format&quot;
-      value=&quot;^unchecked$|^unused$&quot;/&gt;
-  &lt;property name=&quot;tokens&quot;
-    value=&quot;
-    CLASS_DEF,INTERFACE_DEF,ENUM_DEF,
-    ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
-    ENUM_CONSTANT_DEF,METHOD_DEF,CTOR_DEF
-    &quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWarnings&quot;&gt;
+      &lt;property name=&quot;format&quot;
+          value=&quot;^unchecked$|^unused$&quot;/&gt;
+      &lt;property name=&quot;tokens&quot;
+        value=&quot;
+        CLASS_DEF,INTERFACE_DEF,ENUM_DEF,
+        ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
+        ENUM_CONSTANT_DEF,METHOD_DEF,CTOR_DEF
+        &quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-
-        <p>Example:</p>
+        <p id="Example2-code">Example:</p>
         <source>
-@SuppressWarnings(&quot;&quot;) // ok
-class TestA {
-  @SuppressWarnings(&quot;&quot;) // ok
+// ok below, since we are only checking for '^unchecked$|^unused$'
+@SuppressWarnings(&quot;&quot;)
+class Example2 {
+  // ok below as VARIABLE_DEF is not configured in tokens to check
+  @SuppressWarnings(&quot;&quot;)
   final int num1 = 1;
-  @SuppressWarnings(&quot;all&quot;) // ok
+  @SuppressWarnings(&quot;all&quot;)
   final int num2 = 2;
-  @SuppressWarnings(&quot;unused&quot;) // ok
+  @SuppressWarnings(&quot;unused&quot;)
   final int num3 = 3;
 
-  void foo1(@SuppressWarnings(&quot;unused&quot;) int param) {} // ok
+  // ok below as PARAMETER_DEF is not configured in tokens to check
+  void foo1(@SuppressWarnings(&quot;unused&quot;) int param) {}
 
-  @SuppressWarnings(&quot;all&quot;) // ok
+  // ok below, since we are only checking for '^unchecked$|^unused$'
+  @SuppressWarnings(&quot;all&quot;)
   void foo2(int param) {}
-  @SuppressWarnings(&quot;unused&quot;) // violation
+
+  // violation below, 'The warning 'unused' cannot be suppressed at this location'
+  @SuppressWarnings(&quot;unused&quot;)
   void foo3(int param) {}
-  @SuppressWarnings(true?&quot;all&quot;:&quot;unused&quot;) // violation
+
+  // violation below, 'The warning 'unused' cannot be suppressed at this location'
+  @SuppressWarnings(true?&quot;all&quot;:&quot;unused&quot;)
   void foo4(int param) {}
 }
-@SuppressWarnings(&quot;unchecked&quot;) // violation
-class TestB {}
+
+// violation below, 'The warning 'unchecked' cannot be suppressed at this location'
+@SuppressWarnings(&quot;unchecked&quot;)
+class Test2 {}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/annotation/suppresswarnings.xml.template b/src/xdocs/checks/annotation/suppresswarnings.xml.template
index 02c46903bb5..5bc5912897e 100644
--- a/src/xdocs/checks/annotation/suppresswarnings.xml.template
+++ b/src/xdocs/checks/annotation/suppresswarnings.xml.template
@@ -49,165 +49,44 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>
-                 Specify the RegExp to match against warnings. Any warning
-                 being suppressed matching this pattern will be flagged.
-              </td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>"^\s*+$"</code>
-              </td>
-              <td>5.0</td>
-            </tr>
-
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                    ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                    ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                    ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                    PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                    ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                    ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                    ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                    PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                  .
-              </td>
-              <td>5.0</td>
-            </tr>
-
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p> To configure the check:</p>
-        <source> &lt;module name="SuppressWarnings"/&gt;
-        </source>
-
-        <p>Example:</p>
-        <source>
-@SuppressWarnings("") // violation
-class TestA {
-  @SuppressWarnings("") // violation
-  final int num1 = 1;
-  @SuppressWarnings("all") // ok
-  final int num2 = 2;
-  @SuppressWarnings("unused") // ok
-  final int num3 = 3;
-
-  void foo1(@SuppressWarnings("unused") int param) {} // ok
-
-  @SuppressWarnings("all") // ok
-  void foo2(int param) {}
-  @SuppressWarnings("unused") // ok
-  void foo3(int param) {}
-  @SuppressWarnings(true?"all":"unused") // ok
-  void foo4(int param) {}
-}
-@SuppressWarnings("unchecked") // ok
-class TestB {}
-        </source>
+        <p id="Example1-config">
+          To configure the check:
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-        <p>
+        <p id="Example2-config">
           To configure the check so that the "unchecked" and "unused"
           warnings cannot be suppressed on anything
           but variable and parameter declarations.
         </p>
-        <source>
-&lt;module name="SuppressWarnings"&gt;
-  &lt;property name="format"
-      value="^unchecked$|^unused$"/&gt;
-  &lt;property name="tokens"
-    value="
-    CLASS_DEF,INTERFACE_DEF,ENUM_DEF,
-    ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
-    ENUM_CONSTANT_DEF,METHOD_DEF,CTOR_DEF
-    "/&gt;
-&lt;/module&gt;
-        </source>
-
-        <p>Example:</p>
-        <source>
-@SuppressWarnings("") // ok
-class TestA {
-  @SuppressWarnings("") // ok
-  final int num1 = 1;
-  @SuppressWarnings("all") // ok
-  final int num2 = 2;
-  @SuppressWarnings("unused") // ok
-  final int num3 = 3;
-
-  void foo1(@SuppressWarnings("unused") int param) {} // ok
-
-  @SuppressWarnings("all") // ok
-  void foo2(int param) {}
-  @SuppressWarnings("unused") // violation
-  void foo3(int param) {}
-  @SuppressWarnings(true?"all":"unused") // violation
-  void foo4(int param) {}
-}
-@SuppressWarnings("unchecked") // violation
-class TestB {}
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarnings/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/annotation/suppresswarningsholder.xml b/src/xdocs/checks/annotation/suppresswarningsholder.xml
index 067b4f6f149..7e9307eff35 100644
--- a/src/xdocs/checks/annotation/suppresswarningsholder.xml
+++ b/src/xdocs/checks/annotation/suppresswarningsholder.xml
@@ -36,16 +36,9 @@
             </tr>
             <tr>
               <td>aliasList</td>
-              <td>
-                Specify aliases for check names that can be used in code within
-                <code>SuppressWarnings</code>.
-              </td>
-              <td>
-                <a href="../../property_types.html#String.5B.5D">String[]</a>
-                in a format of comma separated attribute=value entries.
-                The attribute is the fully qualified name of the Check and value is its alias.
-              </td>
-              <td><code>null</code></td>
+              <td>Specify aliases for check names that can be used in code within <code>SuppressWarnings</code> in a format of comma separated attribute=value entries. The attribute is the fully qualified name of the Check and value is its alias.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>{}</code></td>
               <td>5.7</td>
             </tr>
           </table>
@@ -62,8 +55,8 @@
   &lt;module name=&quot;ParameterNumber&quot;&gt;
     &lt;property name=&quot;id&quot; value=&quot;ParamNumberId&quot;/&gt;
   &lt;/module&gt;
-  &lt;module name=&quot;NoWhitespaceAfter&quot;/&gt;
-
+  &lt;module name=
+    &quot;NoWhitespaceAfter&quot;/&gt;
   &lt;module name=&quot;SuppressWarningsHolder&quot;/&gt;
   &lt;/module&gt;
   &lt;module name=&quot;SuppressWarningsFilter&quot;/&gt;
@@ -71,30 +64,25 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-class Test {
-
-   private int K; // violation
-   @SuppressWarnings({&quot;membername&quot;})
-   private int J; // violation suppressed
-
-   private static final int i = 0; // violation
-   @SuppressWarnings(&quot;checkstyle:constantname&quot;)
-   private static final int m = 0; // violation suppressed
-
-   public void needsLotsOfParameters (int a, // violation
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
-
-   @SuppressWarnings(&quot;ParamNumberId&quot;)
-   public void needsLotsOfParameters1 (int a, // violation suppressed
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
-
-   private int [] ARR; // 2 violations
-   @SuppressWarnings(&quot;all&quot;)
-   private int [] ARRAY; // violations suppressed
+class Example1 {
+  private int K; // violation, 'Name 'K' must match pattern'
+  @SuppressWarnings({&quot;membername&quot;})
+  private int J; // violation suppressed
+
+  private static final int i = 0; // violation, 'Name 'i' must match pattern'
+  @SuppressWarnings(&quot;checkstyle:constantname&quot;)
+  private static final int m = 0; // violation suppressed
+
+  @SuppressWarnings(&quot;ParamNumberId&quot;)
+    public void needsLotsOfParameters1 (int a, // violation suppressed
+     int b, int c, int d, int e, int f, int g, int h) {
+     // ...
+  }
+
+  private int [] ARR; // violation ''int' is followed by whitespace'
+  // violation above, 'Name 'ARR' must match pattern'
+  @SuppressWarnings(&quot;all&quot;)
+  private int [] ARRAY; // violations suppressed
 }
         </source>
         <p>The general rule is that the argument of the <code>@SuppressWarnings</code> will be
@@ -110,7 +98,6 @@ class Test {
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
   &lt;module name=&quot;ParameterNumber&quot;/&gt;
-
   &lt;module name=&quot;SuppressWarningsHolder&quot;&gt;
     &lt;property name=&quot;aliasList&quot; value=
       &quot;com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck=paramnum&quot;/&gt;
@@ -121,18 +108,18 @@ class Test {
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-class Test {
-
-   public void needsLotsOfParameters (int a, // violation
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
-
-   @SuppressWarnings(&quot;paramnum&quot;)
-   public void needsLotsOfParameters1 (int a, // violation suppressed
-      int b, int c, int d, int e, int f, int g, int h) {
-      // ...
-   }
+class Example2 {
+  // violation below, 'More than 7 parameters (found 8)'
+  public void needsLotsOfParameters (int a,
+    int b, int c, int d, int e, int f, int g, int h) {
+    // ...
+  }
+
+  @SuppressWarnings(&quot;paramnum&quot;)
+  public void needsLotsOfParameters1 (int a, // violation suppressed
+    int b, int c, int d, int e, int f, int g, int h) {
+    // ...
+  }
 
 }
         </source>
diff --git a/src/xdocs/checks/annotation/suppresswarningsholder.xml.template b/src/xdocs/checks/annotation/suppresswarningsholder.xml.template
index 8abced6323d..b5c3c9fd4d2 100644
--- a/src/xdocs/checks/annotation/suppresswarningsholder.xml.template
+++ b/src/xdocs/checks/annotation/suppresswarningsholder.xml.template
@@ -26,29 +26,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>aliasList</td>
-              <td>
-                Specify aliases for check names that can be used in code within
-                <code>SuppressWarnings</code>.
-              </td>
-              <td>
-                <a href="../../property_types.html#String.5B.5D">String[]</a>
-                in a format of comma separated attribute=value entries.
-                The attribute is the fully qualified name of the Check and value is its alias.
-              </td>
-              <td><code>null</code></td>
-              <td>5.7</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -56,13 +37,13 @@
         <p id="Example1-config">To use default module configuration:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p>The general rule is that the argument of the <code>@SuppressWarnings</code> will be
@@ -76,13 +57,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/annotation/suppresswarningsholder/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
 
diff --git a/src/xdocs/checks/blocks/avoidnestedblocks.xml b/src/xdocs/checks/blocks/avoidnestedblocks.xml
index 3e7b1715a06..e13d21a9273 100644
--- a/src/xdocs/checks/blocks/avoidnestedblocks.xml
+++ b/src/xdocs/checks/blocks/avoidnestedblocks.xml
@@ -71,56 +71,65 @@ public void guessTheOutput()
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>To configure the check:</p>
+        <p id="Example1-config">To configure the check:</p>
         <source>
-&lt;module name=&quot;AvoidNestedBlocks&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AvoidNestedBlocks&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example1-code">Example:</p>
         <source>
-public void foo() {
-  int myInteger = 0;
-  {                      // violation
-    myInteger = 2;
-  }
-  System.out.println(&quot;myInteger = &quot; + myInteger);
+public class Example1 {
+  public void foo() {
+    int myInteger = 0;
+    {                      // violation
+      myInteger = 2;
+    }
+    System.out.println(&quot;myInteger = &quot; + myInteger);
 
-  switch (a) {
-    case 1:
-      {                    // violation
+    switch (a) {
+      case 1: {                    // violation
         System.out.println(&quot;Case 1&quot;);
         break;
       }
-    case 2:
-      System.out.println(&quot;Case 2&quot;);     // OK
-      break;
+      case 2:
+        System.out.println(&quot;Case 2&quot;);
+        break;
+    }
   }
 }
         </source>
-        <p>To configure the check to allow nested blocks in switch case:</p>
+        <p id="Example2-config">To configure the check to allow nested blocks in switch case:</p>
         <source>
-&lt;module name=&quot;AvoidNestedBlocks&quot;&gt;
-  &lt;property name=&quot;allowInSwitchCase&quot; value=&quot;true&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AvoidNestedBlocks&quot;&gt;
+      &lt;property name=&quot;allowInSwitchCase&quot; value=&quot;true&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example2-code">Example:</p>
         <source>
-public void foo() {
-  int myInteger = 0;
-  {                      // violation
-    myInteger = 2;
-  }
-  System.out.println(&quot;myInteger = &quot; + myInteger);
+public class Example2 {
+  public void foo() {
+    int myInteger = 0;
+    {                      // violation
+      myInteger = 2;
+    }
+    System.out.println(&quot;myInteger = &quot; + myInteger);
 
-  switch (a)
-  {
-    case 1:
-      {                    // OK
+    switch (a) {
+      case 1: {
         System.out.println(&quot;Case 1&quot;);
         break;
       }
-    case 2:
-      System.out.println(&quot;Case 2&quot;);     // OK
-      break;
+      case 2:
+        System.out.println(&quot;Case 2&quot;);
+        break;
+    }
   }
 }
         </source>
diff --git a/src/xdocs/checks/blocks/avoidnestedblocks.xml.template b/src/xdocs/checks/blocks/avoidnestedblocks.xml.template
index e531d0ab026..70aa3effbf3 100644
--- a/src/xdocs/checks/blocks/avoidnestedblocks.xml.template
+++ b/src/xdocs/checks/blocks/avoidnestedblocks.xml.template
@@ -51,79 +51,38 @@ public void guessTheOutput()
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowInSwitchCase</td>
-              <td>Allow nested blocks if they are the only child of a switch case.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>To configure the check:</p>
-        <source>
-&lt;module name="AvoidNestedBlocks"/&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-public void foo() {
-  int myInteger = 0;
-  {                      // violation
-    myInteger = 2;
-  }
-  System.out.println("myInteger = " + myInteger);
-
-  switch (a) {
-    case 1:
-      {                    // violation
-        System.out.println("Case 1");
-        break;
-      }
-    case 2:
-      System.out.println("Case 2");     // OK
-      break;
-  }
-}
-        </source>
-        <p>To configure the check to allow nested blocks in switch case:</p>
-        <source>
-&lt;module name="AvoidNestedBlocks"&gt;
-  &lt;property name="allowInSwitchCase" value="true"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-public void foo() {
-  int myInteger = 0;
-  {                      // violation
-    myInteger = 2;
-  }
-  System.out.println("myInteger = " + myInteger);
-
-  switch (a)
-  {
-    case 1:
-      {                    // OK
-        System.out.println("Case 1");
-        break;
-      }
-    case 2:
-      System.out.println("Case 2");     // OK
-      break;
-  }
-}
-        </source>
+        <p id="Example1-config">To configure the check:</p>
+        <macro name="example">
+             <param name="path"
+                    value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java"/>
+             <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">To configure the check to allow nested blocks in switch case:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/blocks/emptyblock.xml b/src/xdocs/checks/blocks/emptyblock.xml
index 56afca47e4e..53b7e4d55c6 100644
--- a/src/xdocs/checks/blocks/emptyblock.xml
+++ b/src/xdocs/checks/blocks/emptyblock.xml
@@ -39,7 +39,7 @@ switch (a) {
             </tr>
             <tr>
               <td>option</td>
-              <td>specify the policy on block contents.</td>
+              <td>Specify the policy on block contents.</td>
               <td><a href="../../property_types.html#BlockOption">BlockOption</a></td>
               <td><code>statement</code></td>
               <td>3.0</td>
@@ -47,64 +47,63 @@ switch (a) {
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
+                    LITERAL_TRY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
+                    INSTANCE_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
+                    STATIC_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
+                    LITERAL_DEFAULT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
-                .
+                    ARRAY_INIT</a>
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
+                    LITERAL_TRY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
+                    INSTANCE_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
+                    STATIC_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                .
+                    LITERAL_SYNCHRONIZED</a>
+                  .
               </td>
               <td>3.0</td>
             </tr>
@@ -113,20 +112,22 @@ switch (a) {
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
+        <p id="Example1-config"> To configure the check: </p>
         <source>
-&lt;module name=&quot;EmptyBlock&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyBlock&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example1-code">Example:</p>
         <source>
-public class Test {
+public class Example1 {
   private void emptyLoop() {
-    for (int i = 0; i &lt; 10; i++) { // violation
+    for (int i = 0; i &lt; 10; i++) { // violation 'Must have at least one statement'
     }
 
-    try { // violation
+    try { // violation 'Must have at least one statement'
 
     } catch (Exception e) {
       // ignored
@@ -134,44 +135,51 @@ public class Test {
   }
 }
         </source>
-        <p>
+        <p id="Example2-config">
           To configure the check for the <code>text</code>
           policy and only <code> try</code> blocks:
         </p>
         <source>
-&lt;module name=&quot;EmptyBlock&quot;&gt;
-  &lt;property name=&quot;option&quot; value=&quot;text&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_TRY&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyBlock&quot;&gt;
+      &lt;property name=&quot;option&quot; value=&quot;text&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_TRY&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p> Example: </p>
+        <p id="Example2-code">Example:</p>
         <source>
-public class Test {
+public class Example2 {
   private void emptyLoop() {
     for (int i = 0; i &lt; 10; i++) {
       // ignored
     }
 
-    // violation on next line
     try {
-
-    } catch (Exception e) {
+    }  // violation above 'Empty try block'
+    catch (Exception e) {
       // ignored
     }
   }
 }
         </source>
-        <p>
+        <p id="Example3-config">
           To configure the check for default in switch block:
         </p>
         <source>
-&lt;module name=&quot;EmptyBlock&quot;&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_DEFAULT&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyBlock&quot;&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_DEFAULT&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p> Example: </p>
+        <p id="Example3-code">Example:</p>
         <source>
-public class Test {
+public class Example3 {
   private void test(int a) {
     switch (a) {
       case 1: someMethod();
@@ -179,7 +187,7 @@ public class Test {
     }
     switch (a) {
       case 1: someMethod();
-      default: {} // violation
+      default: {} // violation 'Must have at least one statement'
     }
   }
 }
diff --git a/src/xdocs/checks/blocks/emptyblock.xml.template b/src/xdocs/checks/blocks/emptyblock.xml.template
index 11dabfc1257..d660b01f5da 100644
--- a/src/xdocs/checks/blocks/emptyblock.xml.template
+++ b/src/xdocs/checks/blocks/emptyblock.xml.template
@@ -29,161 +29,55 @@ switch (a) {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>specify the policy on block contents.</td>
-              <td><a href="../../property_types.html#BlockOption">BlockOption</a></td>
-              <td><code>statement</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
-                .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
-        <source>
-&lt;module name="EmptyBlock"/&gt;
-        </source>
-        <p>
-          Example:
-        </p>
-        <source>
-public class Test {
-  private void emptyLoop() {
-    for (int i = 0; i &lt; 10; i++) { // violation
-    }
-
-    try { // violation
-
-    } catch (Exception e) {
-      // ignored
-    }
-  }
-}
-        </source>
-        <p>
+        <p id="Example1-config"> To configure the check: </p>
+        <macro name="example">
+             <param name="path"
+                    value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.java"/>
+             <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure the check for the <code>text</code>
           policy and only <code> try</code> blocks:
         </p>
-        <source>
-&lt;module name="EmptyBlock"&gt;
-  &lt;property name="option" value="text"/&gt;
-  &lt;property name="tokens" value="LITERAL_TRY"/&gt;
-&lt;/module&gt;
-        </source>
-        <p> Example: </p>
-        <source>
-public class Test {
-  private void emptyLoop() {
-    for (int i = 0; i &lt; 10; i++) {
-      // ignored
-    }
-
-    // violation on next line
-    try {
-
-    } catch (Exception e) {
-      // ignored
-    }
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To configure the check for default in switch block:
         </p>
-        <source>
-&lt;module name="EmptyBlock"&gt;
-  &lt;property name="tokens" value="LITERAL_DEFAULT"/&gt;
-&lt;/module&gt;
-        </source>
-        <p> Example: </p>
-        <source>
-public class Test {
-  private void test(int a) {
-    switch (a) {
-      case 1: someMethod();
-      default: // OK, as there is no block
-    }
-    switch (a) {
-      case 1: someMethod();
-      default: {} // violation
-    }
-  }
-}
-        </source>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/blocks/emptycatchblock.xml b/src/xdocs/checks/blocks/emptycatchblock.xml
index 9096f7ea281..da5a407e7de 100644
--- a/src/xdocs/checks/blocks/emptycatchblock.xml
+++ b/src/xdocs/checks/blocks/emptycatchblock.xml
@@ -34,24 +34,17 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>exceptionVariableName</td>
-              <td>
-                Specify the RegExp for the name of the variable associated with exception.
-                If check meets variable name matching specified value - empty block is suppressed.
-              </td>
+              <td>commentFormat</td>
+              <td>Specify the RegExp for the first comment inside empty catch block. If check meets comment inside empty catch block matching specified format - empty block is suppressed. If it is multi-line comment - only its first line is analyzed.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^$&quot;</code></td>
+              <td><code>&quot;.*&quot;</code></td>
               <td>6.4</td>
             </tr>
             <tr>
-              <td>commentFormat</td>
-              <td>
-                Specify the RegExp for the first comment inside empty catch block.
-                If check meets comment inside empty catch block matching specified format - empty
-                block is suppressed. If it is multi-line comment - only its first line is analyzed.
-              </td>
+              <td>exceptionVariableName</td>
+              <td>Specify the RegExp for the name of the variable associated with exception. If check meets variable name matching specified value - empty block is suppressed.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;.*&quot;</code></td>
+              <td><code>&quot;^$&quot;</code></td>
               <td>6.4</td>
             </tr>
           </table>
@@ -59,164 +52,242 @@
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
         <source>
-&lt;module name=&quot;EmptyCatchBlock&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyCatchBlock&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example1-code">Such empty blocks would be both suppressed:</p>
         <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // violation
+public class Example1 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException expected) {
+    } // violation above
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // ok, catch block has comment
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ignore) {
+      // no handling
+    } // ok, catch block has comment
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException o) {
+    } // violation above
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ex) {
+      // This is expected
+    }
+  }
+}
         </source>
-        <p>
+
+        <p id="Example2-config">
           To configure the check to suppress empty catch block if exception's variable name is
           <code>expected</code> or <code>ignore</code> or there's any comment inside:
         </p>
         <source>
-&lt;module name=&quot;EmptyCatchBlock&quot;&gt;
-  &lt;property name=&quot;exceptionVariableName&quot; value=&quot;expected|ignore&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyCatchBlock&quot;&gt;
+      &lt;property name=&quot;exceptionVariableName&quot; value=&quot;expected|ignore&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Such empty blocks would be both suppressed:
-        </p>
+        <p id="Example2-code">Such empty blocks would be both suppressed:</p>
         <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // ok
+public class Example2 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException expected) {
+    }
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // ok
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ignore) {
+      // no handling
+    }
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException o) {
+    } // violation above
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ex) {
+      // This is expected
+    }
+  }
+}
         </source>
-        <p>
+
+        <p id="Example3-config">
           To configure the check to suppress empty catch block if single-line comment inside
-           is &quot;//This is expected&quot;:
+           is &quot;This is expected&quot;:
         </p>
         <source>
-&lt;module name=&quot;EmptyCatchBlock&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot; value=&quot;This is expected&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyCatchBlock&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot; value=&quot;This is expected&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Such empty block would be suppressed:
-        </p>
+        <p id="Example3-code">Such empty blocks would be both suppressed:</p>
         <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // violation
+public class Example3 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException expected) {
+    } // violation above
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // violation
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ignore) {
+      // no handling
+    } // violation 2 lines above
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException o) {
+    } // violation above
+  }
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException ex) {
+      // This is expected
+    }
+  }
+}
         </source>
-        <p>
+
+        <p id="Example4-config">
           To configure the check to suppress empty catch block if single-line comment inside
-          is &quot;//This is expected&quot; or exception's
-          variable name is &quot;myException&quot; (any option is matching):
+          is &quot;This is expected&quot;:
         </p>
         <source>
-&lt;module name=&quot;EmptyCatchBlock&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot; value=&quot;This is expected&quot;/&gt;
-  &lt;property name=&quot;exceptionVariableName&quot; value=&quot;myException&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyCatchBlock&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot; value=&quot;This is expected&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Such empty blocks would be suppressed:
-        </p>
+        <p id="Example4-code">Such empty blocks would be both suppressed:</p>
         <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  //This is expected
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  //   This is expected
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  // This is expected
-  // some another comment
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  /* This is expected */
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  /*
-  *
-  * This is expected
-  * some another comment
-  */
+public class Example4 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      //This is expected
+    }
+  }
+
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      //   This is expected
+    }
+  }
+
+  private void exampleMethod3 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      // This is expected
+      // some another comment
+    }
+  }
+
+  private void exampleMethod4 () {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+      /* This is expected */
+    }
+  }
+
+  private void exampleMethod5() {
+    try {
+      throw new RuntimeException();
+      // violation below
+    } catch (RuntimeException e) {
+      /*
+       *
+       * This is expected
+       * some another comment */
+    }
+  }
 }
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException myException) {
+        </source>
+
+        <p id="Example5-config">
+          To configure the check to suppress empty catch block if
+          exception's variable name is &quot;myException&quot;:
+        </p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;EmptyCatchBlock&quot;&gt;
+      &lt;property name=&quot;exceptionVariableName&quot; value=&quot;myException&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example5-code">Such empty blocks would be both suppressed:</p>
+        <source>
+public class Example5 {
+  private void exampleMethod1() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException e) {
+    } // violation above
+  }
 
+  private void exampleMethod2() {
+    try {
+      throw new RuntimeException();
+    } catch (RuntimeException myException) {
+    }
+  }
 }
         </source>
+
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/blocks/emptycatchblock.xml.template b/src/xdocs/checks/blocks/emptycatchblock.xml.template
index c40e769cfaf..c4267378a43 100644
--- a/src/xdocs/checks/blocks/emptycatchblock.xml.template
+++ b/src/xdocs/checks/blocks/emptycatchblock.xml.template
@@ -25,198 +25,93 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>exceptionVariableName</td>
-              <td>
-                Specify the RegExp for the name of the variable associated with exception.
-                If check meets variable name matching specified value - empty block is suppressed.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^$"</code></td>
-              <td>6.4</td>
-            </tr>
-            <tr>
-              <td>commentFormat</td>
-              <td>
-                Specify the RegExp for the first comment inside empty catch block.
-                If check meets comment inside empty catch block matching specified format - empty
-                block is suppressed. If it is multi-line comment - only its first line is analyzed.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>6.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
-        <source>
-&lt;module name="EmptyCatchBlock"/&gt;
-        </source>
-        <p>
-          Example:
-        </p>
-        <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // ok, catch block has comment
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Such empty blocks would be both suppressed:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
-        </source>
-        <p>
+        <p id="Example2-config">
           To configure the check to suppress empty catch block if exception's variable name is
           <code>expected</code> or <code>ignore</code> or there's any comment inside:
         </p>
-        <source>
-&lt;module name="EmptyCatchBlock"&gt;
-  &lt;property name="exceptionVariableName" value="expected|ignore"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Such empty blocks would be both suppressed:
-        </p>
-        <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // ok
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // ok
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Such empty blocks would be both suppressed:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
-        </source>
-        <p>
+        <p id="Example3-config">
           To configure the check to suppress empty catch block if single-line comment inside
-           is "//This is expected":
-        </p>
-        <source>
-&lt;module name="EmptyCatchBlock"&gt;
-  &lt;property name="commentFormat" value="This is expected"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Such empty block would be suppressed:
+           is "This is expected":
         </p>
-        <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException expected) {
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ignore) {
-  // no handling
-} // violation
-
-try {
-  throw new RuntimeException();
-} catch (RuntimeException o) {
-} // violation
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Such empty blocks would be both suppressed:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-try {
-  throw new RuntimeException();
-} catch (RuntimeException ex) {
-  // This is expected
-} // ok
-        </source>
-        <p>
+        <p id="Example4-config">
           To configure the check to suppress empty catch block if single-line comment inside
-          is "//This is expected" or exception's
-          variable name is "myException" (any option is matching):
+          is "This is expected":
         </p>
-        <source>
-&lt;module name="EmptyCatchBlock"&gt;
-  &lt;property name="commentFormat" value="This is expected"/&gt;
-  &lt;property name="exceptionVariableName" value="myException"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Such empty blocks would be suppressed:
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Such empty blocks would be both suppressed:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example4.java"/>
+            <param name="type" value="code"/>
+        </macro>
+
+        <p id="Example5-config">
+          To configure the check to suppress empty catch block if
+          exception's variable name is "myException":
         </p>
-        <source>
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  //This is expected
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  //   This is expected
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  // This is expected
-  // some another comment
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  /* This is expected */
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException e) {
-  /*
-  *
-  * This is expected
-  * some another comment
-  */
-}
-...
-try {
-  throw new RuntimeException();
-} catch (RuntimeException myException) {
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example5.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">Such empty blocks would be both suppressed:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptycatchblock/Example5.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-}
-        </source>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/blocks/leftcurly.xml b/src/xdocs/checks/blocks/leftcurly.xml
index 851e3c0e995..bcbe7493a89 100644
--- a/src/xdocs/checks/blocks/leftcurly.xml
+++ b/src/xdocs/checks/blocks/leftcurly.xml
@@ -25,13 +25,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify the policy on placement of a left curly brace (<code>'{'</code>).</td>
-              <td><a href="../../property_types.html#LeftCurlyOption">LeftCurlyOption</a></td>
-              <td><code>eol</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>ignoreEnums</td>
               <td>Allow to ignore enums when left curly brace policy is EOL.</td>
@@ -39,111 +32,117 @@
               <td><code>true</code></td>
               <td>6.9</td>
             </tr>
+            <tr>
+              <td>option</td>
+              <td>Specify the policy on placement of a left curly brace (<code>'{'</code>).</td>
+              <td><a href="../../property_types.html#LeftCurlyOption">LeftCurlyOption</a></td>
+              <td><code>eol</code></td>
+              <td>3.0</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
+                    LITERAL_DEFAULT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
+                    LITERAL_TRY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#OBJBLOCK">
-                  OBJBLOCK</a>
+                    OBJBLOCK</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                .
+                    STATIC_INIT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
+                  .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
+                    LITERAL_DEFAULT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
+                    LITERAL_TRY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#OBJBLOCK">
-                  OBJBLOCK</a>
+                    OBJBLOCK</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                .
+                    STATIC_INIT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
+                  .
               </td>
               <td>3.0</td>
             </tr>
@@ -152,20 +151,26 @@
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
+        <p id="Example1-config"> To configure the check: </p>
         <source>
-&lt;module name=&quot;LeftCurly&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;LeftCurly&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
+
+        <p id="Example1-code">Example: </p>
         <source>
-class Test
-{ // Violation - '{' should be on the previous line
+class Example1
+{ // violation, ''{' at column 1 should be on the previous line.'
   private interface TestInterface
-  { // Violation - '{' should be on the previous line
+  { // violation, ''{' at column 3 should be on the previous line.'
   }
 
   private
-  class
-  MyClass { // OK
+    class
+    MyClass { // OK
   }
 
   enum Colors {RED, // OK
@@ -174,26 +179,31 @@ class Test
   }
 }
         </source>
-        <p>
+        <p id="Example2-config">
           To configure the check to apply the <code>nl</code> policy to
           type blocks:
         </p>
         <source>
-&lt;module name=&quot;LeftCurly&quot;&gt;
-  &lt;property name=&quot;option&quot; value=&quot;nl&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;CLASS_DEF,INTERFACE_DEF&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;LeftCurly&quot;&gt;
+      &lt;property name=&quot;option&quot; value=&quot;nl&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;CLASS_DEF,INTERFACE_DEF&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example2-code">Example: </p>
         <source>
-class Test
+class Example2
 { // OK
   private interface TestInterface
   { // OK
   }
 
   private
-  class
-  MyClass { // Violation - '{' should be on a new line
+    class
+    MyClass { // violation, ''{' at column 13 should be on a new line.'
   }
 
   enum Colors {RED, // OK
@@ -202,25 +212,30 @@ class Test
   }
 }
         </source>
-        <p>
+        <p id="Example3-config">
           To configure the check to apply the <code>nlow</code> policy to
           type blocks:
         </p>
         <source>
-&lt;module name=&quot;LeftCurly&quot;&gt;
-  &lt;property name=&quot;option&quot; value=&quot;nlow&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;CLASS_DEF,INTERFACE_DEF&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;LeftCurly&quot;&gt;
+      &lt;property name=&quot;option&quot; value=&quot;nlow&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;CLASS_DEF,INTERFACE_DEF&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example3-code">Example: </p>
         <source>
-class Test
-{ // Violation - '{' should be on the previous line
+class Example3
+{ // violation, ''{' at column 1 should be on the previous line.'
   private interface TestInterface { // OK
   }
 
   private
-  class
-  MyClass { // Violation - '{' should be on a new line
+    class
+    MyClass { // violation, ''{' at column 13 should be on a new line.'
   }
 
   enum Colors {RED, // OK
@@ -229,29 +244,34 @@ class Test
   }
 }
         </source>
-        <p>
+        <p id="Example4-config">
           An example of how to configure the check to validate enum definitions:
         </p>
         <source>
-&lt;module name=&quot;LeftCurly&quot;&gt;
-  &lt;property name=&quot;ignoreEnums&quot; value=&quot;false&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;LeftCurly&quot;&gt;
+      &lt;property name=&quot;ignoreEnums&quot; value=&quot;false&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example4-code">Example: </p>
         <source>
-class Test
-{ // Violation - '{' should be on the previous line
+class Example4
+{ // violation, ''{' at column 1 should be on the previous line.'
   private interface TestInterface
-  { // Violation - '{' should be on the previous line
+  { // violation, ''{' at column 3 should be on the previous line.'
   }
 
   private
-  class
-  MyClass { // OK
+    class
+    MyClass { // OK
   }
 
-  enum Colors {RED, // Violation - '{' should have line break after
-  BLUE,
-  GREEN;
+  enum Colors {RED, // violation, ''{' at column 15 should have line break after.'
+    BLUE,
+    GREEN;
   }
 }
         </source>
diff --git a/src/xdocs/checks/blocks/leftcurly.xml.template b/src/xdocs/checks/blocks/leftcurly.xml.template
index b4d7ffc7db4..41ea0ec36ec 100644
--- a/src/xdocs/checks/blocks/leftcurly.xml.template
+++ b/src/xdocs/checks/blocks/leftcurly.xml.template
@@ -17,244 +17,63 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify the policy on placement of a left curly brace (<code>'{'</code>).</td>
-              <td><a href="../../property_types.html#LeftCurlyOption">LeftCurlyOption</a></td>
-              <td><code>eol</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>ignoreEnums</td>
-              <td>Allow to ignore enums when left curly brace policy is EOL.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.9</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#OBJBLOCK">
-                  OBJBLOCK</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#OBJBLOCK">
-                  OBJBLOCK</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
-        <source>
-&lt;module name="LeftCurly"/&gt;
-        </source>
-        <source>
-class Test
-{ // Violation - '{' should be on the previous line
-  private interface TestInterface
-  { // Violation - '{' should be on the previous line
-  }
-
-  private
-  class
-  MyClass { // OK
-  }
+        <p id="Example1-config"> To configure the check: </p>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.java"/>
+            <param name="type" value="config"/>
+        </macro>
 
-  enum Colors {RED, // OK
-    BLUE,
-    GREEN;
-  }
-}
-        </source>
-        <p>
+        <p id="Example1-code">Example: </p>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure the check to apply the <code>nl</code> policy to
           type blocks:
         </p>
-        <source>
-&lt;module name="LeftCurly"&gt;
-  &lt;property name="option" value="nl"/&gt;
-  &lt;property name="tokens" value="CLASS_DEF,INTERFACE_DEF"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-class Test
-{ // OK
-  private interface TestInterface
-  { // OK
-  }
-
-  private
-  class
-  MyClass { // Violation - '{' should be on a new line
-  }
-
-  enum Colors {RED, // OK
-    BLUE,
-    GREEN;
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example: </p>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To configure the check to apply the <code>nlow</code> policy to
           type blocks:
         </p>
-        <source>
-&lt;module name="LeftCurly"&gt;
-  &lt;property name="option" value="nlow"/&gt;
-  &lt;property name="tokens" value="CLASS_DEF,INTERFACE_DEF"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-class Test
-{ // Violation - '{' should be on the previous line
-  private interface TestInterface { // OK
-  }
-
-  private
-  class
-  MyClass { // Violation - '{' should be on a new line
-  }
-
-  enum Colors {RED, // OK
-    BLUE,
-    GREEN;
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example: </p>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           An example of how to configure the check to validate enum definitions:
         </p>
-        <source>
-&lt;module name="LeftCurly"&gt;
-  &lt;property name="ignoreEnums" value="false"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-class Test
-{ // Violation - '{' should be on the previous line
-  private interface TestInterface
-  { // Violation - '{' should be on the previous line
-  }
-
-  private
-  class
-  MyClass { // OK
-  }
-
-  enum Colors {RED, // Violation - '{' should have line break after
-  BLUE,
-  GREEN;
-  }
-}
-        </source>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example: </p>
+        <macro name="example">
+            <param name="path" value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/leftcurly/Example4.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/blocks/needbraces.xml b/src/xdocs/checks/blocks/needbraces.xml
index 6e422c1163f..9b521a77364 100644
--- a/src/xdocs/checks/blocks/needbraces.xml
+++ b/src/xdocs/checks/blocks/needbraces.xml
@@ -23,54 +23,53 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>allowSingleLineStatement</td>
-              <td>allow single-line statements without braces.</td>
+              <td>allowEmptyLoopBody</td>
+              <td>Allow loops with empty bodies.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
-              <td>6.5</td>
+              <td>6.12.1</td>
             </tr>
             <tr>
-              <td>allowEmptyLoopBody</td>
-              <td>allow loops with empty bodies.</td>
+              <td>allowSingleLineStatement</td>
+              <td>Allow single-line statements without braces.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
-              <td>6.12.1</td>
+              <td>6.5</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
+                    LITERAL_DEFAULT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                .
+                    LAMBDA</a>
+                  .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                .
+                    LITERAL_WHILE</a>
+                  .
               </td>
               <td>3.0</td>
             </tr>
@@ -79,196 +78,306 @@
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
+        <p id="Example1-config"> To configure the check: </p>
         <source>
-&lt;module name=&quot;NeedBraces&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;NeedBraces&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example1-code">Example:</p>
         <source>
-if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
-if (true) {                     // OK
+class Example1 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = &quot;O&quot;;
+  public boolean Example1() {
+    if (obj.equals(num)) return true;
+    // violation above, ''if' construct must use '{}'s.'
+    if (true) {
+      count = 2;
+    } else
+        // violation above, ''else' construct must use '{}'s.'
+        return false;
+    for (int i = 0; i &lt; 5; i++) {
+      ++count;}
+    do // violation, ''do' construct must use '{}'s.'
+        ++count;
+    while (false);
+    for (int j = 0; j &lt; 10; j++);
+    // violation above, ''for' construct must use '{}'s.'
+    for(int i = 0; i &lt; 10; value.charAt(12));
+    // violation above, ''for' construct must use '{}'s.'
+    while (counter &lt; 10)
+        // violation above, ''while' construct must use '{}'s.'
+        ++count;
+    while (value.charAt(12) &lt; 5);
+    // violation above, ''while' construct must use '{}'s.'
+    switch (num) {
+      case 1: counter++; break;
+    }
     return true;
-} else                          // violation, single-line statements not allowed without braces
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // violation, single-line statements not allowed without braces
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++); // violation, empty loop body not allowed
-for(int i = 0; i &lt; 10; value.incrementValue()); // violation, empty loop body not allowed
-while (counter &lt; 10)          // violation, single-line statements not allowed without braces
-    ++count;
-while (value.incrementValue() &lt; 5); // violation, empty loop body not allowed
-switch (num) {
-  case 1: counter++; break;         // OK
+  }
 }
         </source>
-        <p>
+        <p id="Example2-config">
           To configure the check for <code>if</code> and
           <code> else</code> blocks:
         </p>
         <source>
-&lt;module name=&quot;NeedBraces&quot;&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_IF, LITERAL_ELSE&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;NeedBraces&quot;&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_IF, LITERAL_ELSE&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example2-code">Example:</p>
         <source>
-if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
-if (true) {                     // OK
+class Example2 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = &quot;O&quot;;
+  public boolean Example2() {
+    if (obj.equals(num)) return true;
+    // violation above, ''if' construct must use '{}'s.'
+    if (true) {
+      count = 2;
+    } else
+        // violation above, ''else' construct must use '{}'s.'
+        return false;
+    for (int i = 0; i &lt; 5; i++) {
+      ++count;}
+    do // ok, because DO is not a target of validation
+        ++count;
+    while (false);
+    for (int j = 0; j &lt; 10; j++);
+    // ok above, because FOR is not a target of validation
+    for(int i = 0; i &lt; 10; value.charAt(12));
+    // ok above, because FOR is not a target of validation
+    while (counter &lt; 10)
+        // ok above, because WHILE is not a target of validation
+        ++count;
+    while (value.charAt(12) &lt; 5);
+    // ok above, because WHILE is not a target of validation
+    switch (num) {
+      case 1: counter++; break;
+    }
     return true;
-} else                          // violation, single-line statements not allowed without braces
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);   // OK
-for(int i = 0; i &lt; 10; value.incrementValue()); // OK
-while (counter &lt; 10)                            // OK
-    ++count;
-while (value.incrementValue() &lt; 5); // OK
-switch (num) {
-  case 1: counter++; break;         // OK
+  }
 }
         </source>
-        <p>
+        <p id="Example3-config">
           To configure the check to allow single-line statements
           (<code>if, while, do-while, for</code>) without braces:
         </p>
         <source>
-&lt;module name=&quot;NeedBraces&quot;&gt;
-  &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
-  &lt;property name=&quot;tokens&quot;
-         value=&quot;LITERAL_IF, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;NeedBraces&quot;&gt;
+      &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
+      &lt;property name=&quot;tokens&quot;
+             value=&quot;LITERAL_IF, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-
-        <p>
-          Example:
-        </p>
+        <p id="Example3-code">Example:</p>
         <source>
-if (obj.isValid()) return true;  // OK
-if (true) {                      // OK
+class Example3 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = &quot;O&quot;;
+  public boolean Example3() {
+    if (obj.equals(num)) return true;
+    // ok above, because single line IF statement is allowed in config.
+    if (true) {
+      count = 2;
+    } else
+        // ok above, because single line ELSE statement is allowed in config.
+        return false;
+    for (int i = 0; i &lt; 5; i++) {
+      ++count;}
+    do // violation, ''do' construct must use '{}'s.'
+        ++count;
+    while (false);
+    for (int j = 0; j &lt; 10; j++);
+    // ok above, because single line FOR statement is allowed in config.
+    for(int i = 0; i &lt; 10; value.charAt(12));
+    // ok above, because single line FOR statement is allowed in config.
+    while (counter &lt; 10)
+        // violation above, ''while' construct must use '{}'s.'
+        ++count;
+    while (value.charAt(12) &lt; 5);
+    // ok above, because single line FOR statement is allowed in config.
+    switch (num) {
+      case 1: counter++; break;
+    }
     return true;
-} else                           // OK
-    return false;
-for (int i = 0; i &lt; 5; i++) {    // OK
-    ++count;
+  }
 }
-do                               // OK
-   ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);                   // violation, empty loop body not allowed
-for(int i = 0; i &lt; 10; value.incrementValue()); // violation, empty loop body not allowed
-while (counter &lt; 10)                 // OK
-   ++count;
-while (value.incrementValue() &lt; 5);  // violation, empty loop body not allowed
-switch (num) {
-  case 1: counter++; break;          // OK
-}
-while (obj.isValid()) return true;   // OK
-do this.notify(); while (o != null); // OK
-for (int i = 0; ; ) this.notify();   // OK
         </source>
-
-        <p>
+        <p id="Example4-config">
           To configure the check to allow <code>case, default</code> single-line statements
           without braces:
         </p>
         <source>
-&lt;module name=&quot;NeedBraces&quot;&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_CASE, LITERAL_DEFAULT&quot;/&gt;
-  &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;NeedBraces&quot;&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_CASE, LITERAL_DEFAULT&quot;/&gt;
+      &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-
-        <p>
-          Next statements won't be violated by check:
+        <p id="Example4-code">
+        Next statements won't be violated by check:
         </p>
         <source>
-if (obj.isValid()) return true; // OK
-if (true) {                     // OK
+class Example4 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = &quot;O&quot;;
+  public boolean Example4() {
+
+    if (obj.equals(num)) return true;
+    // ok above, because IF is not a target of validation
+    if (true) {
+      count = 2;
+    } else
+        // ok above, because ELSE is not a target of validation
+        return false;
+    for (int i = 0; i &lt; 5; i++) {
+      ++count;}
+    do // ok, because DO is not a target of validation
+        ++count;
+    while (false);
+    for (int j = 0; j &lt; 10; j++);
+    // ok above, because FOR is not a target of validation
+    for(int i = 0; i &lt; 10; value.charAt(12));
+    // ok above, because FOR is not a target of validation
+    while (counter &lt; 10)
+        // ok above, because WHILE is not a target of validation
+        ++count;
+    while (value.charAt(12) &lt; 5);
+    // ok above, because WHILE is not a target of validation
+    switch (num) {
+      case 1: counter++; break;
+    }
     return true;
-} else                          // OK
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);   // OK
-for(int i = 0; i &lt; 10; value.incrementValue()); // OK
-while (counter &lt; 10)                            // OK
-   ++count;
-while (value.incrementValue() &lt; 5); // OK
-switch (num) {
-  case 1: counter++; break;         // OK
-  case 6: counter += 10; break;     // OK
-  default: counter = 100; break;    // OK
+  }
 }
         </source>
-        <p>
+        <p id="Example5-config">
           To configure the check to allow loops (<code>while, for</code>) with empty bodies:
         </p>
         <source>
-&lt;module name=&quot;NeedBraces&quot;&gt;
-  &lt;property name=&quot;allowEmptyLoopBody&quot; value=&quot;true&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_WHILE, LITERAL_FOR&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;NeedBraces&quot;&gt;
+      &lt;property name=&quot;allowEmptyLoopBody&quot; value=&quot;true&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_WHILE, LITERAL_FOR&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-
-        <p>
-            Example:
-        </p>
+        <p id="Example5-code">Example:</p>
         <source>
-if (obj.isValid()) return true; // OK
-if (true) {                     // OK
+class Example5 {
+  String obj = new String();
+  String value = new String();
+  int counter = 1;
+  int count = 0;
+  int num = 12;
+  String o = &quot;O&quot;;
+  public boolean Example5() {
+    if (obj.equals(num)) return true;
+    // ok above, because IF is not a target of validation
+    if (true) {
+      count = 2;
+    } else
+        // ok above, because ELSE is not a target of validation
+        return false;
+    for (int i = 0; i &lt; 5; i++) {
+      ++count;}
+    do // ok, because DO is not a target of validation
+        ++count;
+    while (false);
+    for (int j = 0; j &lt; 10; j++);
+    // ok above, because FOR is not a target of validation
+    for(int i = 0; i &lt; 10; value.charAt(12));
+    // ok above, because FOR is not a target of validation
+    while (counter &lt; 10)
+        // violation above, ''while' construct must use '{}'s.'
+        ++count;
+    while (value.charAt(12) &lt; 5);
+    // ok above, because WHILE is not a target of validation
+    switch (num) {
+      case 1: counter++; break;
+    }
     return true;
-} else                          // OK
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);   // OK
-for(int i = 0; i &lt; 10; value.incrementValue()); // OK
-while (counter &lt; 10)           // violation, single-line statements not allowed without braces
-   ++count;
-while (value.incrementValue() &lt; 5); // OK
-switch (num) {
-case 1: counter++; break;           // OK
+  }
 }
         </source>
-        <p>
+        <p id="Example6-config">
           To configure the check to lambdas:
         </p>
         <source>
-&lt;module name=&quot;NeedBraces&quot;&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LAMBDA&quot;/&gt;
-  &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;NeedBraces&quot;&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LAMBDA&quot;/&gt;
+      &lt;property name=&quot;allowSingleLineStatement&quot; value=&quot;true&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Results in following:
-        </p>
+        <p id="Example6-code">Results in following:</p>
         <source>
-allowedFuture.addCallback(result -&gt; assertEquals(&quot;Invalid response&quot;,
-  EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result), // violation, lambda spans 2 lines
-  ex -&gt; fail(ex.getMessage())); // OK
-
-allowedFuture.addCallback(result -&gt; {
-  return assertEquals(&quot;Invalid response&quot;,
-    EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result);
-  }, // OK
-  ex -&gt; fail(ex.getMessage()));
+class Example6 {
+  enum HttpMethod {GET, OPTIONS}
+  Object result = new Object();
+  private CustomCompletableFuture&lt;Object&gt; allowedFuture;
+  Example6() {
+    allowedFuture = new CustomCompletableFuture&lt;&gt;();
+    allowedFuture.addCallback(result -&gt; assertEquals(&quot;Invalid response&quot;, // violation
+                    EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result),
+            ex -&gt; fail(ex.getMessage()));
+    allowedFuture.addCustomCallback(() -&gt; {
+      return assertEquals(&quot;Invalid response&quot;,
+              EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result);},
+            ex -&gt; fail(ex.getMessage()));}
+  private Object assertEquals(String invalidResponse, EnumSet&lt;HttpMethod&gt; get,
+                              Object result) {
+    return result;}
+  private String fail(String message) {
+    return message;
+  }}
+class CustomCompletableFuture&lt;T&gt; {
+  private CompletableFuture&lt;T&gt; allowedFuture;
+  public CustomCompletableFuture() {
+    allowedFuture = new CompletableFuture&lt;&gt;();
+  }
+  public void addCallback(java.util.function.Consumer&lt;T&gt; successCallback,
+          java.util.function.Consumer&lt;Throwable&gt; failureCallback) {}
+  public void addCustomCallback(java.util.function.Supplier&lt;Object&gt; successLambda,
+          java.util.function.Consumer&lt;Throwable&gt; failureLambda) {}
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/blocks/needbraces.xml.template b/src/xdocs/checks/blocks/needbraces.xml.template
index 6bf6dcad188..0f6867a5b0f 100644
--- a/src/xdocs/checks/blocks/needbraces.xml.template
+++ b/src/xdocs/checks/blocks/needbraces.xml.template
@@ -14,262 +14,101 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowSingleLineStatement</td>
-              <td>allow single-line statements without braces.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.5</td>
-            </tr>
-            <tr>
-              <td>allowEmptyLoopBody</td>
-              <td>allow loops with empty bodies.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.12.1</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DEFAULT">
-                  LITERAL_DEFAULT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
-        <source>
-&lt;module name="NeedBraces"/&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
-if (true) {                     // OK
-    return true;
-} else                          // violation, single-line statements not allowed without braces
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // violation, single-line statements not allowed without braces
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++); // violation, empty loop body not allowed
-for(int i = 0; i &lt; 10; value.incrementValue()); // violation, empty loop body not allowed
-while (counter &lt; 10)          // violation, single-line statements not allowed without braces
-    ++count;
-while (value.incrementValue() &lt; 5); // violation, empty loop body not allowed
-switch (num) {
-  case 1: counter++; break;         // OK
-}
-        </source>
-        <p>
+        <p id="Example1-config"> To configure the check: </p>
+        <macro name="example">
+             <param name="path"
+                    value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.java"/>
+             <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure the check for <code>if</code> and
           <code> else</code> blocks:
         </p>
-        <source>
-&lt;module name="NeedBraces"&gt;
-  &lt;property name="tokens" value="LITERAL_IF, LITERAL_ELSE"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-if (obj.isValid()) return true; // violation, single-line statements not allowed without braces
-if (true) {                     // OK
-    return true;
-} else                          // violation, single-line statements not allowed without braces
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);   // OK
-for(int i = 0; i &lt; 10; value.incrementValue()); // OK
-while (counter &lt; 10)                            // OK
-    ++count;
-while (value.incrementValue() &lt; 5); // OK
-switch (num) {
-  case 1: counter++; break;         // OK
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To configure the check to allow single-line statements
           (<code>if, while, do-while, for</code>) without braces:
         </p>
-        <source>
-&lt;module name="NeedBraces"&gt;
-  &lt;property name="allowSingleLineStatement" value="true"/&gt;
-  &lt;property name="tokens"
-         value="LITERAL_IF, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR"/&gt;
-&lt;/module&gt;
-        </source>
-
-        <p>
-          Example:
-        </p>
-        <source>
-if (obj.isValid()) return true;  // OK
-if (true) {                      // OK
-    return true;
-} else                           // OK
-    return false;
-for (int i = 0; i &lt; 5; i++) {    // OK
-    ++count;
-}
-do                               // OK
-   ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);                   // violation, empty loop body not allowed
-for(int i = 0; i &lt; 10; value.incrementValue()); // violation, empty loop body not allowed
-while (counter &lt; 10)                 // OK
-   ++count;
-while (value.incrementValue() &lt; 5);  // violation, empty loop body not allowed
-switch (num) {
-  case 1: counter++; break;          // OK
-}
-while (obj.isValid()) return true;   // OK
-do this.notify(); while (o != null); // OK
-for (int i = 0; ; ) this.notify();   // OK
-        </source>
-
-        <p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           To configure the check to allow <code>case, default</code> single-line statements
           without braces:
         </p>
-        <source>
-&lt;module name="NeedBraces"&gt;
-  &lt;property name="tokens" value="LITERAL_CASE, LITERAL_DEFAULT"/&gt;
-  &lt;property name="allowSingleLineStatement" value="true"/&gt;
-&lt;/module&gt;
-        </source>
-
-        <p>
-          Next statements won't be violated by check:
+        <macro name="example">
+             <param name="path"
+                    value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.java"/>
+             <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">
+        Next statements won't be violated by check:
         </p>
-        <source>
-if (obj.isValid()) return true; // OK
-if (true) {                     // OK
-    return true;
-} else                          // OK
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);   // OK
-for(int i = 0; i &lt; 10; value.incrementValue()); // OK
-while (counter &lt; 10)                            // OK
-   ++count;
-while (value.incrementValue() &lt; 5); // OK
-switch (num) {
-  case 1: counter++; break;         // OK
-  case 6: counter += 10; break;     // OK
-  default: counter = 100; break;    // OK
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example4.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example5-config">
           To configure the check to allow loops (<code>while, for</code>) with empty bodies:
         </p>
-        <source>
-&lt;module name="NeedBraces"&gt;
-  &lt;property name="allowEmptyLoopBody" value="true"/&gt;
-  &lt;property name="tokens" value="LITERAL_WHILE, LITERAL_FOR"/&gt;
-&lt;/module&gt;
-        </source>
-
-        <p>
-            Example:
-        </p>
-        <source>
-if (obj.isValid()) return true; // OK
-if (true) {                     // OK
-    return true;
-} else                          // OK
-    return false;
-for (int i = 0; i &lt; 5; i++) {   // OK
-     ++count;
-}
-do                              // OK
-    ++count;
-while (false);
-for (int j = 0; j &lt; 10; j++);   // OK
-for(int i = 0; i &lt; 10; value.incrementValue()); // OK
-while (counter &lt; 10)           // violation, single-line statements not allowed without braces
-   ++count;
-while (value.incrementValue() &lt; 5); // OK
-switch (num) {
-case 1: counter++; break;           // OK
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example5.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example6-config">
           To configure the check to lambdas:
         </p>
-        <source>
-&lt;module name="NeedBraces"&gt;
-  &lt;property name="tokens" value="LAMBDA"/&gt;
-  &lt;property name="allowSingleLineStatement" value="true"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Results in following:
-        </p>
-        <source>
-allowedFuture.addCallback(result -&gt; assertEquals("Invalid response",
-  EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result), // violation, lambda spans 2 lines
-  ex -&gt; fail(ex.getMessage())); // OK
-
-allowedFuture.addCallback(result -&gt; {
-  return assertEquals("Invalid response",
-    EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS), result);
-  }, // OK
-  ex -&gt; fail(ex.getMessage()));
-        </source>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example6-code">Results in following:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/Example6.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/blocks/rightcurly.xml b/src/xdocs/checks/blocks/rightcurly.xml
index f89cafa367b..0336c319cc7 100644
--- a/src/xdocs/checks/blocks/rightcurly.xml
+++ b/src/xdocs/checks/blocks/rightcurly.xml
@@ -11,7 +11,7 @@
       <subsection name="Description" id="Description">
         <p>
           Checks the placement of right curly braces (<code>'}'</code>) for code blocks.
-          This check supports if-else, try-catch-finally blocks, switch statements,
+          This check supports if-else, try-catch-finally blocks, switch statements, switch cases,
           while-loops, for-loops, method definitions, class definitions, constructor definitions,
           instance, static initialization blocks, annotation definitions and enum definitions.
           For right curly brace of expression blocks of arrays, lambdas and class instances
@@ -44,57 +44,59 @@
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                .
+                    LITERAL_TRY</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
+                    LITERAL_CATCH</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
+                    LITERAL_FINALLY</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
+                    LITERAL_IF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
+                    LITERAL_ELSE</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
+                    CLASS_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                    METHOD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
+                    CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
+                    LITERAL_FOR</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
+                    LITERAL_WHILE</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
+                    LITERAL_DO</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
+                    STATIC_INIT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
+                    INSTANCE_INIT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
+                    ENUM_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+                    INTERFACE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
+                    LITERAL_SWITCH</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
+                    LITERAL_CASE</a>
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                .
+                    LITERAL_TRY</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
+                    LITERAL_CATCH</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
+                    LITERAL_FINALLY</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
+                    LITERAL_IF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
+                    LITERAL_ELSE</a>
+                  .
               </td>
               <td>3.0</td>
             </tr>
@@ -103,139 +105,166 @@
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
+        <p id="Example1-config"> To configure the check: </p>
         <source>
-&lt;module name=&quot;RightCurly&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;RightCurly&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-
-        <p>Example: </p>
+        <p id="Example1-code">Example:</p>
         <source>
-public class Test {
+public class Example1 {
 
   public void test() {
 
+    boolean foo = false;
     if (foo) {
       bar();
-    }           // violation, right curly must be in the same line as the 'else' keyword
+    } // violation, 'should be on the same line'
+    // as the next part of a multi-block statement (one that directly
+    // contains multiple blocks: if/else-if/else, do/while or try/catch/finally).
     else {
       bar();
     }
 
     if (foo) {
       bar();
-    } else {     // OK
+    } else {
       bar();
     }
 
-    if (foo) { bar(); } int i = 0;  // violation
-                  // ^^^ statement is not allowed on same line after curly right brace
+    if (foo) { bar(); } int i = 0;
+    // violation above, 'should be alone on a line.'
 
-    if (foo) { bar(); }            // OK
-    int i = 0;
+    if (foo) { bar(); }
+    i = 0;
 
     try {
       bar();
-    }           // violation, rightCurly must be in the same line as 'catch' keyword
+    } // violation, 'should be on the same line'
+    // as the next part of a multi-block statement (one that directly
+    // contains multiple blocks: if/else-if/else, do/while or try/catch/finally).
     catch (Exception e) {
       bar();
     }
 
     try {
       bar();
-    } catch (Exception e) { // OK
+    } catch (Exception e) {
       bar();
     }
 
-  }                         // OK
+  }
+
+  private void bar() {
+  }
 
   public void testSingleLine() { bar(); } // OK, because singleline is allowed
 }
         </source>
-
-        <p>
+        <p id="Example2-config">
           To configure the check with policy <code>alone</code> for <code> else</code> and
           <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
           METHOD_DEF</a>
           tokens:
         </p>
         <source>
-&lt;module name=&quot;RightCurly&quot;&gt;
-  &lt;property name=&quot;option&quot; value=&quot;alone&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_ELSE, METHOD_DEF&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;RightCurly&quot;&gt;
+      &lt;property name=&quot;option&quot; value=&quot;alone&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_ELSE, METHOD_DEF&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-
-        <p>Example: </p>
+        <p id="Example2-code">Example:</p>
         <source>
-public class Test {
+public class Example2 {
 
   public void test() {
 
+    boolean foo = false;
     if (foo) {
       bar();
-    } else { bar(); }   // violation, right curly must be alone on line
+    } else { bar(); }
+    // violation above, 'should be alone on a line.'
 
     if (foo) {
       bar();
     } else {
       bar();
-    }                   // OK
+    }
 
     try {
       bar();
-    } catch (Exception e) { // OK because config is set to token METHOD_DEF and LITERAL_ELSE
+    } catch (Exception e) {
+      // OK above because config is set to token METHOD_DEF and LITERAL_ELSE
       bar();
     }
 
-  }                         // OK
+  }
+
+  private void bar() {
+  }
 
-  public void violate() { bar; } // violation, singleline is not allowed here
+  public void violate() { Object bar = &quot;bar&quot;; }
+  // violation above, 'should be alone on a line.'
 
   public void ok() {
     bar();
-  }                              // OK
+  }
 }
         </source>
-        <p>
+        <p id="Example3-config">
           To configure the check with policy <code>alone</code> for
           <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html">
           Switch</a>
-          Statements:
+          Statements and Switch Cases:
         </p>
         <source>
-&lt;module name=&quot;RightCurly&quot;&gt;
-  &lt;property name=&quot;option&quot; value=&quot;alone&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_SWITCH&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;RightCurly&quot;&gt;
+      &lt;property name=&quot;option&quot; value=&quot;alone&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_SWITCH, LITERAL_CASE&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-
+        <p id="Example3-code">Example:</p>
         <source>
-class Test {
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0;
-        } // ok, RightCurly is alone
-    }
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0; } // violation, RightCurly should be alone on a line
-    }
-
+class Example3 {
+
+  public void method0() {
+    int mode = 0;
+    int x;
+    switch (mode) {
+      case 1:
+        int y = 1;
+        break;
+      case 2: {x = 1;}   // violation '}' at column 22 should be alone on a line'
+      case 3: int z = 0; {break;} // ok, the braces is not a first child of case
+      default:
+        x = 0;
+    } // ok, RightCurly is alone
+  }
+
+  public void method01() {
+    int mode = 0;
+    switch (mode) {
+      case 1:
+        int x = 1;
+        break;
+      default:
+        x = 0; }
+    // violation above, 'should be alone on a line.'
+  }
 }
         </source>
-        <p>
+        <p id="Example4-config">
           To configure the check with policy <code>alone_or_singleline</code> for <code> if</code>
           and
           <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
@@ -243,81 +272,99 @@ class Test {
           tokens:
         </p>
         <source>
-&lt;module name=&quot;RightCurly&quot;&gt;
-  &lt;property name=&quot;option&quot; value=&quot;alone_or_singleline&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_IF, METHOD_DEF&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;RightCurly&quot;&gt;
+      &lt;property name=&quot;option&quot; value=&quot;alone_or_singleline&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_IF, METHOD_DEF&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-
-        <p>Example: </p>
+        <p id="Example4-code">Example:</p>
         <source>
-public class Test {
+public class Example4 {
 
   public void test() {
 
+    boolean foo = false;
     if (foo) {
       bar();
-    } else {        // violation, right curly must be alone on line
+    } else { // violation, 'should be alone on a line.'
       bar();
     }
 
     if (foo) {
       bar();
-    }               // OK
+    }
     else {
       bar();
     }
 
     try {
       bar();
-    } catch (Exception e) {        // OK because config did not set token LITERAL_TRY
+    } catch (Exception e) { // OK because config did not set token LITERAL_TRY
       bar();
     }
 
-  }                                // OK
+  }
+
+  private void bar() {
+  }
 
   public void violate() { bar(); } // OK , because singleline
 }
         </source>
-        <p>
+        <p id="Example5-config">
           To configure the check with policy <code>alone_or_singleline</code> for
           <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html">
           Switch</a>
-          Statements:
+          Statements and Switch Cases:
         </p>
         <source>
-&lt;module name=&quot;RightCurly&quot;&gt;
-  &lt;property name=&quot;option&quot; value=&quot;alone_or_singleline&quot;/&gt;
-  &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_SWITCH&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;RightCurly&quot;&gt;
+      &lt;property name=&quot;option&quot; value=&quot;alone_or_singleline&quot;/&gt;
+      &lt;property name=&quot;tokens&quot; value=&quot;LITERAL_SWITCH, LITERAL_CASE&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example5-code">Example:</p>
         <source>
-class Test {
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0;
-        } // ok
-    }
-
-    public static void method7() {
-        int mode = 0;
-        int x;
-        switch (mode) { case 1: x = 5; } // ok, RightCurly is on the same line as LeftCurly
-    }
-
-    public void method() {
-        int mode = 0;
-        int x;
-        switch (mode) {
-            case 1:
-                x = 1; } // violation, right curly should be alone on line
+class Example5 {
+
+  public void method0() {
+    int mode = 0;
+    int x;
+    switch (mode) {
+      case 1:
+        int y = 1;
+        break;
+      case 2: {x = 1;}   // ok, RightCurly is in single line
+      case 3: int z = 0; {break;} // ok, the braces is not a first child of case
+      default:
+        x = 0;
     }
+  }
+
+  public static void method7() {
+    int mode = 0;
+    switch (mode) {
+      case 1:
+        int x = 5;
+    } // ok, RightCurly is on the same line as LeftCurly
+  }
+
+  public void method() {
+    int mode = 0;
+    int x;
+    switch (mode) {
+      case 1:
+        x = 1; }
+    // violation above, 'should be alone on a line.'
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/blocks/rightcurly.xml.template b/src/xdocs/checks/blocks/rightcurly.xml.template
index 7291080df2b..6d17edde2e2 100644
--- a/src/xdocs/checks/blocks/rightcurly.xml.template
+++ b/src/xdocs/checks/blocks/rightcurly.xml.template
@@ -11,7 +11,7 @@
       <subsection name="Description" id="Description">
         <p>
           Checks the placement of right curly braces (<code>'}'</code>) for code blocks.
-          This check supports if-else, try-catch-finally blocks, switch statements,
+          This check supports if-else, try-catch-finally blocks, switch statements, switch cases,
           while-loops, for-loops, method definitions, class definitions, constructor definitions,
           instance, static initialization blocks, annotation definitions and enum definitions.
           For right curly brace of expression blocks of arrays, lambdas and class instances
@@ -24,302 +24,95 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify the policy on placement of a right curly brace (<code>'}'</code>).</td>
-              <td><a href="../../property_types.html#RightCurlyOption">RightCurlyOption</a></td>
-              <td><code>same</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-              , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p> To configure the check: </p>
-        <source>
-&lt;module name="RightCurly"/&gt;
-        </source>
-
-        <p>Example: </p>
-        <source>
-public class Test {
-
-  public void test() {
-
-    if (foo) {
-      bar();
-    }           // violation, right curly must be in the same line as the 'else' keyword
-    else {
-      bar();
-    }
-
-    if (foo) {
-      bar();
-    } else {     // OK
-      bar();
-    }
-
-    if (foo) { bar(); } int i = 0;  // violation
-                  // ^^^ statement is not allowed on same line after curly right brace
-
-    if (foo) { bar(); }            // OK
-    int i = 0;
-
-    try {
-      bar();
-    }           // violation, rightCurly must be in the same line as 'catch' keyword
-    catch (Exception e) {
-      bar();
-    }
-
-    try {
-      bar();
-    } catch (Exception e) { // OK
-      bar();
-    }
-
-  }                         // OK
-
-  public void testSingleLine() { bar(); } // OK, because singleline is allowed
-}
-        </source>
-
-        <p>
+        <p id="Example1-config"> To configure the check: </p>
+        <macro name="example">
+             <param name="path"
+                    value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.java"/>
+             <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure the check with policy <code>alone</code> for <code> else</code> and
           <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
           METHOD_DEF</a>
           tokens:
         </p>
-        <source>
-&lt;module name="RightCurly"&gt;
-  &lt;property name="option" value="alone"/&gt;
-  &lt;property name="tokens" value="LITERAL_ELSE, METHOD_DEF"/&gt;
-&lt;/module&gt;
-        </source>
-
-        <p>Example: </p>
-        <source>
-public class Test {
-
-  public void test() {
-
-    if (foo) {
-      bar();
-    } else { bar(); }   // violation, right curly must be alone on line
-
-    if (foo) {
-      bar();
-    } else {
-      bar();
-    }                   // OK
-
-    try {
-      bar();
-    } catch (Exception e) { // OK because config is set to token METHOD_DEF and LITERAL_ELSE
-      bar();
-    }
-
-  }                         // OK
-
-  public void violate() { bar; } // violation, singleline is not allowed here
-
-  public void ok() {
-    bar();
-  }                              // OK
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To configure the check with policy <code>alone</code> for
           <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html">
           Switch</a>
-          Statements:
+          Statements and Switch Cases:
         </p>
-        <source>
-&lt;module name="RightCurly"&gt;
-  &lt;property name="option" value="alone"/&gt;
-  &lt;property name="tokens" value="LITERAL_SWITCH"/&gt;
-&lt;/module&gt;
-        </source>
-
-        <source>
-class Test {
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0;
-        } // ok, RightCurly is alone
-    }
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0; } // violation, RightCurly should be alone on a line
-    }
-
-}
-        </source>
-        <p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           To configure the check with policy <code>alone_or_singleline</code> for <code> if</code>
           and
           <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
           METHOD_DEF</a>
           tokens:
         </p>
-        <source>
-&lt;module name="RightCurly"&gt;
-  &lt;property name="option" value="alone_or_singleline"/&gt;
-  &lt;property name="tokens" value="LITERAL_IF, METHOD_DEF"/&gt;
-&lt;/module&gt;
-        </source>
-
-        <p>Example: </p>
-        <source>
-public class Test {
-
-  public void test() {
-
-    if (foo) {
-      bar();
-    } else {        // violation, right curly must be alone on line
-      bar();
-    }
-
-    if (foo) {
-      bar();
-    }               // OK
-    else {
-      bar();
-    }
-
-    try {
-      bar();
-    } catch (Exception e) {        // OK because config did not set token LITERAL_TRY
-      bar();
-    }
-
-  }                                // OK
-
-  public void violate() { bar(); } // OK , because singleline
-}
-        </source>
-        <p>
+        <macro name="example">
+             <param name="path"
+                    value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.java"/>
+             <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example4.java"/>
+            <param name="type" value="code"/>
+        </macro>
+        <p id="Example5-config">
           To configure the check with policy <code>alone_or_singleline</code> for
           <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html">
           Switch</a>
-          Statements:
+          Statements and Switch Cases:
         </p>
-        <source>
-&lt;module name="RightCurly"&gt;
-  &lt;property name="option" value="alone_or_singleline"/&gt;
-  &lt;property name="tokens" value="LITERAL_SWITCH"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-class Test {
-
-    public void method0() {
-        int mode = 0;
-        switch (mode) {
-            case 1:
-                int x = 1;
-                break;
-            default:
-                x = 0;
-        } // ok
-    }
-
-    public static void method7() {
-        int mode = 0;
-        int x;
-        switch (mode) { case 1: x = 5; } // ok, RightCurly is on the same line as LeftCurly
-    }
-
-    public void method() {
-        int mode = 0;
-        int x;
-        switch (mode) {
-            case 1:
-                x = 1; } // violation, right curly should be alone on line
-    }
-}
-        </source>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.java"/>
+            <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">Example:</p>
+        <macro name="example">
+            <param name="path"
+                   value="/resources/com/puppycrawl/tools/checkstyle/checks/blocks/rightcurly/Example5.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/coding/arraytrailingcomma.xml b/src/xdocs/checks/coding/arraytrailingcomma.xml
index d5068b62451..59b94586a9a 100644
--- a/src/xdocs/checks/coding/arraytrailingcomma.xml
+++ b/src/xdocs/checks/coding/arraytrailingcomma.xml
@@ -89,10 +89,7 @@ return new int[] {
             </tr>
             <tr>
               <td>alwaysDemandTrailingComma</td>
-              <td>
-                  Control whether to always check for a trailing comma, even when an array is
-                  inline.
-              </td>
+              <td>Control whether to always check for a trailing comma, even when an array is inline.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.33</td>
@@ -116,37 +113,39 @@ return new int[] {
           Which results in the following violations:
         </p>
         <source>
-int[] numbers = {1, 2, 3};        //no violation
-boolean[] bools = {
-true,
-true,
-false
-};        //violation
-
-String[][] text = {{},{},};        //no violation
-
-double[][] decimals = {
-{0.5, 2.3, 1.1,},        //no violation
-{1.7, 1.9, 0.6},
-{0.8, 7.4, 6.5}
-};        // violation as previous line misses a comma
+public class Example1 {
+  int[] numbers = {1, 2, 3};
+  boolean[] bools = {
+    true,
+    true,
+    false  // violation
+    };
+
+  String[][] text = {{},{},};
+
+  double[][] decimals = {
+    {0.5, 2.3, 1.1,},
+    {1.7, 1.9, 0.6},
+    {0.8, 7.4, 6.5}  // violation
+  };
 
-char[] chars = {'a', 'b', 'c'
-  };        / /no violation
+  char[] chars = {'a', 'b', 'c'
+  };
 
-String[] letters = {
-  &quot;a&quot;, &quot;b&quot;, &quot;c&quot;};        // no violation
+  String[] letters = {
+    &quot;a&quot;, &quot;b&quot;, &quot;c&quot;};
 
-int[] a1 = new int[]{
-  1,
-  2
-  ,
-};        // no violation
+  int[] a1 = new int[]{
+    1,
+    2
+    ,
+  };
 
-int[] a2 = new int[]{
-  1,
-  2
-  ,};        // no violation
+  int[] a2 = new int[]{
+    1,
+    2
+  ,};
+}
         </source>
 
         <p id="Example2-config">To configure check to always validate trailing comma:</p>
@@ -161,37 +160,39 @@ int[] a2 = new int[]{
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-int[] numbers = {1, 2, 3}; // violation
-boolean[] bools = {
-true,
-true,
-false // violation
-};
+public class Example2 {
+  int[] numbers = {1, 2, 3}; // violation
+  boolean[] bools = {
+    true,
+    true,
+    false // violation
+  };
 
-String[][] text = {{},{},}; // OK
+  String[][] text = {{},{},};
 
-double[][] decimals = {
-{0.5, 2.3, 1.1,}, // OK
-{1.7, 1.9, 0.6}, // violation
-{0.8, 7.4, 6.5} // violation
-}; // violation, previous line misses a comma
+  double[][] decimals = {
+    {0.5, 2.3, 1.1,},
+    {1.7, 1.9, 0.6}, // violation
+    {0.8, 7.4, 6.5,} // violation
+  };
 
-char[] chars = {'a', 'b', 'c'  // violation
+  char[] chars = {'a', 'b', 'c'  // violation
   };
 
-String[] letters = {
-  &quot;a&quot;, &quot;b&quot;, &quot;c&quot;}; // violation
+  String[] letters = {
+    &quot;a&quot;, &quot;b&quot;, &quot;c&quot;}; // violation
 
-int[] a1 = new int[]{
-  1,
-  2
-  ,
-}; // OK
+  int[] a1 = new int[]{
+    1,
+    2
+    ,
+  };
 
-int[] a2 = new int[]{
-  1,
-  2
-  ,}; // OK
+  int[] a2 = new int[]{
+    1,
+    2
+    ,};
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/arraytrailingcomma.xml.template b/src/xdocs/checks/coding/arraytrailingcomma.xml.template
index 6bf9d28cc43..ddf2c2a2aee 100644
--- a/src/xdocs/checks/coding/arraytrailingcomma.xml.template
+++ b/src/xdocs/checks/coding/arraytrailingcomma.xml.template
@@ -79,25 +79,10 @@ return new int[] {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>alwaysDemandTrailingComma</td>
-              <td>
-                  Control whether to always check for a trailing comma, even when an array is
-                  inline.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.33</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+              value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -107,7 +92,7 @@ return new int[] {
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -115,20 +100,20 @@ return new int[] {
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
 
         <p id="Example2-config">To configure check to always validate trailing comma:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml b/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml
index 561bee7591e..d3b5c9933c0 100644
--- a/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml
+++ b/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml
@@ -45,35 +45,26 @@
           Which results in the following violations:
         </p>
         <source>
-class MyClass {
-    List&lt;Integer&gt; list1 = new ArrayList&lt;&gt;() { // violation
-        {
-            add(1);
-        }
-    };
-    List&lt;String&gt; list2 = new ArrayList&lt;&gt;() { // violation
+class Example1 {
+  List&lt;Integer&gt; list1 = new ArrayList&lt;&gt;() { // violation
+    {
+      add(1);
+    }
+  };
+  List&lt;String&gt; list2 = new ArrayList&lt;&gt;() { // violation
         ;
-        // comments and semicolons are ignored
-        {
-            add(&quot;foo&quot;);
-        }
-    };
-}
-        </source>
-        <p id="Example2-code">
-          Check only looks for double brace initialization and it ignores cases
-          where the anonymous class has fields or methods.
-          Though these might create the same memory issues as double brace,
-          the extra class members can produce side effects if changed incorrectly.
-        </p>
-        <source>
-class MyClass {
-    List&lt;Object&gt; list = new ArrayList&lt;&gt;() { // OK, not pure double brace pattern
-        private int field;
-        {
-            add(new Object());
-        }
-    };
+    // comments and semicolons are ignored
+    {
+      add(&quot;foo&quot;);
+    }
+  };
+  List&lt;Object&gt; list = new ArrayList&lt;&gt;() {
+    // OK, as it is not double brace pattern
+    private int field;
+    {
+      add(new Object());
+    }
+  };
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml.template b/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml.template
index 3645de8b5f7..57233698762 100644
--- a/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml.template
+++ b/src/xdocs/checks/coding/avoiddoublebraceinitialization.xml.template
@@ -36,7 +36,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -44,18 +44,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.txt"/>
-          <param name="type" value="code"/>
-        </macro>
-        <p id="Example2-code">
-          Check only looks for double brace initialization and it ignores cases
-          where the anonymous class has fields or methods.
-          Though these might create the same memory issues as double brace,
-          the extra class members can produce side effects if changed incorrectly.
-        </p>
-        <macro name="example">
-          <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoiddoublebraceinitialization/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml b/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml
index d172e13c744..39548865034 100644
--- a/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml
+++ b/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml
@@ -33,18 +33,22 @@
           Example of violations
         </p>
         <source>
-class MyClass extends SomeOtherClass {
-    MyClass() {
-        super(); // violation
-    }
+class SuperClass {
+  public SuperClass() {}
+  public SuperClass(int arg) {}
+}
+class Example1 extends SuperClass {
+  Example1() {
+    super(); // violation
+  }
 
-    MyClass(int arg) {
-        super(arg); // OK, call with argument have to be explicit
-    }
+  Example1(int arg) {
+    super(arg); // ok, explicit constructor invocation with argument
+  }
 
-    MyClass(long arg) {
-        // OK, call is implicit
-    }
+  Example1(long arg) {
+    // ok, no explicit constructor invocation
+  }
 }
         </source>
       </subsection>
@@ -58,12 +62,12 @@ class MyClass extends SomeOtherClass {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22super.constructor.call%22">
-              super.constructor.call</a>
+              super.constructor.call
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml.template b/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml.template
index 8ff1f16abd7..b9858966563 100644
--- a/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml.template
+++ b/src/xdocs/checks/coding/avoidnoargumentsuperconstructorcall.xml.template
@@ -24,7 +24,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -32,7 +32,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/avoidnoargumentsuperconstructorcall/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
@@ -46,14 +46,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22super.constructor.call%22">
-              super.constructor.call</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="AvoidNoArgumentSuperConstructorCall"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/coding/constructorsdeclarationgrouping.xml b/src/xdocs/checks/coding/constructorsdeclarationgrouping.xml
new file mode 100644
index 00000000000..8a975ee93d3
--- /dev/null
+++ b/src/xdocs/checks/coding/constructorsdeclarationgrouping.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <head>
+    <title>ConstructorsDeclarationGrouping</title>
+  </head>
+  <body>
+    <section name="ConstructorsDeclarationGrouping">
+      <p>Since Checkstyle 10.17.0</p>
+      <subsection name="Description" id="Description">
+        <p>
+          Checks that all constructors are grouped together.
+          If there is any non-constructor code separating constructors,
+          this check identifies and logs a violation for those ungrouped constructors.
+          The violation message will specify the line number
+          of the last grouped constructor.
+          Comments between constructors are allowed.
+        </p>
+        <p>
+        Rationale: Grouping constructors together in a class improves code readability
+        and maintainability. It allows developers to easily understand
+        the different ways an object can be instantiated
+        and the tasks performed by each constructor.
+        </p>
+      </subsection>
+
+      <subsection name="Examples" id="Examples">
+        <p id="Example1-config">To configure the check:</p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;ConstructorsDeclarationGrouping&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example1-code">Example of correct grouping of constructors:</p>
+        <source>
+public class Example1 {
+
+  int x;
+
+  Example1() {}
+
+  Example1(String s) {}
+
+  // comments between constructors are allowed.
+  Example1(int x) {}
+
+  Example1(String s, int x) {}
+
+  void foo() {}
+
+  private enum ExampleEnum {
+
+    ONE, TWO, THREE;
+
+    ExampleEnum() {}
+
+    ExampleEnum(int x) {}
+
+    ExampleEnum(String s) {}
+
+    int x = 10;
+
+    void foo() {}
+  }
+}
+        </source>
+        <p id="Example2-code">Example of incorrect grouping of constructors:</p>
+        <source>
+public class Example2 {
+
+  int x;
+
+  Example2() {}
+
+  Example2(String s){}
+
+  void foo() {}
+
+  Example2(int x) {} // violation
+
+  Example2(String s, int x) {} // violation
+
+  private enum ExampleEnum {
+
+    ONE, TWO, THREE;
+
+    ExampleEnum() {}
+
+    ExampleEnum(int x) {}
+
+    final int x = 10;
+
+    ExampleEnum(String str) {} // violation
+
+    void foo() {}
+  }
+
+  Example2(float f) {} // violation
+}
+        </source>
+      </subsection>
+
+      <subsection name="Example of Usage" id="Example_of_Usage">
+        <ul>
+          <li>
+            <a href="https://github.com/search?q=path%3Aconfig%20path%3A**%2Fcheckstyle-checks.xml+repo%3Acheckstyle%2Fcheckstyle+ConstructorsDeclarationGrouping">
+            Checkstyle Style</a>
+          </li>
+        </ul>
+      </subsection>
+
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <ul>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22constructors.declaration.grouping%22">
+              constructors.declaration.grouping
+            </a>
+          </li>
+        </ul>
+        <p>
+          All messages can be customized if the default message doesn't suit you.
+          Please <a href="../../config.html#Custom_messages">see the documentation</a>
+          to learn how to.
+        </p>
+      </subsection>
+
+      <subsection name="Package" id="Package">
+        <p>
+          com.puppycrawl.tools.checkstyle.checks.coding
+        </p>
+      </subsection>
+
+      <subsection name="Parent Module" id="Parent_Module">
+        <p>
+          <a href="../../config.html#TreeWalker">TreeWalker</a>
+        </p>
+      </subsection>
+    </section>
+  </body>
+</document>
diff --git a/src/xdocs/checks/coding/constructorsdeclarationgrouping.xml.template b/src/xdocs/checks/coding/constructorsdeclarationgrouping.xml.template
new file mode 100644
index 00000000000..835f7136824
--- /dev/null
+++ b/src/xdocs/checks/coding/constructorsdeclarationgrouping.xml.template
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <head>
+    <title>ConstructorsDeclarationGrouping</title>
+  </head>
+  <body>
+    <section name="ConstructorsDeclarationGrouping">
+      <p>Since Checkstyle 10.17.0</p>
+      <subsection name="Description" id="Description">
+        <p>
+          Checks that all constructors are grouped together.
+          If there is any non-constructor code separating constructors,
+          this check identifies and logs a violation for those ungrouped constructors.
+          The violation message will specify the line number
+          of the last grouped constructor.
+          Comments between constructors are allowed.
+        </p>
+        <p>
+        Rationale: Grouping constructors together in a class improves code readability
+        and maintainability. It allows developers to easily understand
+        the different ways an object can be instantiated
+        and the tasks performed by each constructor.
+        </p>
+      </subsection>
+
+      <subsection name="Examples" id="Examples">
+        <p id="Example1-config">To configure the check:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example of correct grouping of constructors:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example1.java"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-code">Example of incorrect grouping of constructors:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/constructorsdeclarationgrouping/Example2.java"/>
+          <param name="type" value="code"/>
+        </macro>
+      </subsection>
+
+      <subsection name="Example of Usage" id="Example_of_Usage">
+        <ul>
+          <li>
+            <a href="https://github.com/search?q=path%3Aconfig%20path%3A**%2Fcheckstyle-checks.xml+repo%3Acheckstyle%2Fcheckstyle+ConstructorsDeclarationGrouping">
+            Checkstyle Style</a>
+          </li>
+        </ul>
+      </subsection>
+
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="ConstructorsDeclarationGrouping"/>
+        </macro>
+        <p>
+          All messages can be customized if the default message doesn't suit you.
+          Please <a href="../../config.html#Custom_messages">see the documentation</a>
+          to learn how to.
+        </p>
+      </subsection>
+
+      <subsection name="Package" id="Package">
+        <p>
+          com.puppycrawl.tools.checkstyle.checks.coding
+        </p>
+      </subsection>
+
+      <subsection name="Parent Module" id="Parent_Module">
+        <macro name="parent-module">
+          <param name="moduleName" value="ConstructorsDeclarationGrouping"/>
+        </macro>
+      </subsection>
+    </section>
+  </body>
+</document>
diff --git a/src/xdocs/checks/coding/declarationorder.xml b/src/xdocs/checks/coding/declarationorder.xml
index b5af45646ad..505e96ee412 100644
--- a/src/xdocs/checks/coding/declarationorder.xml
+++ b/src/xdocs/checks/coding/declarationorder.xml
@@ -71,14 +71,14 @@ public class A {
             </tr>
             <tr>
               <td>ignoreConstructors</td>
-              <td>control whether to ignore constructors.</td>
+              <td>Control whether to ignore constructors.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.2</td>
             </tr>
             <tr>
               <td>ignoreModifiers</td>
-              <td>control whether to ignore modifiers (fields, ...).</td>
+              <td>Control whether to ignore modifiers (fields, ...).</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.2</td>
diff --git a/src/xdocs/checks/coding/declarationorder.xml.template b/src/xdocs/checks/coding/declarationorder.xml.template
index 84bbdc91dc7..3e1e3219410 100644
--- a/src/xdocs/checks/coding/declarationorder.xml.template
+++ b/src/xdocs/checks/coding/declarationorder.xml.template
@@ -61,29 +61,10 @@ public class A {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>ignoreConstructors</td>
-              <td>control whether to ignore constructors.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.2</td>
-            </tr>
-            <tr>
-              <td>ignoreModifiers</td>
-              <td>control whether to ignore modifiers (fields, ...).</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+              value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/defaultcomeslast.xml b/src/xdocs/checks/coding/defaultcomeslast.xml
index ac1815394c8..16927e003e0 100644
--- a/src/xdocs/checks/coding/defaultcomeslast.xml
+++ b/src/xdocs/checks/coding/defaultcomeslast.xml
@@ -32,10 +32,7 @@
             </tr>
             <tr>
               <td>skipIfLastAndSharedWithCase</td>
-              <td>
-                Control whether to allow <code>default</code> along with
-                <code>case</code> if they are not last.
-              </td>
+              <td>Control whether to allow <code>default</code> along with <code>case</code> if they are not last.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>7.7</td>
diff --git a/src/xdocs/checks/coding/defaultcomeslast.xml.template b/src/xdocs/checks/coding/defaultcomeslast.xml.template
index 3efc45e2b81..778841510af 100644
--- a/src/xdocs/checks/coding/defaultcomeslast.xml.template
+++ b/src/xdocs/checks/coding/defaultcomeslast.xml.template
@@ -22,25 +22,10 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>skipIfLastAndSharedWithCase</td>
-              <td>
-                Control whether to allow <code>default</code> along with
-                <code>case</code> if they are not last.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>7.7</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+              value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
diff --git a/src/xdocs/checks/coding/emptystatement.xml b/src/xdocs/checks/coding/emptystatement.xml
index b53f7adbb7d..7fbb04a642f 100644
--- a/src/xdocs/checks/coding/emptystatement.xml
+++ b/src/xdocs/checks/coding/emptystatement.xml
@@ -30,14 +30,16 @@
             Example:
         </p>
         <source>
-public void foo() {
-  int i = 5;
-  if (i &gt; 3); // violation, &quot;;&quot; right after if statement
+public class Example1 {
+  public void foo() {
+    int i = 5;
+    if(i &gt; 3); // violation
     i++;
-  for (i = 0; i &lt; 5; i++); // violation
-    i++;
-  while (i &gt; 10) // OK
+    for (i = 0; i &lt; 5; i++); // violation
     i++;
+    while (i &gt; 10)
+      i++;
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/coding/emptystatement.xml.template b/src/xdocs/checks/coding/emptystatement.xml.template
index 7024ee734f8..4d178f9b795 100644
--- a/src/xdocs/checks/coding/emptystatement.xml.template
+++ b/src/xdocs/checks/coding/emptystatement.xml.template
@@ -21,7 +21,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -29,7 +29,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/emptystatement/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/equalsavoidnull.xml b/src/xdocs/checks/coding/equalsavoidnull.xml
index f9e58162cba..c810f873a2b 100644
--- a/src/xdocs/checks/coding/equalsavoidnull.xml
+++ b/src/xdocs/checks/coding/equalsavoidnull.xml
@@ -38,9 +38,7 @@
             </tr>
             <tr>
               <td>ignoreEqualsIgnoreCase</td>
-              <td>
-                Control whether to ignore <code>String.equalsIgnoreCase(String)</code> invocations.
-              </td>
+              <td>Control whether to ignore <code>String.equalsIgnoreCase(String)</code> invocations.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.4</td>
diff --git a/src/xdocs/checks/coding/equalsavoidnull.xml.template b/src/xdocs/checks/coding/equalsavoidnull.xml.template
index d22c2907359..e104648e55d 100644
--- a/src/xdocs/checks/coding/equalsavoidnull.xml.template
+++ b/src/xdocs/checks/coding/equalsavoidnull.xml.template
@@ -28,24 +28,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>ignoreEqualsIgnoreCase</td>
-              <td>
-                Control whether to ignore <code>String.equalsIgnoreCase(String)</code> invocations.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+              value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/equalshashcode.xml b/src/xdocs/checks/coding/equalshashcode.xml
index c95cb0ae84a..700f029efc9 100644
--- a/src/xdocs/checks/coding/equalshashcode.xml
+++ b/src/xdocs/checks/coding/equalshashcode.xml
@@ -40,56 +40,47 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-public static class Example1 {
-    public int hashCode() {
-        // code
-    }
-    public boolean equals(String o) { // violation, overloaded implementation of 'equals'
-        // code
-    }
+class Example1 {
+  public int hashCode() { // violation, no valid 'equals'
+    return 0;
+  }
+  public boolean equals(String o) { return false; }
 }
-public static class Example2 {
-    public boolean equals(Object o) { // violation, no 'hashCode'
-        // code
-    }
-    public boolean equals(String o) {
-        // code
-    }
+
+class ExampleNoHashCode {
+  public boolean equals(Object o) { // violation, no 'hashCode'
+    return false;
+  }
+  public boolean equals(String o) { return false; }
 }
-public static class Example3 {
-    public int hashCode() {
-        // code
-    }
-    public boolean equals(Object o) { // OK
-        // code
-    }
-    public boolean equals(String o) {
-        // code
-    }
+
+class ExampleBothMethods1 {
+  public int hashCode() { return 0; }
+  public boolean equals(Object o) { // ok, both methods exist
+    return false;
+  }
+  public boolean equals(String o) { return false; }
 }
-public static class Example4 {
-    public int hashCode() {
-        // code
-    }
-    public boolean equals(java.lang.Object o) { // OK
-        // code
-   }
+
+class ExampleBothMethods2 {
+  public int hashCode() { return 0; }
+  public boolean equals(java.lang.Object o) { // ok, both methods exist
+    return false;
+  }
 }
-public static class Example5 {
-    public static int hashCode(int i) {
-        // code
-    }
-    public boolean equals(Object o) { // violation, overloaded implementation of 'hashCode'
-        // code
-    }
+
+class ExampleNoValidHashCode {
+  public static int hashCode(int i) { return 0; }
+  public boolean equals(Object o) { // violation, no valid 'hashCode'
+    return false;
+  }
 }
-public static class Example6 {
-    public int hashCode() { // violation, overloaded implementation of 'equals'
-        // code
-    }
-    public static boolean equals(Object o, Object o2) {
-        // code
-    }
+
+class ExampleNoValidEquals {
+  public int hashCode() { // violation, no valid 'equals'
+    return 0;
+  }
+  public static boolean equals(Object o, Object o2) { return false; }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/coding/equalshashcode.xml.template b/src/xdocs/checks/coding/equalshashcode.xml.template
index b6ffaab875f..b8bb9d06c21 100644
--- a/src/xdocs/checks/coding/equalshashcode.xml.template
+++ b/src/xdocs/checks/coding/equalshashcode.xml.template
@@ -33,13 +33,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/equalshashcode/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/explicitinitialization.xml b/src/xdocs/checks/coding/explicitinitialization.xml
index 6975cc9b32f..feed91fdabd 100644
--- a/src/xdocs/checks/coding/explicitinitialization.xml
+++ b/src/xdocs/checks/coding/explicitinitialization.xml
@@ -36,8 +36,7 @@
             </tr>
             <tr>
               <td>onlyObjectReferences</td>
-              <td>control whether only explicit initializations made to
-                  null for objects should be checked.</td>
+              <td>Control whether only explicit initializations made to null for objects should be checked.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>7.8</td>
diff --git a/src/xdocs/checks/coding/explicitinitialization.xml.template b/src/xdocs/checks/coding/explicitinitialization.xml.template
index b82d14e14b0..5a2001f386f 100644
--- a/src/xdocs/checks/coding/explicitinitialization.xml.template
+++ b/src/xdocs/checks/coding/explicitinitialization.xml.template
@@ -26,23 +26,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>onlyObjectReferences</td>
-              <td>control whether only explicit initializations made to
-                  null for objects should be checked.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>7.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+              value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/fallthrough.xml b/src/xdocs/checks/coding/fallthrough.xml
index 9ce8047564b..8c5afd1a682 100644
--- a/src/xdocs/checks/coding/fallthrough.xml
+++ b/src/xdocs/checks/coding/fallthrough.xml
@@ -46,19 +46,14 @@
             </tr>
             <tr>
               <td>checkLastCaseGroup</td>
-              <td>
-                Control whether the last case group must be checked.
-              </td>
+              <td>Control whether the last case group must be checked.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>4.0</td>
             </tr>
             <tr>
               <td>reliefPattern</td>
-              <td>
-                Define the RegExp to match the relief comment that suppresses
-                the warning about a fall through.
-              </td>
+              <td>Define the RegExp to match the relief comment that suppresses the warning about a fall through.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;falls?[ -]?thr(u|ough)&quot;</code></td>
               <td>4.0</td>
@@ -89,7 +84,7 @@ class Example1 {
       switch (i) {
         case 1:
           i++;
-        case 2: // violation 'Fall through from previous branch of the switch'
+        case 2: // violation 'Fall\ through from previous branch of the switch'
           i++;
           break;
         case 3:
@@ -100,7 +95,7 @@ class Example1 {
           throw new Exception();
         case 5:
           i++; // no break by design
-        case 6: // violation 'Fall through from previous branch of the switch'
+        case 6: // violation 'Fall\ through from previous branch of the switch'
         case 7:
           i++;
           continue;
@@ -134,7 +129,7 @@ class Example2 {
       switch (i) {
         case 1:
           i++;
-        case 2: // violation 'Fall through from previous branch of the switch'
+        case 2: // violation 'Fall\ through from previous branch of the switch'
           i++;
           break;
         case 3:
@@ -145,11 +140,11 @@ class Example2 {
           throw new Exception();
         case 5:
           i++; // no break by design
-        case 6: // violation 'Fall through from previous branch of the switch'
+        case 6: // violation 'Fall\ through from previous branch of the switch'
         case 7:
           i++;
           continue;
-        case 11: // violation 'Fall through from the last branch of the switch'
+        case 11: // violation 'Fall\ through from the last branch of the switch'
           i++;
       }
     }
@@ -177,7 +172,7 @@ class Example3 {
       switch (i) {
         case 1:
           i++;
-        case 2: // violation 'Fall through from previous branch of the switch'
+        case 2: // violation 'Fall\ through from previous branch of the switch'
           i++;
           break;
         case 3:
diff --git a/src/xdocs/checks/coding/fallthrough.xml.template b/src/xdocs/checks/coding/fallthrough.xml.template
index 21a92bd0007..a2bfc88d8fa 100644
--- a/src/xdocs/checks/coding/fallthrough.xml.template
+++ b/src/xdocs/checks/coding/fallthrough.xml.template
@@ -36,34 +36,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>checkLastCaseGroup</td>
-              <td>
-                Control whether the last case group must be checked.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>reliefPattern</td>
-              <td>
-                Define the RegExp to match the relief comment that suppresses
-                the warning about a fall through.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"falls?[ -]?thr(u|ough)"</code></td>
-              <td>4.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+              value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/finallocalvariable.xml b/src/xdocs/checks/coding/finallocalvariable.xml
index 2f96ad35f3a..be72bef5880 100644
--- a/src/xdocs/checks/coding/finallocalvariable.xml
+++ b/src/xdocs/checks/coding/finallocalvariable.xml
@@ -26,7 +26,7 @@
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
           <table>
-            <tr class="header">
+            <tr>
               <th>name</th>
               <th>description</th>
               <th>type</th>
@@ -35,33 +35,25 @@
             </tr>
             <tr>
               <td>validateEnhancedForLoopVariable</td>
-              <td>
-                Control whether to check
-                <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
-                enhanced for-loop</a> variable.
-              </td>
-              <td>
-                <a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td>
-                <code>false</code>
-              </td>
+              <td>Control whether to check <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
+ enhanced for-loop</a> variable.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
               <td>6.5</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                PARAMETER_DEF</a>
-                .
+                    PARAMETER_DEF</a>
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                   .
               </td>
               <td>3.2</td>
diff --git a/src/xdocs/checks/coding/finallocalvariable.xml.template b/src/xdocs/checks/coding/finallocalvariable.xml.template
index 4fc6691ee47..1eef2981f20 100644
--- a/src/xdocs/checks/coding/finallocalvariable.xml.template
+++ b/src/xdocs/checks/coding/finallocalvariable.xml.template
@@ -25,48 +25,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr class="header">
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>validateEnhancedForLoopVariable</td>
-              <td>
-                Control whether to check
-                <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
-                enhanced for-loop</a> variable.
-              </td>
-              <td>
-                <a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td>
-                <code>false</code>
-              </td>
-              <td>6.5</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                PARAMETER_DEF</a>
-                .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                  .
-              </td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java"/>
+         </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/hiddenfield.xml b/src/xdocs/checks/coding/hiddenfield.xml
index 9e93d168bf9..bcd92df6c74 100644
--- a/src/xdocs/checks/coding/hiddenfield.xml
+++ b/src/xdocs/checks/coding/hiddenfield.xml
@@ -62,13 +62,12 @@ class PageBuilder {
               <th>since</th>
             </tr>
             <tr>
-              <td>ignoreFormat</td>
-              <td>Define the RegExp for names of variables and parameters to ignore.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
+              <td>ignoreAbstractMethods</td>
+              <td>Control whether to ignore parameters of abstract methods.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>4.0</td>
             </tr>
-
             <tr>
               <td>ignoreConstructorParameter</td>
               <td>Control whether to ignore constructor parameters.</td>
@@ -76,65 +75,54 @@ class PageBuilder {
               <td><code>false</code></td>
               <td>3.2</td>
             </tr>
-
+            <tr>
+              <td>ignoreFormat</td>
+              <td>Define the RegExp for names of variables and parameters to ignore.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>null</code></td>
+              <td>3.2</td>
+            </tr>
             <tr>
               <td>ignoreSetter</td>
-              <td>
-                Allow to ignore the parameter of a property setter method.
-              </td>
+              <td>Allow to ignore the parameter of a property setter method.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>3.2</td>
             </tr>
-
             <tr>
               <td>setterCanReturnItsClass</td>
-              <td>
-                Allow to expand the definition of a setter method
-                to include methods that return the class' instance.
-              </td>
+              <td>Allow to expand the definition of a setter method to include methods that return the class' instance.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>6.3</td>
             </tr>
-
-            <tr>
-              <td>ignoreAbstractMethods</td>
-              <td>Control whether to ignore parameters of abstract methods.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
+                    PARAMETER_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
+                    PATTERN_VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
+                    LAMBDA</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
+                    RECORD_COMPONENT_DEF</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
+                    PARAMETER_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
+                    PATTERN_VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
+                    LAMBDA</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
+                    RECORD_COMPONENT_DEF</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/coding/hiddenfield.xml.template b/src/xdocs/checks/coding/hiddenfield.xml.template
index f8b8fa36d44..ab67ef33ff2 100644
--- a/src/xdocs/checks/coding/hiddenfield.xml.template
+++ b/src/xdocs/checks/coding/hiddenfield.xml.template
@@ -53,93 +53,10 @@ class PageBuilder {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>ignoreFormat</td>
-              <td>Define the RegExp for names of variables and parameters to ignore.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
-
-            <tr>
-              <td>ignoreConstructorParameter</td>
-              <td>Control whether to ignore constructor parameters.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.2</td>
-            </tr>
-
-            <tr>
-              <td>ignoreSetter</td>
-              <td>
-                Allow to ignore the parameter of a property setter method.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.2</td>
-            </tr>
-
-            <tr>
-              <td>setterCanReturnItsClass</td>
-              <td>
-                Allow to expand the definition of a setter method
-                to include methods that return the class' instance.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.3</td>
-            </tr>
-
-            <tr>
-              <td>ignoreAbstractMethods</td>
-              <td>Control whether to ignore parameters of abstract methods.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/illegalcatch.xml b/src/xdocs/checks/coding/illegalcatch.xml
index 196318f3bb9..74e71d6fdb1 100644
--- a/src/xdocs/checks/coding/illegalcatch.xml
+++ b/src/xdocs/checks/coding/illegalcatch.xml
@@ -38,8 +38,7 @@
               <td>illegalClassNames</td>
               <td>Specify exception class names to reject.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Error, Exception, RuntimeException, Throwable, java.lang.Error,
-                java.lang.Exception, java.lang.RuntimeException, java.lang.Throwable</code></td>
+              <td><code>Error, Exception, RuntimeException, Throwable, java.lang.Error, java.lang.Exception, java.lang.RuntimeException, java.lang.Throwable</code></td>
               <td>3.2</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/coding/illegalcatch.xml.template b/src/xdocs/checks/coding/illegalcatch.xml.template
index 62e3f7ea0b4..26425a79816 100644
--- a/src/xdocs/checks/coding/illegalcatch.xml.template
+++ b/src/xdocs/checks/coding/illegalcatch.xml.template
@@ -26,23 +26,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>illegalClassNames</td>
-              <td>Specify exception class names to reject.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Error, Exception, RuntimeException, Throwable, java.lang.Error,
-                java.lang.Exception, java.lang.RuntimeException, java.lang.Throwable</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/illegalinstantiation.xml.template b/src/xdocs/checks/coding/illegalinstantiation.xml.template
index fb729130430..9744ba8026b 100644
--- a/src/xdocs/checks/coding/illegalinstantiation.xml.template
+++ b/src/xdocs/checks/coding/illegalinstantiation.xml.template
@@ -44,22 +44,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>classes</td>
-              <td>Specify fully qualified class names that should not be instantiated.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/illegalthrows.xml b/src/xdocs/checks/coding/illegalthrows.xml
index ea68b1abca6..564c9adff68 100644
--- a/src/xdocs/checks/coding/illegalthrows.xml
+++ b/src/xdocs/checks/coding/illegalthrows.xml
@@ -27,13 +27,11 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>illegalClassNames</td>
-              <td>Specify throw class names to reject.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Error, RuntimeException, Throwable, java.lang.Error,
-                java.lang.RuntimeException, java.lang.Throwable</code>
-              </td>
-              <td>4.0</td>
+              <td>ignoreOverriddenMethods</td>
+              <td>Allow to ignore checking overridden methods (marked with <code>Override</code> or <code>java.lang.Override</code> annotation).</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>6.4</td>
             </tr>
             <tr>
               <td>ignoredMethodNames</td>
@@ -43,14 +41,11 @@
               <td>5.4</td>
             </tr>
             <tr>
-              <td>ignoreOverriddenMethods</td>
-              <td>
-                allow to ignore checking overridden methods (marked with <code>Override</code>
-                or <code>java.lang.Override</code> annotation).
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.4</td>
+              <td>illegalClassNames</td>
+              <td>Specify throw class names to reject.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>Error, RuntimeException, Throwable, java.lang.Error, java.lang.RuntimeException, java.lang.Throwable</code></td>
+              <td>4.0</td>
             </tr>
           </table>
         </div>
diff --git a/src/xdocs/checks/coding/illegalthrows.xml.template b/src/xdocs/checks/coding/illegalthrows.xml.template
index 3f6fb1339c6..bf629893724 100644
--- a/src/xdocs/checks/coding/illegalthrows.xml.template
+++ b/src/xdocs/checks/coding/illegalthrows.xml.template
@@ -18,41 +18,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>illegalClassNames</td>
-              <td>Specify throw class names to reject.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Error, RuntimeException, Throwable, java.lang.Error,
-                java.lang.RuntimeException, java.lang.Throwable</code>
-              </td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>ignoredMethodNames</td>
-              <td>Specify names of methods to ignore.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>finalize</code></td>
-              <td>5.4</td>
-            </tr>
-            <tr>
-              <td>ignoreOverriddenMethods</td>
-              <td>
-                allow to ignore checking overridden methods (marked with <code>Override</code>
-                or <code>java.lang.Override</code> annotation).
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/illegaltoken.xml b/src/xdocs/checks/coding/illegaltoken.xml
index 4784d9720fc..4a233166abd 100644
--- a/src/xdocs/checks/coding/illegaltoken.xml
+++ b/src/xdocs/checks/coding/illegaltoken.xml
@@ -39,7 +39,8 @@
                     tokens</a>
               </td>
               <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LABELED_STAT">LABELED_STAT</a>
+                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LABELED_STAT">
+                    LABELED_STAT</a>
                   .
               </td>
               <td>3.2</td>
diff --git a/src/xdocs/checks/coding/illegaltoken.xml.template b/src/xdocs/checks/coding/illegaltoken.xml.template
index bfb40211443..b2d749296e3 100644
--- a/src/xdocs/checks/coding/illegaltoken.xml.template
+++ b/src/xdocs/checks/coding/illegaltoken.xml.template
@@ -23,28 +23,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>set of any supported
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">
-                    tokens</a>
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LABELED_STAT">LABELED_STAT</a>
-                  .
-              </td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheck.java"/>
+         </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/illegaltokentext.xml b/src/xdocs/checks/coding/illegaltokentext.xml
index 9d7a208eb44..b861b5d6a64 100644
--- a/src/xdocs/checks/coding/illegaltokentext.xml
+++ b/src/xdocs/checks/coding/illegaltokentext.xml
@@ -41,8 +41,7 @@
             </tr>
             <tr>
               <td>message</td>
-              <td>Define the message which is used to notify about violations;
-              if empty then the default message is used.</td>
+              <td>Define the message which is used to notify about violations; if empty then the default message is used.</td>
               <td><a href="../../property_types.html#String">String</a></td>
               <td><code>&quot;&quot;</code></td>
               <td>3.2</td>
@@ -52,24 +51,26 @@
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                NUM_DOUBLE</a>
+                    NUM_DOUBLE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                NUM_FLOAT</a>
+                    NUM_FLOAT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                NUM_INT</a>
+                    NUM_INT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                NUM_LONG</a>
+                    NUM_LONG</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IDENT">
-                IDENT</a>
+                    IDENT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMENT_CONTENT">
-                COMMENT_CONTENT</a>
+                    COMMENT_CONTENT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STRING_LITERAL">
-                STRING_LITERAL</a>
+                    STRING_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CHAR_LITERAL">
-                CHAR_LITERAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_CONTENT">
-                TEXT_BLOCK_CONTENT</a>
-                .
+                    CHAR_LITERAL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_CONTENT">
+                    TEXT_BLOCK_CONTENT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STRING_TEMPLATE_CONTENT">
+                    STRING_TEMPLATE_CONTENT</a>
+                  .
               </td>
               <td><code>empty</code></td>
               <td>3.2</td>
@@ -95,9 +96,11 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-public void myTest() {
-    String test = &quot;a href&quot;; // violation
+public class Example1 {
+  public void myTest() {
+    String test  = &quot;a href&quot;; // violation
     String test2 = &quot;A href&quot;; // OK, case is sensitive
+  }
 }
         </source>
         <p id="Example2-config">
@@ -117,14 +120,16 @@ public void myTest() {
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-public void myTest() {
-    String test = &quot;a href&quot;; // violation
-    String test2 = &quot;A href&quot;; // violation, case is ignored
+public class Example2 {
+  public void myTest() {
+    String test  = &quot;a href&quot;; // violation
+    String test2 = &quot;A href&quot;; // violation
+  }
 }
         </source>
         <p id="Example3-config">
           To configure the check to forbid string literal text blocks containing
-          <code>&quot;&quot;&quot;</code>:
+          <code>&quot;</code>:
         </p>
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
@@ -138,9 +143,11 @@ public void myTest() {
         </source>
         <p id="Example3-code">Example:</p>
         <source>
-public void myTest() {
+public class Example3 {
+  public void myTest() {
     final String quote = &quot;&quot;&quot;
-               \&quot;&quot;&quot;&quot;; // violation
+            \&quot;&quot;&quot;&quot;; // violation above
+  }
 }
         </source>
         <p id="Example4-config">
@@ -160,13 +167,15 @@ public void myTest() {
         </source>
         <p id="Example4-code">Example:</p>
         <source>
-public void myTest() {
+public class Example4 {
+  public void myTest() {
     int test1 = 0; // OK
     int test2 = 0x111; // OK
     int test3 = 0X111; // OK, case is ignored
     int test4 = 010; // violation
     long test5 = 0L; // OK
     long test6 = 010L; // violation
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/coding/illegaltokentext.xml.template b/src/xdocs/checks/coding/illegaltokentext.xml.template
index 141ba33409c..9903ed31cc5 100644
--- a/src/xdocs/checks/coding/illegaltokentext.xml.template
+++ b/src/xdocs/checks/coding/illegaltokentext.xml.template
@@ -17,64 +17,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Define the RegExp for illegal pattern.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^$"</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>ignoreCase</td>
-              <td>Control whether to ignore case when matching.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Define the message which is used to notify about violations;
-              if empty then the default message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>""</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                NUM_DOUBLE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                NUM_FLOAT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                NUM_INT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                NUM_LONG</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IDENT">
-                IDENT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMENT_CONTENT">
-                COMMENT_CONTENT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STRING_LITERAL">
-                STRING_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CHAR_LITERAL">
-                CHAR_LITERAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_CONTENT">
-                TEXT_BLOCK_CONTENT</a>
-                .
-              </td>
-              <td><code>empty</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java"/>
+         </macro>
         </div>
       </subsection>
 
@@ -85,13 +31,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -100,28 +46,28 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
           To configure the check to forbid string literal text blocks containing
-          <code>"""</code>:
+          <code>"</code>:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example4-config">
@@ -130,13 +76,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example4-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltokentext/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/illegaltype.xml b/src/xdocs/checks/coding/illegaltype.xml
index 7cfd0a982f1..a840b3c34a3 100644
--- a/src/xdocs/checks/coding/illegaltype.xml
+++ b/src/xdocs/checks/coding/illegaltype.xml
@@ -33,30 +33,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>validateAbstractClassNames</td>
-              <td>Control whether to validate abstract class names.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.10</td>
-            </tr>
-            <tr>
-              <td>illegalClassNames</td>
-              <td>Specify classes that should not be used as types in variable
-              declarations, return values or parameters.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet,
-                java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap,
-                java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>legalAbstractClassNames</td>
-              <td>Define abstract classes that may be used as types. </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>4.2</td>
-            </tr>
             <tr>
               <td>ignoredMethodNames</td>
               <td>Specify methods that should not be checked.</td>
@@ -71,72 +47,85 @@
               <td><code>&quot;^(.*[.])?Abstract.*$&quot;</code></td>
               <td>3.2</td>
             </tr>
+            <tr>
+              <td>illegalClassNames</td>
+              <td>Specify classes that should not be used as types in variable declarations, return values or parameters.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet, java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet</code></td>
+              <td>3.2</td>
+            </tr>
+            <tr>
+              <td>legalAbstractClassNames</td>
+              <td>Define abstract classes that may be used as types.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>{}</code></td>
+              <td>4.2</td>
+            </tr>
             <tr>
               <td>memberModifiers</td>
-              <td>
-                Control whether to check only methods and fields with any of the specified
-                modifiers.
-                This property does not affect method calls nor method references nor
-                record components.
-              </td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
+              <td>Control whether to check only methods and fields with any of the specified modifiers. This property does not affect method calls nor method references nor record components.</td>
+              <td>subset of tokens <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a></td>
               <td><code>{}</code></td>
               <td>6.3</td>
             </tr>
+            <tr>
+              <td>validateAbstractClassNames</td>
+              <td>Control whether to validate abstract class names.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>6.10</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
+                    METHOD_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
+                    METHOD_REF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
+                    PARAMETER_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
+                    PATTERN_VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
+                    RECORD_COMPONENT_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
+                    METHOD_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
+                    METHOD_REF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
+                    PARAMETER_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
+                    PATTERN_VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
+                    RECORD_COMPONENT_DEF</a>
                   .
               </td>
               <td>3.2</td>
diff --git a/src/xdocs/checks/coding/illegaltype.xml.template b/src/xdocs/checks/coding/illegaltype.xml.template
index 7c1ced7771f..c76b6761f98 100644
--- a/src/xdocs/checks/coding/illegaltype.xml.template
+++ b/src/xdocs/checks/coding/illegaltype.xml.template
@@ -25,123 +25,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>validateAbstractClassNames</td>
-              <td>Control whether to validate abstract class names.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.10</td>
-            </tr>
-            <tr>
-              <td>illegalClassNames</td>
-              <td>Specify classes that should not be used as types in variable
-              declarations, return values or parameters.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>HashMap, HashSet, LinkedHashMap, LinkedHashSet, TreeMap, TreeSet,
-                java.util.HashMap, java.util.HashSet, java.util.LinkedHashMap,
-                java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>legalAbstractClassNames</td>
-              <td>Define abstract classes that may be used as types. </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>4.2</td>
-            </tr>
-            <tr>
-              <td>ignoredMethodNames</td>
-              <td>Specify methods that should not be checked.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>getEnvironment, getInitialContext</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>illegalAbstractClassNameFormat</td>
-              <td>Specify RegExp for illegal abstract class names.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^(.*[.])?Abstract.*$"</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>memberModifiers</td>
-              <td>
-                Control whether to check only methods and fields with any of the specified
-                modifiers.
-                This property does not affect method calls nor method references nor
-                record components.
-              </td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
-              <td><code>{}</code></td>
-              <td>6.3</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
-                  .
-              </td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+             <param name="modulePath"
+                    value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/index.xml b/src/xdocs/checks/coding/index.xml
index 612dee1c918..625f97e9d3f 100644
--- a/src/xdocs/checks/coding/index.xml
+++ b/src/xdocs/checks/coding/index.xml
@@ -49,6 +49,16 @@
               Checks if call to superclass constructor without arguments is present.
             </td>
           </tr>
+          <tr>
+            <td>
+              <a href="constructorsdeclarationgrouping.html#ConstructorsDeclarationGrouping">
+                ConstructorsDeclarationGrouping
+              </a>
+            </td>
+            <td>
+              Checks that all constructors are grouped together.
+            </td>
+          </tr>
           <tr>
             <td>
               <a href="covariantequals.html#CovariantEquals">
diff --git a/src/xdocs/checks/coding/innerassignment.xml b/src/xdocs/checks/coding/innerassignment.xml
index 9ab3dcf660c..2e8343bcd71 100644
--- a/src/xdocs/checks/coding/innerassignment.xml
+++ b/src/xdocs/checks/coding/innerassignment.xml
@@ -57,18 +57,17 @@ while ((line = bufferedReader.readLine()) != null); // OK
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example1-code">Example:</p>
+        <p id="Example1-code">Example 1:</p>
         <source>
-class MyClass {
-
-  void foo() {
+public class Example1 {
+  void foo() throws IOException {
     int a, b;
-    a = b = 5; // violation, assignment to each variable should be in a separate statement
+    a = b = 5; // violation
     a = b += 5; // violation
 
-    a = 5; // OK
-    b = 5; // OK
-    a = 5; b = 5; // OK
+    a = 5;
+    b = 5;
+    a = 5; b = 5;
 
     double myDouble;
     double[] doubleArray = new double[] {myDouble = 4.5, 15.5}; // violation
@@ -77,20 +76,20 @@ class MyClass {
     List&lt;String&gt; myList = new ArrayList&lt;String&gt;();
     myList.add(nameOne = &quot;tom&quot;); // violation
 
-    for (int k = 0; k &lt; 10; k = k + 2) { // OK
-      // some code
+    for (int k = 0; k &lt; 10; k = k + 2) {
+        // some code
     }
 
     boolean someVal;
     if (someVal = true) { // violation
-      // some code
+        // some code
     }
 
     while (someVal = false) {} // violation
 
     InputStream is = new FileInputStream(&quot;textFile.txt&quot;);
     while ((b = is.read()) != -1) { // OK, this is a common idiom
-      // some code
+        // some code
     }
   }
 
@@ -98,6 +97,42 @@ class MyClass {
     boolean val;
     return val = true; // violation
   }
+}
+        </source>
+        <p id="Example2-code">Example 2:</p>
+        <source>
+public class Example2 {
+  public void test1(int mode) {
+    int x = 0;
+    x = switch (mode) {
+      case 1 -&gt; x = 1;  // violation
+      case 2 -&gt; {
+        yield x = 2; // violation
+      }
+      default -&gt; x = 0; // violation
+    };
+  }
+  public void test2(int mode) {
+    int x = 0;
+    switch(mode) {
+      case 2 -&gt; {
+        x = 2;
+      }
+      case 1 -&gt; x = 1;
+    }
+  }
+  public void test3(int mode) {
+    int x = 0, y = 0;
+    switch(mode) {
+      case 1:
+      case 2: {
+        x = y = 2; // violation
+      }
+      case 4:
+      case 5:
+        x = 1;
+    }
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/coding/innerassignment.xml.template b/src/xdocs/checks/coding/innerassignment.xml.template
index 4e6e5a14e3b..3c55d84e3e6 100644
--- a/src/xdocs/checks/coding/innerassignment.xml.template
+++ b/src/xdocs/checks/coding/innerassignment.xml.template
@@ -52,13 +52,19 @@ while ((line = bufferedReader.readLine()) != null); // OK
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example1-code">Example:</p>
+        <p id="Example1-code">Example 1:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example1.java"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-code">Example 2:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/magicnumber.xml b/src/xdocs/checks/coding/magicnumber.xml
index 934d3346916..b4142e4b17f 100644
--- a/src/xdocs/checks/coding/magicnumber.xml
+++ b/src/xdocs/checks/coding/magicnumber.xml
@@ -41,18 +41,38 @@ static final Integer ANSWER_TO_THE_ULTIMATE_QUESTION_OF_LIFE = new Integer(42);
               <th>since</th>
             </tr>
             <tr>
-              <td>ignoreNumbers</td>
-              <td>Specify non-magic numbers.</td>
-              <td><a href="../../property_types.html#double.5B.5D">double[]</a></td>
-              <td><code>-1, 0, 1, 2</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>ignoreHashCodeMethod</td>
-              <td>Ignore magic numbers in hashCode methods.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.3</td>
+              <td>constantWaiverParentToken</td>
+              <td>Specify tokens that are allowed in the AST path from the number literal to the enclosing constant definition.</td>
+              <td>subset of tokens <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a></td>
+              <td>
+                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
+                    ARRAY_INIT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
+                    ASSIGN</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
+                    DIV</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELIST">
+                    ELIST</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
+                    EXPR</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
+                    LITERAL_NEW</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
+                    METHOD_CALL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
+                    MINUS</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
+                    PLUS</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
+                    STAR</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
+                    TYPECAST</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
+                    UNARY_MINUS</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
+                    UNARY_PLUS</a>
+              </td>
+              <td>6.11</td>
             </tr>
             <tr>
               <td>ignoreAnnotation</td>
@@ -61,6 +81,13 @@ static final Integer ANSWER_TO_THE_ULTIMATE_QUESTION_OF_LIFE = new Integer(42);
               <td><code>false</code></td>
               <td>5.4</td>
             </tr>
+            <tr>
+              <td>ignoreAnnotationElementDefaults</td>
+              <td>Ignore magic numbers in annotation elements defaults.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>8.23</td>
+            </tr>
             <tr>
               <td>ignoreFieldDeclaration</td>
               <td>Ignore magic numbers in field declarations.</td>
@@ -69,73 +96,43 @@ static final Integer ANSWER_TO_THE_ULTIMATE_QUESTION_OF_LIFE = new Integer(42);
               <td>6.6</td>
             </tr>
             <tr>
-              <td>ignoreAnnotationElementDefaults</td>
-              <td>Ignore magic numbers in annotation elements defaults.</td>
+              <td>ignoreHashCodeMethod</td>
+              <td>Ignore magic numbers in hashCode methods.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.23</td>
+              <td><code>false</code></td>
+              <td>5.3</td>
             </tr>
             <tr>
-              <td>constantWaiverParentToken</td>
-              <td>Specify tokens that are allowed in the AST path from the number literal to the
-                  enclosing constant definition.</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                ARRAY_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                DIV</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELIST">
-                ELIST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                EXPR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                LITERAL_NEW</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                METHOD_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                STAR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                TYPECAST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                UNARY_MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                UNARY_PLUS</a>
-              </td>
-              <td>6.11</td>
+              <td>ignoreNumbers</td>
+              <td>Specify non-magic numbers.</td>
+              <td><a href="../../property_types.html#double.5B.5D">double[]</a></td>
+              <td><code>-1, 0, 1, 2</code></td>
+              <td>3.1</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                NUM_DOUBLE</a>
+                    NUM_DOUBLE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                NUM_FLOAT</a>
+                    NUM_FLOAT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                NUM_INT</a>
+                    NUM_INT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                NUM_LONG</a>
-                .
+                    NUM_LONG</a>
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                NUM_DOUBLE</a>
+                    NUM_DOUBLE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                NUM_FLOAT</a>
+                    NUM_FLOAT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                NUM_INT</a>
+                    NUM_INT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                NUM_LONG</a>
-                .
+                    NUM_LONG</a>
+                  .
               </td>
               <td>3.1</td>
             </tr>
diff --git a/src/xdocs/checks/coding/magicnumber.xml.template b/src/xdocs/checks/coding/magicnumber.xml.template
index 1fe76f68af5..aacffc2f881 100644
--- a/src/xdocs/checks/coding/magicnumber.xml.template
+++ b/src/xdocs/checks/coding/magicnumber.xml.template
@@ -32,114 +32,10 @@ static final Integer ANSWER_TO_THE_ULTIMATE_QUESTION_OF_LIFE = new Integer(42);
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>ignoreNumbers</td>
-              <td>Specify non-magic numbers.</td>
-              <td><a href="../../property_types.html#double.5B.5D">double[]</a></td>
-              <td><code>-1, 0, 1, 2</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>ignoreHashCodeMethod</td>
-              <td>Ignore magic numbers in hashCode methods.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.3</td>
-            </tr>
-            <tr>
-              <td>ignoreAnnotation</td>
-              <td>Ignore magic numbers in annotation declarations.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.4</td>
-            </tr>
-            <tr>
-              <td>ignoreFieldDeclaration</td>
-              <td>Ignore magic numbers in field declarations.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.6</td>
-            </tr>
-            <tr>
-              <td>ignoreAnnotationElementDefaults</td>
-              <td>Ignore magic numbers in annotation elements defaults.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.23</td>
-            </tr>
-            <tr>
-              <td>constantWaiverParentToken</td>
-              <td>Specify tokens that are allowed in the AST path from the number literal to the
-                  enclosing constant definition.</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                ARRAY_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                DIV</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELIST">
-                ELIST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                EXPR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                LITERAL_NEW</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                METHOD_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                STAR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                TYPECAST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                UNARY_MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                UNARY_PLUS</a>
-              </td>
-              <td>6.11</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                NUM_DOUBLE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                NUM_FLOAT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                NUM_INT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                NUM_LONG</a>
-                .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                NUM_DOUBLE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                NUM_FLOAT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                NUM_INT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                NUM_LONG</a>
-                .
-              </td>
-              <td>3.1</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java"/>
+         </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/matchxpath.xml b/src/xdocs/checks/coding/matchxpath.xml
index 717dad3782e..325af727f31 100644
--- a/src/xdocs/checks/coding/matchxpath.xml
+++ b/src/xdocs/checks/coding/matchxpath.xml
@@ -22,10 +22,12 @@
         </p>
         <p>
           Please read more about Xpath syntax at
-          <a href="https://www.saxonica.com/html/documentation10/expressions/">Xpath Syntax</a>.
+          <a href="https://www.saxonica.com/html/documentation10/expressions/index.html">
+            Xpath Syntax</a>.
           Information regarding Xpath functions can be found at
-          <a href="https://www.saxonica.com/html/documentation10/functions/fn/">XSLT/XPath
-            Reference</a>. Note, that <b>@text</b> attribute can be used only with token types that
+          <a href="https://www.saxonica.com/html/documentation10/functions/fn/index.html">
+            XSLT/XPath Reference</a>.
+            Note, that <b>@text</b> attribute can be used only with token types that
           are listed in
           <a href="https://github.com/checkstyle/checkstyle/search?q=%22TOKEN_TYPES_WITH_TEXT_ATTRIBUTE+%3D+Arrays.asList%22">
             XpathUtil</a>.
diff --git a/src/xdocs/checks/coding/matchxpath.xml.template b/src/xdocs/checks/coding/matchxpath.xml.template
index d532b769d1e..8ea5e2daf6b 100644
--- a/src/xdocs/checks/coding/matchxpath.xml.template
+++ b/src/xdocs/checks/coding/matchxpath.xml.template
@@ -22,10 +22,12 @@
         </p>
         <p>
           Please read more about Xpath syntax at
-          <a href="https://www.saxonica.com/html/documentation10/expressions/">Xpath Syntax</a>.
+          <a href="https://www.saxonica.com/html/documentation10/expressions/index.html">
+            Xpath Syntax</a>.
           Information regarding Xpath functions can be found at
-          <a href="https://www.saxonica.com/html/documentation10/functions/fn/">XSLT/XPath
-            Reference</a>. Note, that <b>@text</b> attribute can be used only with token types that
+          <a href="https://www.saxonica.com/html/documentation10/functions/fn/index.html">
+            XSLT/XPath Reference</a>.
+            Note, that <b>@text</b> attribute can be used only with token types that
           are listed in
           <a href="https://github.com/checkstyle/checkstyle/search?q=%22TOKEN_TYPES_WITH_TEXT_ATTRIBUTE+%3D+Arrays.asList%22">
             XpathUtil</a>.
@@ -35,22 +37,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>query</td>
-              <td>Specify Xpath query.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>""</code></td>
-              <td>8.39</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+              value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/modifiedcontrolvariable.xml b/src/xdocs/checks/coding/modifiedcontrolvariable.xml
index e73a381ad8b..17024095365 100644
--- a/src/xdocs/checks/coding/modifiedcontrolvariable.xml
+++ b/src/xdocs/checks/coding/modifiedcontrolvariable.xml
@@ -46,27 +46,19 @@ for (int a[]={0};a[0] &lt; 10;a[0]++) {
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
           <table>
-            <tr class="header">
+            <tr>
               <th>name</th>
               <th>description</th>
               <th>type</th>
               <th>default value</th>
               <th>since</th>
             </tr>
-
             <tr>
               <td>skipEnhancedForLoopVariable</td>
-              <td>
-                Control whether to check
-                <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
-                  enhanced for-loop</a> variable.
-              </td>
-              <td>
-                <a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td>
-                <code>false</code>
-              </td>
+              <td>Control whether to check <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
+ enhanced for-loop</a> variable.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
               <td>6.8</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/coding/modifiedcontrolvariable.xml.template b/src/xdocs/checks/coding/modifiedcontrolvariable.xml.template
index d6d3d4b206e..58922ce9cdd 100644
--- a/src/xdocs/checks/coding/modifiedcontrolvariable.xml.template
+++ b/src/xdocs/checks/coding/modifiedcontrolvariable.xml.template
@@ -45,31 +45,10 @@ for (int a[]={0};a[0] &lt; 10;a[0]++) {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr class="header">
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-
-            <tr>
-              <td>skipEnhancedForLoopVariable</td>
-              <td>
-                Control whether to check
-                <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
-                  enhanced for-loop</a> variable.
-              </td>
-              <td>
-                <a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td>
-                <code>false</code>
-              </td>
-              <td>6.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/multiplestringliterals.xml b/src/xdocs/checks/coding/multiplestringliterals.xml
index 376a7507309..f1bf718ab93 100644
--- a/src/xdocs/checks/coding/multiplestringliterals.xml
+++ b/src/xdocs/checks/coding/multiplestringliterals.xml
@@ -32,39 +32,28 @@
             </tr>
             <tr>
               <td>allowedDuplicates</td>
-              <td>
-                Specify the maximum number of occurrences to allow without generating a
-                warning.
-              </td>
+              <td>Specify the maximum number of occurrences to allow without generating a warning.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>1</code></td>
               <td>3.5</td>
             </tr>
             <tr>
-              <td>ignoreStringsRegexp</td>
+              <td>ignoreOccurrenceContext</td>
+              <td>Specify token type names where duplicate strings are ignored even if they don't match ignoredStringsRegexp. This allows you to exclude syntactical contexts like annotations or static initializers from the check.</td>
+              <td>subset of tokens <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a></td>
               <td>
-                Specify RegExp for ignored strings (with quotation marks).
+                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION">
+                    ANNOTATION</a>
               </td>
+              <td>4.4</td>
+            </tr>
+            <tr>
+              <td>ignoreStringsRegexp</td>
+              <td>Specify RegExp for ignored strings (with quotation marks).</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^&quot;&quot;$&quot;</code></td>
               <td>4.0</td>
             </tr>
-            <tr>
-              <td>ignoreOccurrenceContext</td>
-              <td>
-                Specify token type names where duplicate strings are ignored even if they don't
-                match ignoredStringsRegexp. This allows you to exclude syntactical contexts like
-                annotations or static initializers from the check.
-              </td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
-              <td>
-                <code>ANNOTATION</code>
-              </td>
-              <td>4.4</td>
-            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/coding/multiplestringliterals.xml.template b/src/xdocs/checks/coding/multiplestringliterals.xml.template
index 0d89db46a55..ac10b55d62b 100644
--- a/src/xdocs/checks/coding/multiplestringliterals.xml.template
+++ b/src/xdocs/checks/coding/multiplestringliterals.xml.template
@@ -22,50 +22,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowedDuplicates</td>
-              <td>
-                Specify the maximum number of occurrences to allow without generating a
-                warning.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>1</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>ignoreStringsRegexp</td>
-              <td>
-                Specify RegExp for ignored strings (with quotation marks).
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^""$"</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>ignoreOccurrenceContext</td>
-              <td>
-                Specify token type names where duplicate strings are ignored even if they don't
-                match ignoredStringsRegexp. This allows you to exclude syntactical contexts like
-                annotations or static initializers from the check.
-              </td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
-              <td>
-                <code>ANNOTATION</code>
-              </td>
-              <td>4.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java"/>
+         </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/nestedfordepth.xml.template b/src/xdocs/checks/coding/nestedfordepth.xml.template
index 68f44d4daa9..1a3398b3d6c 100644
--- a/src/xdocs/checks/coding/nestedfordepth.xml.template
+++ b/src/xdocs/checks/coding/nestedfordepth.xml.template
@@ -14,22 +14,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify maximum allowed nesting depth.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>1</code></td>
-              <td>5.3</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/nestedifdepth.xml.template b/src/xdocs/checks/coding/nestedifdepth.xml.template
index 6108a415231..90c36ca7e39 100644
--- a/src/xdocs/checks/coding/nestedifdepth.xml.template
+++ b/src/xdocs/checks/coding/nestedifdepth.xml.template
@@ -14,22 +14,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify maximum allowed nesting depth.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>1</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/nestedtrydepth.xml.template b/src/xdocs/checks/coding/nestedtrydepth.xml.template
index 7dd2ec91366..fb5e30bd611 100644
--- a/src/xdocs/checks/coding/nestedtrydepth.xml.template
+++ b/src/xdocs/checks/coding/nestedtrydepth.xml.template
@@ -14,22 +14,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify maximum allowed nesting depth.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>1</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/onestatementperline.xml.template b/src/xdocs/checks/coding/onestatementperline.xml.template
index e35c7f85789..b3546409d39 100644
--- a/src/xdocs/checks/coding/onestatementperline.xml.template
+++ b/src/xdocs/checks/coding/onestatementperline.xml.template
@@ -31,22 +31,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>treatTryResourcesAsStatement</td>
-              <td>Enable resources processing.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.23</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/overloadmethodsdeclarationorder.xml b/src/xdocs/checks/coding/overloadmethodsdeclarationorder.xml
index aaea853c3c9..97fd2414e20 100644
--- a/src/xdocs/checks/coding/overloadmethodsdeclarationorder.xml
+++ b/src/xdocs/checks/coding/overloadmethodsdeclarationorder.xml
@@ -28,18 +28,22 @@
         <p id="Example1-code">Example of correct grouping of overloaded methods:</p>
         <source>
 public void foo(int i) {}
+// comments between overloaded methods are allowed.
 public void foo(String s) {}
 public void foo(String s, int i) {}
 public void foo(int i, String s) {}
 public void notFoo() {}
+private interface ExampleInterface() {}
         </source>
         <p id="Example2-code">Example of incorrect grouping of overloaded methods:</p>
         <source>
 public void foo(int i) {} // OK
+// comments between overloaded methods are allowed.
 public void foo(String s) {} // OK
 public void notFoo() {} // violation. Have to be after foo(String s, int i)
 public void foo(int i, String s) {}
-public void foo(String s, int i) {}
+private interface ExampleInterface() {}
+public void foo(String s, int i) {} // violation. Have to be after foo(int i, String s)
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/packagedeclaration.xml.template b/src/xdocs/checks/coding/packagedeclaration.xml.template
index b6b68e8ce91..59570cd2408 100644
--- a/src/xdocs/checks/coding/packagedeclaration.xml.template
+++ b/src/xdocs/checks/coding/packagedeclaration.xml.template
@@ -27,22 +27,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>matchDirectoryStructure</td>
-              <td>Control whether to check for directory and package name match.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>7.6.1</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/parameterassignment.xml b/src/xdocs/checks/coding/parameterassignment.xml
index 14a16aaa10b..dd16f8e28b1 100644
--- a/src/xdocs/checks/coding/parameterassignment.xml
+++ b/src/xdocs/checks/coding/parameterassignment.xml
@@ -33,7 +33,7 @@
           Example:
         </p>
         <source>
-class MyClass {
+class Example1 {
   int methodOne(int parameter) {
     if (parameter &lt;= 0 ) {
       throw new IllegalArgumentException(&quot;A positive value is expected&quot;);
@@ -53,13 +53,13 @@ class MyClass {
 
   IntPredicate obj = a -&gt; ++a == 12; // violation
   IntBinaryOperator obj2 = (int a, int b) -&gt; {
-      a++;     // violation
-      b += 12; // violation
-      return a + b;
+    a++;     // violation
+    b += 12; // violation
+    return a + b;
   };
   IntPredicate obj3 = a -&gt; {
-      int b = a; // ok
-      return ++b == 12;
+    int b = a; // ok
+    return ++b == 12;
   };
 }
         </source>
diff --git a/src/xdocs/checks/coding/parameterassignment.xml.template b/src/xdocs/checks/coding/parameterassignment.xml.template
index 9080362d332..b77afb9fbaf 100644
--- a/src/xdocs/checks/coding/parameterassignment.xml.template
+++ b/src/xdocs/checks/coding/parameterassignment.xml.template
@@ -24,7 +24,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -32,7 +32,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/parameterassignment/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/requirethis.xml.template b/src/xdocs/checks/coding/requirethis.xml.template
index 3db90f1cf00..b84642906af 100644
--- a/src/xdocs/checks/coding/requirethis.xml.template
+++ b/src/xdocs/checks/coding/requirethis.xml.template
@@ -48,36 +48,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>checkFields</td>
-              <td>Control whether to check references to fields.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>checkMethods</td>
-              <td>Control whether to check references to methods.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>validateOnlyOverlapping</td>
-              <td>Control whether to check only overlapping by variables or arguments.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.17</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/returncount.xml b/src/xdocs/checks/coding/returncount.xml
index d5a557833ad..4a0c0c93863 100644
--- a/src/xdocs/checks/coding/returncount.xml
+++ b/src/xdocs/checks/coding/returncount.xml
@@ -43,50 +43,46 @@
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Specify method names to ignore.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^equals$&quot;</code></td>
+              <td>3.4</td>
+            </tr>
             <tr>
               <td>max</td>
-              <td>
-                Specify maximum allowed number of return statements in non-void methods/lambdas.
-              </td>
+              <td>Specify maximum allowed number of return statements in non-void methods/lambdas.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>2</code></td>
               <td>3.2</td>
             </tr>
             <tr>
               <td>maxForVoid</td>
-              <td>Specify maximum allowed number of return statements in void
-                  methods/constructors/lambdas.</td>
+              <td>Specify maximum allowed number of return statements in void methods/constructors/lambdas.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>1</code></td>
               <td>6.19</td>
             </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify method names to ignore.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^equals$&quot;</code></td>
-              <td>3.4</td>
-            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                   .
               </td>
               <td>3.2</td>
diff --git a/src/xdocs/checks/coding/returncount.xml.template b/src/xdocs/checks/coding/returncount.xml.template
index 2f4492a88d6..4ec33d8b15d 100644
--- a/src/xdocs/checks/coding/returncount.xml.template
+++ b/src/xdocs/checks/coding/returncount.xml.template
@@ -35,63 +35,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>
-                Specify maximum allowed number of return statements in non-void methods/lambdas.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>2</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>maxForVoid</td>
-              <td>Specify maximum allowed number of return statements in void
-                  methods/constructors/lambdas.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>1</code></td>
-              <td>6.19</td>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify method names to ignore.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^equals$"</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                  .
-              </td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/simplifybooleanreturn.xml b/src/xdocs/checks/coding/simplifybooleanreturn.xml
index 985d4b44d4f..03502d8aa5e 100644
--- a/src/xdocs/checks/coding/simplifybooleanreturn.xml
+++ b/src/xdocs/checks/coding/simplifybooleanreturn.xml
@@ -29,7 +29,8 @@ return !valid();
 
         <p>
           The idea for this Check has been shamelessly stolen from the
-          equivalent <a href="https://pmd.github.io/">PMD</a> rule.
+          equivalent <a href="https://pmd.github.io/pmd/pmd_rules_java_design.html#simplifybooleanreturns">
+          PMD</a> rule.
         </p>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/simplifybooleanreturn.xml.template b/src/xdocs/checks/coding/simplifybooleanreturn.xml.template
index a39f3350d9c..13374d0ca5c 100644
--- a/src/xdocs/checks/coding/simplifybooleanreturn.xml.template
+++ b/src/xdocs/checks/coding/simplifybooleanreturn.xml.template
@@ -29,7 +29,8 @@ return !valid();
 
         <p>
           The idea for this Check has been shamelessly stolen from the
-          equivalent <a href="https://pmd.github.io/">PMD</a> rule.
+          equivalent <a href="https://pmd.github.io/pmd/pmd_rules_java_design.html#simplifybooleanreturns">
+          PMD</a> rule.
         </p>
       </subsection>
 
diff --git a/src/xdocs/checks/coding/superclone.xml b/src/xdocs/checks/coding/superclone.xml
index 24cd33d5a27..3d082301a33 100644
--- a/src/xdocs/checks/coding/superclone.xml
+++ b/src/xdocs/checks/coding/superclone.xml
@@ -34,28 +34,28 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-class A {
-
- public Object clone() { // OK
-  return super.clone();
- }
+class Example1 {
+  public Object clone() throws CloneNotSupportedException {
+    return super.clone();
+  }
 }
 
-class B {
-private int b;
+class SuperCloneB {
+  private int b;
 
- public B clone() { // violation, does not call super.clone()
-  B other = new B();
-  other.b = this.b;
-  return other;
- }
+  // violation below, &quot;Method 'clone' should call 'super.clone'.&quot;
+  public SuperCloneB clone() {
+    SuperCloneB other = new SuperCloneB();
+    other.b = this.b;
+    return other;
+  }
 }
 
-class C {
+class SuperCloneC {
 
- public C clone() { // OK
-  return (C) super.clone();
- }
+  public SuperCloneC clone() throws CloneNotSupportedException {
+    return (SuperCloneC) super.clone();
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/coding/superclone.xml.template b/src/xdocs/checks/coding/superclone.xml.template
index 0afa84b533f..784ca5273f9 100644
--- a/src/xdocs/checks/coding/superclone.xml.template
+++ b/src/xdocs/checks/coding/superclone.xml.template
@@ -27,13 +27,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/superclone/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/unnecessaryparentheses.xml b/src/xdocs/checks/coding/unnecessaryparentheses.xml
index 41544b63d25..4e8a0c4e4c8 100644
--- a/src/xdocs/checks/coding/unnecessaryparentheses.xml
+++ b/src/xdocs/checks/coding/unnecessaryparentheses.xml
@@ -88,181 +88,180 @@ if ((++f) &gt; g &amp;&amp; a) { // violation, unnecessary paren
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
+                    EXPR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IDENT">
-                  IDENT</a>
+                    IDENT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                  NUM_DOUBLE</a>
+                    NUM_DOUBLE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                  NUM_FLOAT</a>
+                    NUM_FLOAT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                  NUM_INT</a>
+                    NUM_INT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                  NUM_LONG</a>
+                    NUM_LONG</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STRING_LITERAL">
-                  STRING_LITERAL</a>
+                    STRING_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NULL">
-                  LITERAL_NULL</a>
+                    LITERAL_NULL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FALSE">
-                  LITERAL_FALSE</a>
+                    LITERAL_FALSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRUE">
-                  LITERAL_TRUE</a>
+                    LITERAL_TRUE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
+                    ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
+                    BAND_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
+                    BOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
+                    BSR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
+                    BXOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
+                    DIV_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
+                    MINUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
+                    MOD_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
+                    PLUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
+                    SL_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
+                    SR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
+                    STAR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_LITERAL_BEGIN">
-                TEXT_BLOCK_LITERAL_BEGIN</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                LAND</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                LOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                LITERAL_INSTANCEOF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                GT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                LT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                GE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                LE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                NOT_EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                UNARY_MINUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                UNARY_PLUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                DEC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                LNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                BNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                POST_INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                POST_DEC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                BXOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                BOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                BAND</a>
+                    LAMBDA</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_LITERAL_BEGIN">
+                    TEXT_BLOCK_LITERAL_BEGIN</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
+                    LAND</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
+                    LOR</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
+                    LITERAL_INSTANCEOF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
+                    GT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
+                    LT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
+                    GE</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
+                    LE</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
+                    EQUAL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
+                    NOT_EQUAL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
+                    UNARY_MINUS</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
+                    UNARY_PLUS</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
+                    INC</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
+                    DEC</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
+                    LNOT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
+                    BNOT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
+                    POST_INC</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
+                    POST_DEC</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
+                    BXOR</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
+                    BOR</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
+                    BAND</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
+                    EXPR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IDENT">
-                  IDENT</a>
+                    IDENT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                  NUM_DOUBLE</a>
+                    NUM_DOUBLE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                  NUM_FLOAT</a>
+                    NUM_FLOAT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                  NUM_INT</a>
+                    NUM_INT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                  NUM_LONG</a>
+                    NUM_LONG</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STRING_LITERAL">
-                  STRING_LITERAL</a>
+                    STRING_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NULL">
-                  LITERAL_NULL</a>
+                    LITERAL_NULL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FALSE">
-                  LITERAL_FALSE</a>
+                    LITERAL_FALSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRUE">
-                  LITERAL_TRUE</a>
+                    LITERAL_TRUE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
+                    ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
+                    BAND_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
+                    BOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
+                    BSR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
+                    BXOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
+                    DIV_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
+                    MINUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
+                    MOD_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
+                    PLUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
+                    SL_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
+                    SR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
+                    STAR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_LITERAL_BEGIN">
-                  TEXT_BLOCK_LITERAL_BEGIN</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                  LITERAL_INSTANCEOF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                  UNARY_MINUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                  UNARY_PLUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                  INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                  DEC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                  LNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                  BNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                  POST_INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                  POST_DEC</a>
+                    LAMBDA</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_LITERAL_BEGIN">
+                    TEXT_BLOCK_LITERAL_BEGIN</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
+                    LAND</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
+                    LOR</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
+                    LITERAL_INSTANCEOF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
+                    GT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
+                    LT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
+                    GE</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
+                    LE</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
+                    EQUAL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
+                    NOT_EQUAL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
+                    UNARY_MINUS</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
+                    UNARY_PLUS</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
+                    INC</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
+                    DEC</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
+                    LNOT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
+                    BNOT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
+                    POST_INC</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
+                    POST_DEC</a>
                   .
               </td>
               <td>3.4</td>
@@ -286,36 +285,52 @@ if ((++f) &gt; g &amp;&amp; a) { // violation, unnecessary paren
           Which results in the following violations:
         </p>
         <source>
-public int square(int a, int b){
-  int square = (a * b); // violation
-  return (square);      // violation
-}
-int sumOfSquares = 0;
-for(int i=(0); i&lt;10; i++){          // violation
-  int x = (i + 1);                  // violation
-  sumOfSquares += (square(x * x));  // violation
-}
-double num = (10.0); //violation
-List&lt;String&gt; list = Arrays.asList(&quot;a1&quot;, &quot;b1&quot;, &quot;c1&quot;);
-myList.stream()
-  .filter((s) -&gt; s.startsWith(&quot;c&quot;)) // violation
-  .forEach(System.out::println);
-int a = 10, b = 12, c = 15;
-boolean x = true, y = false, z= true;
-if ((a &gt;= 0 &amp;&amp; b &lt;= 9)            // violation, unnecessary parenthesis
-         || (c &gt;= 5 &amp;&amp; b &lt;= 5)    // violation, unnecessary parenthesis
-         || (c &gt;= 3 &amp;&amp; a &lt;= 7)) { // violation, unnecessary parenthesis
-    return;
-}
-if ((-a) != -27 // violation, unnecessary parenthesis
-         &amp;&amp; b &gt; 5) {
-    return;
-}
-if (x==(a &lt;= 15)) { // ok
-    return;
-}
-if (x==(y == z)) { // ok
-    return;
+class Example1 {
+
+  public int square(int a, int b) {
+    // violation below, 'Unnecessary parentheses around assignment right-hand side'
+    int square = (a * b);
+    // violation below, 'Unnecessary parentheses around identifier 'square''
+    return (square);
+  }
+
+  int sumOfSquares = 0;
+  public void sumOfSquares() {
+    // violation below, 'Unnecessary parentheses around literal '0''
+    for (int i = (0); i &lt; 10; i++) {
+      // violation below, 'Unnecessary parentheses around assignment right-hand side'
+      int x = (i + 1);
+      sumOfSquares += (square(x,x));  // 2 violations
+    }
+  }
+
+  List&lt;String&gt; myList = List.of(&quot;a1&quot;, &quot;b1&quot;, &quot;c1&quot;);
+  public void filter() {
+    myList.stream()
+        // violation below, 'Unnecessary parentheses around lambda value'
+        .filter((s) -&gt; s.startsWith(&quot;c&quot;))
+            .forEach(System.out::println);
+  }
+
+  int a = 10, b = 12, c = 15;
+  boolean x = true, y = false, z = true;
+  public void test() {
+    // 3 violations below
+    if ((a &gt;= 0 &amp;&amp; b &lt;= 9) || (c &gt;= 5 &amp;&amp; b &lt;= 5) || (c &gt;= 3 &amp;&amp; a &lt;= 7)) {
+      return;
+    }
+    // violation below, 'Unnecessary parentheses around expression'
+    if ((-a) != -27 &amp;&amp; b &gt; 5) {
+      return;
+    }
+    if (x == (a &lt;= 15)) {
+      return;
+    }
+    if (x == (y == z)) {
+      return;
+    }
+  }
+
 }
         </source>
         <p id="Example2-config">
@@ -334,28 +349,30 @@ if (x==(y == z)) { // ok
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-class Test {
+class Example2 {
 
-    void method() {
-        int x = 9, y = 8;
-        if(x&gt;= 0 ^ (x&lt;=8 &amp; y&lt;=11) // violation, unnecessary parenthesis
-            ^ y&gt;=8) {
-            return;
-        }
-         if(x&gt;= 0 ^ x&lt;=8 &amp; y&lt;=11 ^ y&gt;=8) { // ok
-            return;
-        }
-        if(x&gt;= 0 || (x&lt;=8 &amp; y&lt;=11) // violation, unnecessary parenthesis
-            &amp;&amp; y&gt;=8) {
-            return;
-        }
-        if(x&gt;= 0 || x&lt;=8 &amp; y&lt;=11 &amp;&amp; y&gt;=8) { // ok
-            return;
-        }
-        if(x&gt;= 0 &amp; (x&lt;=8 ^ y&lt;=11) &amp; y&gt;=8) { // ok
-            return;
-        }
+  void method() {
+    int x = 9, y = 8;
+    // violation below, 'Unnecessary parentheses around expression'
+    if (x &gt;= 0 ^ (x &lt;= 8 &amp; y &lt;= 11)
+         ^ y &gt;= 8) {
+      return;
+    }
+    if (x &gt;= 0 ^ x &lt;= 8 &amp; y &lt;= 11 ^ y &gt;= 8) {
+      return;
+    }
+    // violation below, 'Unnecessary parentheses around expression'
+    if (x &gt;= 0 || (x &lt;= 8 &amp; y &lt;= 11)
+        &amp;&amp; y &gt;= 8) {
+      return;
+    }
+    if (x &gt;= 0 || x &lt;= 8 &amp; y &lt;= 11 &amp;&amp; y &gt;= 8) {
+      return;
+    }
+    if (x &gt;= 0 &amp; (x &lt;= 8 ^ y &lt;= 11) &amp; y &gt;= 8) {
+      return;
     }
+  }
 
 }
         </source>
diff --git a/src/xdocs/checks/coding/unnecessaryparentheses.xml.template b/src/xdocs/checks/coding/unnecessaryparentheses.xml.template
index a143f079de0..c1508da8416 100644
--- a/src/xdocs/checks/coding/unnecessaryparentheses.xml.template
+++ b/src/xdocs/checks/coding/unnecessaryparentheses.xml.template
@@ -77,197 +77,10 @@ if ((++f) &gt; g &amp;&amp; a) { // violation, unnecessary paren
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IDENT">
-                  IDENT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                  NUM_DOUBLE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                  NUM_FLOAT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                  NUM_INT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                  NUM_LONG</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STRING_LITERAL">
-                  STRING_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NULL">
-                  LITERAL_NULL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FALSE">
-                  LITERAL_FALSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRUE">
-                  LITERAL_TRUE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_LITERAL_BEGIN">
-                TEXT_BLOCK_LITERAL_BEGIN</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                LAND</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                LOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                LITERAL_INSTANCEOF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                GT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                LT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                GE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                LE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                NOT_EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                UNARY_MINUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                UNARY_PLUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                DEC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                LNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                BNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                POST_INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                POST_DEC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                BXOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                BOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                BAND</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IDENT">
-                  IDENT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_DOUBLE">
-                  NUM_DOUBLE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_FLOAT">
-                  NUM_FLOAT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_INT">
-                  NUM_INT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NUM_LONG">
-                  NUM_LONG</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STRING_LITERAL">
-                  STRING_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NULL">
-                  LITERAL_NULL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FALSE">
-                  LITERAL_FALSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRUE">
-                  LITERAL_TRUE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TEXT_BLOCK_LITERAL_BEGIN">
-                  TEXT_BLOCK_LITERAL_BEGIN</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                  LITERAL_INSTANCEOF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                  UNARY_MINUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                  UNARY_PLUS</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                  INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                  DEC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                  LNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                  BNOT</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                  POST_INC</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                  POST_DEC</a>
-                  .
-              </td>
-              <td>3.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -277,7 +90,7 @@ if ((++f) &gt; g &amp;&amp; a) { // violation, unnecessary paren
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -285,7 +98,7 @@ if ((++f) &gt; g &amp;&amp; a) { // violation, unnecessary paren
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -295,13 +108,13 @@ if ((++f) &gt; g &amp;&amp; a) { // violation, unnecessary paren
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessaryparentheses/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml b/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml
index e04e5a46144..af4fd3baa23 100644
--- a/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml
+++ b/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml
@@ -33,30 +33,29 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                 CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
+              <td>subset of tokens
+                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
+                    CLASS_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+                    INTERFACE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
+                    ENUM_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
+                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
                     CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
                     INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
                     ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
                     ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
                     RECORD_DEF</a>
                   .
               </td>
@@ -81,11 +80,10 @@
           Example:
         </p>
         <source>
-class A {
-
-   class Nested {
+class Example1 {
+  class Nested {
 
-   }; // OK, nested type declarations are ignored
+  }; // OK, nested type declarations are ignored
 
 }; // violation
 
@@ -97,7 +95,7 @@ enum C {
 
 }; // violation
 
-{@literal @}interface D {
+@interface D {
 
 }; // violation
         </source>
@@ -118,21 +116,24 @@ enum C {
           Example:
         </p>
         <source>
-class A {
+class Example2 {
+  class Nested {
+
+  }; // OK, nested type declarations are ignored
 
 }; // violation
 
-interface B {
+interface T {
 
-}; // OK
+};
 
-enum C {
+enum U {
 
-}; // OK
+};
 
-{@literal @}interface D {
+@interface V {
 
-}; // OK
+};
         </source>
       </subsection>
 
@@ -146,12 +147,12 @@ enum C {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-                unnecessary.semicolon</a>
+              unnecessary.semicolon
+            </a>
           </li>
         </ul>
         <p>
@@ -167,8 +168,7 @@ enum C {
         </p>
       </subsection>
 
-      <subsection name="Parent Module"
-        id="Parent_Module">
+      <subsection name="Parent Module" id="Parent_Module">
         <p>
           <a href="../../config.html#TreeWalker">TreeWalker</a>
         </p>
diff --git a/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml.template b/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml.template
index 96cf979fb21..6b863ee821a 100644
--- a/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml.template
+++ b/src/xdocs/checks/coding/unnecessarysemicolonafteroutertypedeclaration.xml.template
@@ -22,47 +22,10 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                 CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                    ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                  .
-              </td>
-              <td>8.31</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterOuterTypeDeclarationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -72,7 +35,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -80,7 +43,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -89,7 +52,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -97,7 +60,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unnecessarysemicolonafteroutertypedeclaration/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
@@ -112,14 +75,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-                unnecessary.semicolon</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
@@ -133,11 +92,10 @@
         </p>
       </subsection>
 
-      <subsection name="Parent Module"
-        id="Parent_Module">
-        <p>
-          <a href="../../config.html#TreeWalker">TreeWalker</a>
-        </p>
+      <subsection name="Parent Module" id="Parent_Module">
+        <macro name="parent-module">
+          <param name="moduleName" value="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+        </macro>
       </subsection>
     </section>
   </body>
diff --git a/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml b/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml
index 2bae9ab3962..19eb6d09ce7 100644
--- a/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml
+++ b/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml
@@ -35,62 +35,61 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                 CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                VARIABLE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                ANNOTATION_FIELD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                STATIC_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                INSTANCE_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                METHOD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                ENUM_CONSTANT_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                COMPACT_CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
+              <td>subset of tokens
+                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
+                    CLASS_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+                    INTERFACE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
+                    ENUM_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
+                    VARIABLE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
+                    ANNOTATION_FIELD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
+                    STATIC_INIT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
+                    INSTANCE_INIT</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
+                    CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                    METHOD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
+                    ENUM_CONSTANT_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
+                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
                     CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
                     INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
                     ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
                     ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
                     VARIABLE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
                     ANNOTATION_FIELD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
                     STATIC_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
                     INSTANCE_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
                     CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
                     METHOD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
                     ENUM_CONSTANT_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
                     COMPACT_CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
                     RECORD_DEF</a>
                   .
               </td>
@@ -149,12 +148,12 @@ class A {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-                unnecessary.semicolon</a>
+              unnecessary.semicolon
+            </a>
           </li>
         </ul>
         <p>
@@ -170,8 +169,7 @@ class A {
         </p>
       </subsection>
 
-      <subsection name="Parent Module"
-        id="Parent_Module">
+      <subsection name="Parent Module" id="Parent_Module">
         <p>
           <a href="../../config.html#TreeWalker">TreeWalker</a>
         </p>
diff --git a/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml.template b/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml.template
index dfa407576c1..cd83944b000 100644
--- a/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml.template
+++ b/src/xdocs/checks/coding/unnecessarysemicolonaftertypememberdeclaration.xml.template
@@ -24,79 +24,10 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                 CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                VARIABLE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                ANNOTATION_FIELD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                STATIC_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                INSTANCE_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                METHOD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                ENUM_CONSTANT_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                COMPACT_CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                    ANNOTATION_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                    ANNOTATION_FIELD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                    STATIC_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                    INSTANCE_INIT</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                    ENUM_CONSTANT_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                  .
-              </td>
-              <td>8.24</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonAfterTypeMemberDeclarationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -129,14 +60,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-                unnecessary.semicolon</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
@@ -150,11 +77,10 @@
         </p>
       </subsection>
 
-      <subsection name="Parent Module"
-        id="Parent_Module">
-        <p>
-          <a href="../../config.html#TreeWalker">TreeWalker</a>
-        </p>
+      <subsection name="Parent Module" id="Parent_Module">
+        <macro name="parent-module">
+          <param name="moduleName" value="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
+        </macro>
       </subsection>
     </section>
   </body>
diff --git a/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml b/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml
index f8e858f3fc8..d43dcb3993b 100644
--- a/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml
+++ b/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml
@@ -73,12 +73,12 @@ enum NoSemicolon {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-            unnecessary.semicolon</a>
+              unnecessary.semicolon
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml.template b/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml.template
index e3dba583fcf..6b40bd7dca4 100644
--- a/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml.template
+++ b/src/xdocs/checks/coding/unnecessarysemicoloninenumeration.xml.template
@@ -51,14 +51,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-            unnecessary.semicolon</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="UnnecessarySemicolonInEnumeration"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml b/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml
index 9fd15a8afae..8d65ba050de 100644
--- a/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml
+++ b/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml
@@ -24,7 +24,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-
             <tr>
               <td>allowWhenNoBraceAfterSemicolon</td>
               <td>Allow unnecessary semicolon if closing paren is not on the same line.</td>
@@ -101,12 +100,12 @@ class A {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-            unnecessary.semicolon</a>
+              unnecessary.semicolon
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml.template b/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml.template
index a5134ba77c7..f278a1530d8 100644
--- a/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml.template
+++ b/src/xdocs/checks/coding/unnecessarysemicolonintrywithresources.xml.template
@@ -16,23 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-
-            <tr>
-              <td>allowWhenNoBraceAfterSemicolon</td>
-              <td>Allow unnecessary semicolon if closing paren is not on the same line.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.22</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessarySemicolonInTryWithResourcesCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -82,14 +69,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22unnecessary.semicolon%22">
-            unnecessary.semicolon</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="UnnecessarySemicolonInTryWithResources"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/coding/unusedlocalvariable.xml b/src/xdocs/checks/coding/unusedlocalvariable.xml
index 12a00101b47..dc5a3ea69d5 100644
--- a/src/xdocs/checks/coding/unusedlocalvariable.xml
+++ b/src/xdocs/checks/coding/unusedlocalvariable.xml
@@ -32,59 +32,51 @@
           Example:
         </p>
         <source>
-class Test {
+class Example1 {
+  {
+    int k = 12; // violation, assign and update but never use 'k'
+    k++;
+  }
 
-    int a;
+  int a;
+  Example1(int a) { // ok, as 'a' is a constructor parameter not a local variable
+    this.a = 12;
+  }
 
-    {
-        int k = 12; // violation, assigned and updated but never used
-        k++;
-    }
-
-    Test(int a) {   // ok as 'a' is a constructor parameter not a local variable
-        this.a = 12;
-    }
+  void method(int b) {
+    int[] arr = {1, 2, 3};  // violation, unused local variable 'arr'
+    int[] anotherArr = {1}; // ok, 'anotherArr' is accessed
+    anotherArr[0] = 4;
+  }
 
-    void method(int b) {
-        int a = 10;             // violation
-        int[] arr = {1, 2, 3};  // violation
-        int[] anotherArr = {1}; // ok
-        anotherArr[0] = 4;
-    }
+  String convertValue(String newValue) {
+    String s = newValue.toLowerCase(); // violation, unused local variable 's'
+    return newValue.toLowerCase();
+  }
 
-    String convertValue(String newValue) {
-        String s = newValue.toLowerCase(); // violation
-        return newValue.toLowerCase();
+  void read() throws IOException {
+    BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+    String s; // violation, unused local variable 's'
+    while ((s = reader.readLine()) != null) {}
+    try (BufferedReader reader1 = // ok, 'reader1' is a resource
+                 new BufferedReader(new FileReader(&quot;abc.txt&quot;))) {}
+    try {
+    } catch (Exception e) { // ok, 'e' is an exception parameter
     }
+  }
 
-    void read() throws IOException {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-        String s; // violation
-        while ((s = reader.readLine()) != null) {
-        }
-        try (BufferedReader reader1 // ok as 'reader1' is a resource and resources are closed
-                                    // at the end of the statement
-            = new BufferedReader(new FileReader(&quot;abc.txt&quot;))) {
-        }
-        try {
-        } catch (Exception e) {     // ok as e is an exception parameter
-        }
+  void loops() {
+    int j = 12;
+    for (int i = 0; j &lt; 11; i++) { // violation, unused local variable 'i'
     }
+    for (int p = 0; j &lt; 11; p++)   // ok, 'p' is used
+      p /= 2;
+  }
 
-    void loops() {
-        int j = 12;
-        for (int i = 0; j &lt; 11; i++) { // violation, unused local variable 'i'.
-        }
-        for (int p = 0; j &lt; 11; p++)   // ok
-            p /= 2;
-    }
-
-    void lambdas() {
-        Predicate&lt;String&gt; obj = (String str) -&gt; { // ok as 'str' is a lambda parameter
-            return true;
-        };
-        obj.test(&quot;test&quot;);
-    }
+  void lambdas() {
+    Predicate&lt;String&gt; obj = (String str) -&gt; true; // ok, 'str' is a lambda parameter
+    obj.test(&quot;Test&quot;);
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/coding/unusedlocalvariable.xml.template b/src/xdocs/checks/coding/unusedlocalvariable.xml.template
index fe7072fb8ab..76c96b68d44 100644
--- a/src/xdocs/checks/coding/unusedlocalvariable.xml.template
+++ b/src/xdocs/checks/coding/unusedlocalvariable.xml.template
@@ -23,7 +23,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -31,7 +31,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/coding/unusedlocalvariable/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/coding/variabledeclarationusagedistance.xml b/src/xdocs/checks/coding/variabledeclarationusagedistance.xml
index 03ad964c12b..07059de2e7c 100644
--- a/src/xdocs/checks/coding/variabledeclarationusagedistance.xml
+++ b/src/xdocs/checks/coding/variabledeclarationusagedistance.xml
@@ -26,42 +26,34 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-
             <tr>
               <td>allowedDistance</td>
-              <td>Specify distance between declaration of variable and its first usage.
-                  Values should be greater than 0.</td>
+              <td>Specify distance between declaration of variable and its first usage. Values should be greater than 0.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>3</code></td>
               <td>5.8</td>
             </tr>
-
+            <tr>
+              <td>ignoreFinal</td>
+              <td>Allow to ignore variables with a 'final' modifier.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>5.8</td>
+            </tr>
             <tr>
               <td>ignoreVariablePattern</td>
-              <td>
-                Define RegExp to ignore distance calculation for variables listed in this pattern.
-              </td>
+              <td>Define RegExp to ignore distance calculation for variables listed in this pattern.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;&quot;</code></td>
               <td>5.8</td>
             </tr>
-
             <tr>
               <td>validateBetweenScopes</td>
-              <td>Allow to calculate the distance between declaration of variable and its
-                  first usage in the different scopes.</td>
+              <td>Allow to calculate the distance between declaration of variable and its first usage in the different scopes.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.8</td>
             </tr>
-
-            <tr>
-              <td>ignoreFinal</td>
-              <td>Allow to ignore variables with a 'final' modifier.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.8</td>
-            </tr>
           </table>
         </div>
       </subsection>
@@ -321,16 +313,17 @@ public class Test {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22variable.declaration.usage.distance%22">
-            variable.declaration.usage.distance</a>
+              variable.declaration.usage.distance
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22variable.declaration.usage.distance.extend%22">
-            variable.declaration.usage.distance.extend</a>
+              variable.declaration.usage.distance.extend
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/coding/variabledeclarationusagedistance.xml.template b/src/xdocs/checks/coding/variabledeclarationusagedistance.xml.template
index 4482c5fcf5a..56607dff4c8 100644
--- a/src/xdocs/checks/coding/variabledeclarationusagedistance.xml.template
+++ b/src/xdocs/checks/coding/variabledeclarationusagedistance.xml.template
@@ -18,51 +18,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-
-            <tr>
-              <td>allowedDistance</td>
-              <td>Specify distance between declaration of variable and its first usage.
-                  Values should be greater than 0.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>3</code></td>
-              <td>5.8</td>
-            </tr>
-
-            <tr>
-              <td>ignoreVariablePattern</td>
-              <td>
-                Define RegExp to ignore distance calculation for variables listed in this pattern.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>""</code></td>
-              <td>5.8</td>
-            </tr>
-
-            <tr>
-              <td>validateBetweenScopes</td>
-              <td>Allow to calculate the distance between declaration of variable and its
-                  first usage in the different scopes.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-
-            <tr>
-              <td>ignoreFinal</td>
-              <td>Allow to ignore variables with a 'final' modifier.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -193,18 +152,10 @@ cal.set(Calendar.MINUTE, minutes);
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22variable.declaration.usage.distance%22">
-            variable.declaration.usage.distance</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fcoding%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22variable.declaration.usage.distance.extend%22">
-            variable.declaration.usage.distance.extend</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="VariableDeclarationUsageDistance"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/design/designforextension.xml b/src/xdocs/checks/design/designforextension.xml
index f4dd1ee1134..cfe86968c09 100644
--- a/src/xdocs/checks/design/designforextension.xml
+++ b/src/xdocs/checks/design/designforextension.xml
@@ -127,6 +127,7 @@ public abstract class Plant {
 }
         </source>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
           <table>
@@ -139,19 +140,14 @@ public abstract class Plant {
             </tr>
             <tr>
               <td>ignoredAnnotations</td>
-              <td>
-                Specify annotations which allow the check to skip the method from validation.
-              </td>
+              <td>Specify annotations which allow the check to skip the method from validation.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>After, AfterClass, Before, BeforeClass, Test</code></td>
               <td>7.2</td>
             </tr>
             <tr>
               <td>requiredJavadocPhrase</td>
-              <td>
-                Specify the comment text pattern which qualifies a method as designed for
-                extension. Supports multi-line regex.
-              </td>
+              <td>Specify the comment text pattern which qualifies a method as designed for extension. Supports multi-line regex.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;.*&quot;</code></td>
               <td>8.40</td>
@@ -159,21 +155,26 @@ public abstract class Plant {
           </table>
         </div>
       </subsection>
+
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
         <source>
-&lt;module name=&quot;DesignForExtension&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;DesignForExtension&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example1-code">Example:</p>
         <source>
-public abstract class Foo {
+public abstract class Example1 {
   private int bar;
 
-  public int m1() {return 2;}  // Violation. No javadoc.
+  public int m1() {return 2;}  // violation
 
-  public int m2() {return 8;}  // Violation. No javadoc.
+  public int m2() {return 8;}  // violation
 
   private void m3() {m4();}  // OK. Private method.
 
@@ -198,29 +199,34 @@ public abstract class Foo {
    */
   public int m8() {return 2;}  // OK. Have javadoc on overridable method.
 
-  @Override
-  public String toString() {  // Violation. No javadoc for @Override method.
+  @Override                   // violation
+  public String toString() {
     return &quot;&quot;;
   }
 }
         </source>
-        <p>
+
+        <p id="Example2-config">
           To configure the check to allow methods which have @Override annotations to be
           designed for extension.
         </p>
         <source>
-&lt;module name=&quot;DesignForExtension&quot;&gt;
-  &lt;property name=&quot;ignoredAnnotations&quot; value=&quot;Override&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;DesignForExtension&quot;&gt;
+      &lt;property name=&quot;ignoredAnnotations&quot; value=&quot;Override&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example2-code">Example:</p>
         <source>
-public abstract class Foo {
+public abstract class Example2 {
   private int bar;
 
-  public int m1() {return 2;}  // Violation. No javadoc.
+  public int m1() {return 2;}  // violation
 
-  public int m2() {return 8;}  // Violation. No javadoc.
+  public int m2() {return 8;}  // violation
 
   private void m3() {m4();}  // OK. Private method.
 
@@ -246,27 +252,33 @@ public abstract class Foo {
   public int m8() {return 2;}  // OK. Have javadoc on overridable method.
 
   @Override
-  public String toString() {  // OK. Have javadoc on overridable method.
+  public String toString() {
     return &quot;&quot;;
   }
 }
         </source>
-        <p>To configure the check to allow methods which contain a specified comment text pattern in
+
+        <p id="Example3-config">
+          To configure the check to allow methods which contain a specified comment text pattern in
           their javadoc to be designed for extension.
         </p>
         <source>
-&lt;module name=&quot;DesignForExtension&quot;&gt;
-  &lt;property name=&quot;requiredJavadocPhrase&quot; value=&quot;This implementation&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;DesignForExtension&quot;&gt;
+      &lt;property name=&quot;requiredJavadocPhrase&quot; value=&quot;This implementation&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example3-code">Example:</p>
         <source>
-public abstract class Foo {
+public abstract class Example3 {
   private int bar;
 
-  public int m1() {return 2;}  // Violation. No javadoc.
+  public int m1() {return 2;}  // violation
 
-  public int m2() {return 8;}  // Violation. No javadoc.
+  public int m2() {return 8;}  // violation
 
   private void m3() {m4();}  // OK. Private method.
 
@@ -283,38 +295,43 @@ public abstract class Foo {
   /**
    * Some comments ...
    */
-  public int m7() {return 1;}  // Violation. No required javadoc.
+  public int m7() {return 1;}  // violation
 
   /**
    * This
    * implementation ...
    */
-  public int m8() {return 2;}  // Violation. No required javadoc.
+  public int m8() {return 2;}  // violation
 
-  @Override
-  public String toString() {  // Violation. No required javadoc.
+  @Override                    // violation
+  public String toString() {
     return &quot;&quot;;
   }
 }
         </source>
-        <p>
+
+        <p id="Example4-config">
           To configure the check to allow methods which contain a specified comment text pattern in
           their javadoc which can span multiple lines to be designed for extension.
         </p>
         <source>
-&lt;module name=&quot;DesignForExtension&quot;&gt;
-  &lt;property name=&quot;requiredJavadocPhrase&quot;
-    value=&quot;This[\s\S]*implementation&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;DesignForExtension&quot;&gt;
+      &lt;property name=&quot;requiredJavadocPhrase&quot;
+        value=&quot;This[\s\S]*implementation&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>Example:</p>
+        <p id="Example4-code">Example:</p>
         <source>
-public abstract class Foo {
+public abstract class Example4 {
   private int bar;
 
-  public int m1() {return 2;}  // Violation. No javadoc.
+  public int m1() {return 2;}  // violation
 
-  public int m2() {return 8;}  // Violation. No javadoc.
+  public int m2() {return 8;}  // violation
 
   private void m3() {m4();}
 
@@ -331,7 +348,7 @@ public abstract class Foo {
   /**
    * Some comments ...
    */
-  public int m7() {return 1;}  // Violation. No required javadoc.
+  public int m7() {return 1;}  // violation
 
   /**
    * This
@@ -339,8 +356,8 @@ public abstract class Foo {
    */
   public int m8() {return 2;}  // OK. Have required javadoc.
 
-  @Override
-  public String toString() {  // Violation. No required javadoc.
+  @Override                    // violation
+  public String toString() {
     return &quot;&quot;;
   }
 }
diff --git a/src/xdocs/checks/design/designforextension.xml.template b/src/xdocs/checks/design/designforextension.xml.template
index 6300cc4b320..50fbe3fa2ca 100644
--- a/src/xdocs/checks/design/designforextension.xml.template
+++ b/src/xdocs/checks/design/designforextension.xml.template
@@ -127,224 +127,79 @@ public abstract class Plant {
 }
         </source>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>ignoredAnnotations</td>
-              <td>
-                Specify annotations which allow the check to skip the method from validation.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>After, AfterClass, Before, BeforeClass, Test</code></td>
-              <td>7.2</td>
-            </tr>
-            <tr>
-              <td>requiredJavadocPhrase</td>
-              <td>
-                Specify the comment text pattern which qualifies a method as designed for
-                extension. Supports multi-line regex.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>8.40</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java"/>
+          </macro>
         </div>
       </subsection>
+
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
-        <source>
-&lt;module name="DesignForExtension"/&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}  // OK. Private method.
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // OK. Have javadoc on overridable method.
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-  @Override
-  public String toString() {  // Violation. No javadoc for @Override method.
-    return "";
-  }
-}
-        </source>
-        <p>
+        <p id="Example2-config">
           To configure the check to allow methods which have @Override annotations to be
           designed for extension.
         </p>
-        <source>
-&lt;module name="DesignForExtension"&gt;
-  &lt;property name="ignoredAnnotations" value="Override"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}  // OK. Private method.
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // OK. Have javadoc on overridable method.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // OK. Have javadoc on overridable method.
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example2.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-  @Override
-  public String toString() {  // OK. Have javadoc on overridable method.
-    return "";
-  }
-}
-        </source>
-        <p>To configure the check to allow methods which contain a specified comment text pattern in
+        <p id="Example3-config">
+          To configure the check to allow methods which contain a specified comment text pattern in
           their javadoc to be designed for extension.
         </p>
-        <source>
-&lt;module name="DesignForExtension"&gt;
-  &lt;property name="requiredJavadocPhrase" value="This implementation"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}  // OK. Private method.
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have required javadoc.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // Violation. No required javadoc.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // Violation. No required javadoc.
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example3.java"/>
+            <param name="type" value="code"/>
+        </macro>
 
-  @Override
-  public String toString() {  // Violation. No required javadoc.
-    return "";
-  }
-}
-        </source>
-        <p>
+        <p id="Example4-config">
           To configure the check to allow methods which contain a specified comment text pattern in
           their javadoc which can span multiple lines to be designed for extension.
         </p>
-        <source>
-&lt;module name="DesignForExtension"&gt;
-  &lt;property name="requiredJavadocPhrase"
-    value="This[\s\S]*implementation"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>Example:</p>
-        <source>
-public abstract class Foo {
-  private int bar;
-
-  public int m1() {return 2;}  // Violation. No javadoc.
-
-  public int m2() {return 8;}  // Violation. No javadoc.
-
-  private void m3() {m4();}
-
-  protected void m4() { }  // OK. No implementation.
-
-  public abstract void m5();  // OK. Abstract method.
-
-  /**
-   * This implementation ...
-   @return some int value.
-   */
-  public int m6() {return 1;}  // OK. Have required javadoc.
-
-  /**
-   * Some comments ...
-   */
-  public int m7() {return 1;}  // Violation. No required javadoc.
-
-  /**
-   * This
-   * implementation ...
-   */
-  public int m8() {return 2;}  // OK. Have required javadoc.
-
-  @Override
-  public String toString() {  // Violation. No required javadoc.
-    return "";
-  }
-}
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/design/designforextension/Example4.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/design/finalclass.xml b/src/xdocs/checks/design/finalclass.xml
index ed31a0bc8f6..6a54c3ca646 100644
--- a/src/xdocs/checks/design/finalclass.xml
+++ b/src/xdocs/checks/design/finalclass.xml
@@ -35,56 +35,64 @@
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
         <source>
-&lt;module name=&quot;FinalClass&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;FinalClass&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>
-            Example:
-        </p>
+        <p id="Example1-code">Example:</p>
         <source>
-final class MyClass { // OK
-  private MyClass() { }
-}
-
-class MyClass { // violation, class should be declared final
-  private MyClass() { }
-}
+public class Example1 { // ok, since it has a public constructor
 
-class MyClass { // OK, since it has a public constructor
-  int field1;
-  String field2;
-  private MyClass(int value) {
-    this.field1 = value;
-    this.field2 = &quot; &quot;;
+  final class A {
+    private A() {
+    }
   }
-  public MyClass(String value) {
-    this.field2 = value;
-    this.field1 = 0;
+
+  class B { // violation, 'Class B should be declared as final.'
+    private B() {
+    }
   }
-}
 
-class TestAnonymousInnerClasses { // OK, class has an anonymous inner class.
-    public static final TestAnonymousInnerClasses ONE = new TestAnonymousInnerClasses() {
+  class C { // ok, since it has a public constructor
+    int field1;
+    String field2;
 
-    };
+    private C(int value) {
+      this.field1 = value;
+      this.field2 = &quot; &quot;;
+    }
 
-    private TestAnonymousInnerClasses() {
+    public C(String value) {
+      this.field2 = value;
+      this.field1 = 0;
     }
-}
+  }
 
-class Class1 {
+  class AnonymousInner { // ok, class has an anonymous inner class.
+    public final AnonymousInner ONE
+            = new AnonymousInner() {
+            };
 
-    private class Class2 { // violation, class should be declared final
+    private AnonymousInner() {
     }
+  }
+
+  class Class1 {
 
-    public class Class3 { // ok
+    private class Class2 { // violation, 'Class Class2 should be declared as final'
     }
 
-}
+    public class Class3 {
+    }
 
+  }
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/design/finalclass.xml.template b/src/xdocs/checks/design/finalclass.xml.template
index c010c3bddc0..ccb1e9c6654 100644
--- a/src/xdocs/checks/design/finalclass.xml.template
+++ b/src/xdocs/checks/design/finalclass.xml.template
@@ -35,57 +35,20 @@
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
-        <source>
-&lt;module name="FinalClass"/&gt;
-        </source>
-        <p>
-            Example:
-        </p>
-        <source>
-final class MyClass { // OK
-  private MyClass() { }
-}
-
-class MyClass { // violation, class should be declared final
-  private MyClass() { }
-}
-
-class MyClass { // OK, since it has a public constructor
-  int field1;
-  String field2;
-  private MyClass(int value) {
-    this.field1 = value;
-    this.field2 = " ";
-  }
-  public MyClass(String value) {
-    this.field2 = value;
-    this.field1 = 0;
-  }
-}
-
-class TestAnonymousInnerClasses { // OK, class has an anonymous inner class.
-    public static final TestAnonymousInnerClasses ONE = new TestAnonymousInnerClasses() {
-
-    };
-
-    private TestAnonymousInnerClasses() {
-    }
-}
-
-class Class1 {
-
-    private class Class2 { // violation, class should be declared final
-    }
-
-    public class Class3 { // ok
-    }
-
-}
-
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/design/hideutilityclassconstructor.xml b/src/xdocs/checks/design/hideutilityclassconstructor.xml
index 541a77233ab..cfe453eee81 100644
--- a/src/xdocs/checks/design/hideutilityclassconstructor.xml
+++ b/src/xdocs/checks/design/hideutilityclassconstructor.xml
@@ -43,19 +43,21 @@ public class StringUtils // not final to allow subclassing
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
         <source>
-&lt;module name=&quot;HideUtilityClassConstructor&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;HideUtilityClassConstructor&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
+        <p id="Example1-code">Example:</p>
         <source>
-class Test { // violation, class only has a static method and a constructor
+class Example1 { // violation
 
-  public Test() {
+  public Example1() {
   }
 
   public static void fun() {
@@ -78,7 +80,7 @@ class Bar { // OK
   }
 }
 
-class UtilityClass { // violation, class only has a static field
+class UtilityClass { // violation
 
   static float f;
 }
diff --git a/src/xdocs/checks/design/hideutilityclassconstructor.xml.template b/src/xdocs/checks/design/hideutilityclassconstructor.xml.template
index e93be91cb48..ee91c5b509e 100644
--- a/src/xdocs/checks/design/hideutilityclassconstructor.xml.template
+++ b/src/xdocs/checks/design/hideutilityclassconstructor.xml.template
@@ -43,46 +43,20 @@ public class StringUtils // not final to allow subclassing
       </subsection>
 
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the check:
         </p>
-        <source>
-&lt;module name="HideUtilityClassConstructor"/&gt;
-        </source>
-        <p>
-          Example:
-        </p>
-        <source>
-class Test { // violation, class only has a static method and a constructor
-
-  public Test() {
-  }
-
-  public static void fun() {
-  }
-}
-
-class Foo { // OK
-
-  private Foo() {
-  }
-
-  static int n;
-}
-
-class Bar { // OK
-
-  protected Bar() {
-    // prevents calls from subclass
-    throw new UnsupportedOperationException();
-  }
-}
-
-class UtilityClass { // violation, class only has a static field
-
-  static float f;
-}
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                   value="resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/Example1.java"/>
+            <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/design/innertypelast.xml b/src/xdocs/checks/design/innertypelast.xml
index 4640ab71b81..1b347186025 100644
--- a/src/xdocs/checks/design/innertypelast.xml
+++ b/src/xdocs/checks/design/innertypelast.xml
@@ -29,22 +29,22 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-class Test {
-    private String s; // OK
-    class InnerTest1 {}
-    public void test() {} // violation, method should be declared before inner types.
+class Test1 {
+  private String s;
+  class InnerTest1 {}
+  public void test() {} // violation
 }
 
 class Test2 {
-    static {}; // OK
-    class InnerTest1 {}
-    public Test2() {} // violation, constructor should be declared before inner types.
+  static {};
+  class InnerTest1 {}
+  public Test2() {} // violation
 }
 
-class Test3 {
-    private String s; // OK
-    public void test() {} // OK
-    class InnerTest1 {}
+class Example1 {
+  private String s;
+  public void test() {}
+  class InnerTest1 {}
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/design/innertypelast.xml.template b/src/xdocs/checks/design/innertypelast.xml.template
index 25193a031ca..5c5ce920983 100644
--- a/src/xdocs/checks/design/innertypelast.xml.template
+++ b/src/xdocs/checks/design/innertypelast.xml.template
@@ -22,13 +22,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/innertypelast/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/design/interfaceistype.xml b/src/xdocs/checks/design/interfaceistype.xml
index d132b469b60..c8fe945999b 100644
--- a/src/xdocs/checks/design/interfaceistype.xml
+++ b/src/xdocs/checks/design/interfaceistype.xml
@@ -41,10 +41,7 @@
             </tr>
             <tr>
               <td>allowMarkerInterfaces</td>
-              <td>
-                Control whether marker interfaces like Serializable are
-                allowed.
-              </td>
+              <td>Control whether marker interfaces like Serializable are allowed.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.1</td>
@@ -66,17 +63,21 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-public interface Test1 { // violation
+class Example1 {
+  // violation below, 'interfaces should describe a type and hence have methods.'
+  interface Test1 {
     int a = 3;
-}
+  }
 
-public interface Test2 { // OK
+  // ok below, because marker interfaces are allowed by default.
+  interface Test2 {
 
-}
+  }
 
-public interface Test3 { // OK
+  interface Test3 { // ok, because it has a method.
     int a = 3;
     void test();
+  }
 }
         </source>
         <p id="Example2-config">
@@ -93,12 +94,21 @@ public interface Test3 { // OK
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-public interface Test1 { // violation
+class Example2 {
+  // violation below, 'interfaces should describe a type and hence have methods.'
+  interface Test1 {
     int a = 3;
-}
+  }
 
-public interface Test2 { // violation
+  // violation below, 'interfaces should describe a type and hence have methods.'
+  interface Test2 {
 
+  }
+
+  interface Test3 { // ok, because it has a method.
+    int a = 3;
+    void test();
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/design/interfaceistype.xml.template b/src/xdocs/checks/design/interfaceistype.xml.template
index d42ddb544b5..6feaa2658aa 100644
--- a/src/xdocs/checks/design/interfaceistype.xml.template
+++ b/src/xdocs/checks/design/interfaceistype.xml.template
@@ -31,25 +31,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowMarkerInterfaces</td>
-              <td>
-                Control whether marker interfaces like Serializable are
-                allowed.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.1</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -59,13 +44,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -73,13 +58,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/interfaceistype/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/design/mutableexception.xml b/src/xdocs/checks/design/mutableexception.xml
index f854487c46f..6d877ca8760 100644
--- a/src/xdocs/checks/design/mutableexception.xml
+++ b/src/xdocs/checks/design/mutableexception.xml
@@ -44,18 +44,18 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>format</td>
-              <td>Specify pattern for exception class names.</td>
+              <td>extendedClassNameFormat</td>
+              <td>Specify pattern for extended class names.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^.*Exception$|^.*Error$|^.*Throwable$&quot;</code></td>
-              <td>3.2</td>
+              <td>6.2</td>
             </tr>
             <tr>
-              <td>extendedClassNameFormat</td>
-              <td>Specify pattern for extended class names.</td>
+              <td>format</td>
+              <td>Specify pattern for exception class names.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^.*Exception$|^.*Error$|^.*Throwable$&quot;</code></td>
-              <td>6.2</td>
+              <td>3.2</td>
             </tr>
           </table>
         </div>
@@ -74,36 +74,36 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-class FirstClass extends Exception {
+class Example1 extends Exception {
   private int code; // OK, class name doesn't match with default pattern
 
-  public FirstClass() {
+  public Example1() {
     code = 1;
   }
 }
 
-class MyException extends Exception {
-  private int code; // violation, The field 'code' must be declared final
+class FirstException extends Exception {
+  private int code; // violation
 
-  public MyException() {
+  public FirstException() {
     code = 2;
   }
 }
 
-class MyThrowable extends Throwable {
+class FirstThrowable extends Throwable {
   final int code; // OK
-  String message; // violation, The field 'message' must be declared final
+  String message; // violation
 
-  public MyThrowable(int code, String message) {
+  public FirstThrowable(int code, String message) {
     this.code = code;
     this.message = message;
   }
 }
 
-class BadException extends java.lang.Exception {
-  int code; // violation, The field 'code' must be declared final
+class FirstBadException extends java.lang.Exception {
+  int code; // violation
 
-  public BadException(int code) {
+  public FirstBadException(int code) {
     this.code = code;
   }
 }
@@ -124,36 +124,36 @@ class BadException extends java.lang.Exception {
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-class FirstClass extends Exception {
+class Example2 extends Exception {
   private int code; // OK, class name doesn't match with given pattern
 
-  public FirstClass() {
+  public Example2() {
     code = 1;
   }
 }
 
-class MyException extends Exception {
-  private int code; // violation, The field 'code' must be declared final
+class SecondException extends Exception {
+  private int code; // violation
 
-  public MyException() {
+  public SecondException() {
     code = 2;
   }
 }
 
-class MyThrowable extends Throwable {
+class SecondThrowable extends Throwable {
   final int code; // OK, class name doesn't match with given pattern
   String message; // OK, class name doesn't match with given pattern
 
-  public MyThrowable(int code, String message) {
+  public SecondThrowable(int code, String message) {
     this.code = code;
     this.message = message;
   }
 }
 
-class BadException extends java.lang.Exception {
-  int code; // violation, The field 'code' must be declared final
+class SecondBadException extends java.lang.Exception {
+  int code; // violation
 
-  public BadException(int code) {
+  public SecondBadException(int code) {
     this.code = code;
   }
 }
@@ -174,36 +174,36 @@ class BadException extends java.lang.Exception {
         </source>
         <p id="Example3-code">Example:</p>
         <source>
-class FirstClass extends Exception {
+class Example3 extends Exception {
   private int code; // OK, extended class name doesn't match with given pattern
 
-  public FirstClass() {
+  public Example3() {
     code = 1;
   }
 }
 
-class MyException extends Exception {
+class ThirdException extends Exception {
   private int code; // OK, extended class name doesn't match with given pattern
 
-  public MyException() {
+  public ThirdException() {
     code = 2;
   }
 }
 
-class MyThrowable extends Throwable {
+class ThirdThrowable extends Throwable {
   final int code; // OK
-  String message; // violation, The field 'message' must be declared final
+  String message; // violation
 
-  public MyThrowable(int code, String message) {
+  public ThirdThrowable(int code, String message) {
     this.code = code;
     this.message = message;
   }
 }
 
-class BadException extends java.lang.Exception {
+class ThirdBadException extends java.lang.Exception {
   int code; // OK, extended class name doesn't match with given pattern
 
-  public BadException(int code) {
+  public ThirdBadException(int code) {
     this.code = code;
   }
 }
diff --git a/src/xdocs/checks/design/mutableexception.xml.template b/src/xdocs/checks/design/mutableexception.xml.template
index 36c4d6b7765..0f3638556d9 100644
--- a/src/xdocs/checks/design/mutableexception.xml.template
+++ b/src/xdocs/checks/design/mutableexception.xml.template
@@ -35,29 +35,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify pattern for exception class names.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^.*Exception$|^.*Error$|^.*Throwable$"</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>extendedClassNameFormat</td>
-              <td>Specify pattern for extended class names.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^.*Exception$|^.*Error$|^.*Throwable$"</code></td>
-              <td>6.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -67,13 +48,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
 
@@ -83,13 +64,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
 
@@ -99,13 +80,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/design/mutableexception/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/design/throwscount.xml b/src/xdocs/checks/design/throwscount.xml
index a8020919004..0698d217115 100644
--- a/src/xdocs/checks/design/throwscount.xml
+++ b/src/xdocs/checks/design/throwscount.xml
@@ -46,13 +46,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify maximum allowed number of throws statements.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>3.2</td>
-            </tr>
             <tr>
               <td>ignorePrivateMethods</td>
               <td>Allow private methods to be ignored.</td>
@@ -60,6 +53,13 @@
               <td><code>true</code></td>
               <td>6.7</td>
             </tr>
+            <tr>
+              <td>max</td>
+              <td>Specify maximum allowed number of throws statements.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>4</code></td>
+              <td>3.2</td>
+            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/design/throwscount.xml.template b/src/xdocs/checks/design/throwscount.xml.template
index b8805ab8e77..f1a7b332e19 100644
--- a/src/xdocs/checks/design/throwscount.xml.template
+++ b/src/xdocs/checks/design/throwscount.xml.template
@@ -38,29 +38,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify maximum allowed number of throws statements.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>ignorePrivateMethods</td>
-              <td>Allow private methods to be ignored.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.7</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/design/visibilitymodifier.xml b/src/xdocs/checks/design/visibilitymodifier.xml
index 5197d89fa57..394eafce411 100644
--- a/src/xdocs/checks/design/visibilitymodifier.xml
+++ b/src/xdocs/checks/design/visibilitymodifier.xml
@@ -88,27 +88,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>packageAllowed</td>
-              <td>Control whether package visible members are allowed.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>protectedAllowed</td>
-              <td>Control whether protected members are allowed.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>publicMemberPattern</td>
-              <td>Specify pattern for public members that should be ignored.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^serialVersionUID$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>allowPublicFinalFields</td>
               <td>Allow final fields to be declared as public.</td>
@@ -123,28 +102,40 @@
               <td><code>false</code></td>
               <td>6.4</td>
             </tr>
+            <tr>
+              <td>ignoreAnnotationCanonicalNames</td>
+              <td>Specify annotations canonical names which ignore variables in consideration.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>com.google.common.annotations.VisibleForTesting, org.junit.ClassRule, org.junit.Rule</code></td>
+              <td>6.5</td>
+            </tr>
             <tr>
               <td>immutableClassCanonicalNames</td>
               <td>Specify immutable classes canonical names.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>java.io.File, java.lang.Boolean, java.lang.Byte, java.lang.Character,
-                java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long,
-                java.lang.Short, java.lang.StackTraceElement, java.lang.String,
-                java.math.BigDecimal, java.math.BigInteger, java.net.Inet4Address,
-                java.net.Inet6Address, java.net.InetSocketAddress, java.net.URI,
-                java.net.URL, java.util.Locale, java.util.UUID</code></td>
+              <td><code>java.io.File, java.lang.Boolean, java.lang.Byte, java.lang.Character, java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long, java.lang.Short, java.lang.StackTraceElement, java.lang.String, java.math.BigDecimal, java.math.BigInteger, java.net.Inet4Address, java.net.Inet6Address, java.net.InetSocketAddress, java.net.URI, java.net.URL, java.util.Locale, java.util.UUID</code></td>
               <td>6.4.1</td>
             </tr>
             <tr>
-              <td>ignoreAnnotationCanonicalNames</td>
-              <td>
-                Specify annotations canonical names which ignore variables in
-                consideration.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>com.google.common.annotations.VisibleForTesting,
-                org.junit.ClassRule, org.junit.Rule</code></td>
-              <td>6.5</td>
+              <td>packageAllowed</td>
+              <td>Control whether package visible members are allowed.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>3.0</td>
+            </tr>
+            <tr>
+              <td>protectedAllowed</td>
+              <td>Control whether protected members are allowed.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>3.0</td>
+            </tr>
+            <tr>
+              <td>publicMemberPattern</td>
+              <td>Specify pattern for public members that should be ignored.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^serialVersionUID$&quot;</code></td>
+              <td>3.0</td>
             </tr>
           </table>
         </div>
diff --git a/src/xdocs/checks/design/visibilitymodifier.xml.template b/src/xdocs/checks/design/visibilitymodifier.xml.template
index cc697c59d48..1272add9885 100644
--- a/src/xdocs/checks/design/visibilitymodifier.xml.template
+++ b/src/xdocs/checks/design/visibilitymodifier.xml.template
@@ -80,73 +80,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>packageAllowed</td>
-              <td>Control whether package visible members are allowed.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>protectedAllowed</td>
-              <td>Control whether protected members are allowed.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>publicMemberPattern</td>
-              <td>Specify pattern for public members that should be ignored.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^serialVersionUID$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>allowPublicFinalFields</td>
-              <td>Allow final fields to be declared as public.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>7.0</td>
-            </tr>
-            <tr>
-              <td>allowPublicImmutableFields</td>
-              <td>Allow immutable fields to be declared as public if defined in final class.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.4</td>
-            </tr>
-            <tr>
-              <td>immutableClassCanonicalNames</td>
-              <td>Specify immutable classes canonical names.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>java.io.File, java.lang.Boolean, java.lang.Byte, java.lang.Character,
-                java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long,
-                java.lang.Short, java.lang.StackTraceElement, java.lang.String,
-                java.math.BigDecimal, java.math.BigInteger, java.net.Inet4Address,
-                java.net.Inet6Address, java.net.InetSocketAddress, java.net.URI,
-                java.net.URL, java.util.Locale, java.util.UUID</code></td>
-              <td>6.4.1</td>
-            </tr>
-            <tr>
-              <td>ignoreAnnotationCanonicalNames</td>
-              <td>
-                Specify annotations canonical names which ignore variables in
-                consideration.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>com.google.common.annotations.VisibleForTesting,
-                org.junit.ClassRule, org.junit.Rule</code></td>
-              <td>6.5</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/header/header.xml b/src/xdocs/checks/header/header.xml
index 930110bb1b6..fda1065df45 100644
--- a/src/xdocs/checks/header/header.xml
+++ b/src/xdocs/checks/header/header.xml
@@ -57,36 +57,34 @@ line 5: ////////////////////////////////////////////////////////////////////
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>headerFile</td>
-              <td>Specify the name of the file containing the required header.</td>
-              <td><a href="../../property_types.html#URI">URI</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
             <tr>
               <td>charset</td>
               <td>Specify the character encoding to use when reading the headerFile.</td>
               <td><a href="../../property_types.html#String">String</a></td>
-              <td>
-                <code>
-                  the charset property of the parent<a href="../../config.html#Checker">
-                  Checker</a> module
-                </code>
-              </td>
+              <td><code>the charset property of the parent &lt;a href=&quot;https://checkstyle.org/config.html#Checker&quot;&gt;Checker&lt;/a&gt; module</code></td>
               <td>5.0</td>
             </tr>
+            <tr>
+              <td>fileExtensions</td>
+              <td>Specify the file extensions of the files to process.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>all files</code></td>
+              <td>6.9</td>
+            </tr>
             <tr>
               <td>header</td>
-              <td>
-                Specify the required header specified inline. Individual header lines
-                must be separated by the string <code>&quot;\n&quot;</code> (even on platforms with
-                a different line separator), see examples below.
-              </td>
+              <td>Specify the required header specified inline. Individual header lines must be separated by the string <code>"\n"</code>(even on platforms with a different line separator).</td>
               <td><a href="../../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>5.0</td>
             </tr>
+            <tr>
+              <td>headerFile</td>
+              <td>Specify the name of the file containing the required header.</td>
+              <td><a href="../../property_types.html#URI">URI</a></td>
+              <td><code>null</code></td>
+              <td>3.2</td>
+            </tr>
             <tr>
               <td>ignoreLines</td>
               <td>Specify the line numbers to ignore.</td>
@@ -94,13 +92,6 @@ line 5: ////////////////////////////////////////////////////////////////////
               <td><code>{}</code></td>
               <td>3.2</td>
             </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>6.9</td>
-            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/header/header.xml.template b/src/xdocs/checks/header/header.xml.template
index 36db7b80d74..143b4ce1ebc 100644
--- a/src/xdocs/checks/header/header.xml.template
+++ b/src/xdocs/checks/header/header.xml.template
@@ -49,59 +49,10 @@ line 5: ////////////////////////////////////////////////////////////////////
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>headerFile</td>
-              <td>Specify the name of the file containing the required header.</td>
-              <td><a href="../../property_types.html#URI">URI</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>charset</td>
-              <td>Specify the character encoding to use when reading the headerFile.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td>
-                <code>
-                  the charset property of the parent<a href="../../config.html#Checker">
-                  Checker</a> module
-                </code>
-              </td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>header</td>
-              <td>
-                Specify the required header specified inline. Individual header lines
-                must be separated by the string <code>"\n"</code> (even on platforms with
-                a different line separator), see examples below.
-              </td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>ignoreLines</td>
-              <td>Specify the line numbers to ignore.</td>
-              <td><a href="../../property_types.html#int.5B.5D">int[]</a></td>
-              <td><code>{}</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>6.9</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/header/regexpheader.xml b/src/xdocs/checks/header/regexpheader.xml
index 1937b1b47e3..effa8b95eb9 100644
--- a/src/xdocs/checks/header/regexpheader.xml
+++ b/src/xdocs/checks/header/regexpheader.xml
@@ -96,38 +96,34 @@ line 6: ^\W*$
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>headerFile</td>
-              <td>Specify the name of the file containing the required header.</td>
-              <td><a href="../../property_types.html#URI">URI</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
             <tr>
               <td>charset</td>
               <td>Specify the character encoding to use when reading the headerFile.</td>
               <td><a href="../../property_types.html#String">String</a></td>
-              <td>
-                <code>
-                  the charset property of the parent<a href="../../config.html#Checker">
-                  Checker</a> module
-                </code>
-              </td>
+              <td><code>the charset property of the parent &lt;a href=&quot;https://checkstyle.org/config.html#Checker&quot;&gt;Checker&lt;/a&gt; module</code></td>
               <td>5.0</td>
             </tr>
+            <tr>
+              <td>fileExtensions</td>
+              <td>Specify the file extensions of the files to process.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>all files</code></td>
+              <td>6.9</td>
+            </tr>
             <tr>
               <td>header</td>
-              <td>
-                Define the required header specified inline. Individual header lines
-                must be separated by the string <code>&quot;\n&quot;</code> (even on platforms with
-                a different line separator). For header lines containing
-                <code>&quot;\n\n&quot;</code> checkstyle will forcefully expect an empty line to
-                exist. See examples below. Regular expressions must not span multiple lines.
-              </td>
+              <td>Define the required header specified inline. Individual header lines must be separated by the string <code>"\n"</code> (even on platforms with a different line separator). For header lines containing <code>"\n\n"</code> checkstyle will forcefully expect an empty line to exist. See examples below. Regular expressions must not span multiple lines.</td>
               <td><a href="../../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>5.0</td>
             </tr>
+            <tr>
+              <td>headerFile</td>
+              <td>Specify the name of the file containing the required header.</td>
+              <td><a href="../../property_types.html#URI">URI</a></td>
+              <td><code>null</code></td>
+              <td>3.2</td>
+            </tr>
             <tr>
               <td>multiLines</td>
               <td>Specify the line numbers to repeat (zero or more times).</td>
@@ -135,13 +131,6 @@ line 6: ^\W*$
               <td><code>{}</code></td>
               <td>3.4</td>
             </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>6.9</td>
-            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/header/regexpheader.xml.template b/src/xdocs/checks/header/regexpheader.xml.template
index 33d3b957ebf..cc0d326df77 100644
--- a/src/xdocs/checks/header/regexpheader.xml.template
+++ b/src/xdocs/checks/header/regexpheader.xml.template
@@ -88,61 +88,10 @@ line 6: ^\W*$
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>headerFile</td>
-              <td>Specify the name of the file containing the required header.</td>
-              <td><a href="../../property_types.html#URI">URI</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>charset</td>
-              <td>Specify the character encoding to use when reading the headerFile.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td>
-                <code>
-                  the charset property of the parent<a href="../../config.html#Checker">
-                  Checker</a> module
-                </code>
-              </td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>header</td>
-              <td>
-                Define the required header specified inline. Individual header lines
-                must be separated by the string <code>"\n"</code> (even on platforms with
-                a different line separator). For header lines containing
-                <code>"\n\n"</code> checkstyle will forcefully expect an empty line to
-                exist. See examples below. Regular expressions must not span multiple lines.
-              </td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>multiLines</td>
-              <td>Specify the line numbers to repeat (zero or more times).</td>
-              <td><a href="../../property_types.html#int.5B.5D">int[]</a></td>
-              <td><code>{}</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>6.9</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/header/RegexpHeaderCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/imports/avoidstarimport.xml b/src/xdocs/checks/imports/avoidstarimport.xml
index fa1468c95d7..8082f7a830b 100644
--- a/src/xdocs/checks/imports/avoidstarimport.xml
+++ b/src/xdocs/checks/imports/avoidstarimport.xml
@@ -38,37 +38,27 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>excludes</td>
-              <td>
-                Specify packages where starred class imports are
-                allowed and classes where starred static member imports are
-                allowed.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>3.2</td>
-            </tr>
             <tr>
               <td>allowClassImports</td>
-              <td>
-                Control whether to allow starred class imports like
-                <code>import java.util.*;</code>.
-              </td>
+              <td>Control whether to allow starred class imports like <code>import java.util.*;</code>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.3</td>
             </tr>
             <tr>
               <td>allowStaticMemberImports</td>
-              <td>
-                Control whether to allow starred static member imports like
-                <code>import static org.junit.Assert.*;</code>.
-              </td>
+              <td>Control whether to allow starred static member imports like <code>import static org.junit.Assert.*;</code>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.3</td>
             </tr>
+            <tr>
+              <td>excludes</td>
+              <td>Specify packages where starred class imports are allowed and classes where starred static member imports are allowed.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>{}</code></td>
+              <td>3.2</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -88,7 +78,7 @@
           Example:
         </p>
         <source>
-import java.util.Scanner;         // OK
+import java.util.Scanner;
 import java.io.*;                 // violation
 import static java.lang.Math.*;   // violation
 import java.util.*;               // violation
@@ -112,11 +102,11 @@ import java.net.*;                // violation
           Example:
         </p>
         <source>
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
-import static java.lang.Math.*;   // OK
+import java.util.Scanner;
+import java.io.*;
+import static java.lang.Math.*;
 import java.util.*;               // violation
-import java.net.*;                // OK
+import java.net.*;
         </source>
         <p id="Example3-config">
           To configure the check so that star imports
@@ -135,11 +125,11 @@ import java.net.*;                // OK
           Example:
         </p>
         <source>
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
+import java.util.Scanner;
+import java.io.*;
 import static java.lang.Math.*;   // violation
-import java.util.*;               // OK
-import java.net.*;                // OK
+import java.util.*;
+import java.net.*;
         </source>
         <p id="Example4-config">
           To configure the check so that starred static member imports
@@ -158,9 +148,9 @@ import java.net.*;                // OK
           Example:
         </p>
         <source>
-import java.util.Scanner;         // OK
+import java.util.Scanner;
 import java.io.*;                 // violation
-import static java.lang.Math.*;   // OK
+import static java.lang.Math.*;
 import java.util.*;               // violation
 import java.net.*;                // violation
         </source>
@@ -182,11 +172,11 @@ import java.net.*;                // violation
           Example:
         </p>
         <source>
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
+import java.util.Scanner;
+import java.io.*;
 import static java.lang.Math.*;   // violation
-import java.util.*;               // OK
-import java.net.*;                // OK
+import java.util.*;
+import java.net.*;
         </source>
         <p id="Example6-config">
           To configure the check so that star imports from packages
@@ -207,11 +197,11 @@ import java.net.*;                // OK
           Example:
         </p>
         <source>
-import java.util.Scanner;         // OK
-import java.io.*;                 // OK
-import static java.lang.Math.*;   // OK
+import java.util.Scanner;
+import java.io.*;
+import static java.lang.Math.*;
 import java.util.*;               // violation
-import java.net.*;                // OK
+import java.net.*;
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/imports/avoidstarimport.xml.template b/src/xdocs/checks/imports/avoidstarimport.xml.template
index f8f23f77e44..8b51eb6a5e5 100644
--- a/src/xdocs/checks/imports/avoidstarimport.xml.template
+++ b/src/xdocs/checks/imports/avoidstarimport.xml.template
@@ -30,46 +30,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>excludes</td>
-              <td>
-                Specify packages where starred class imports are
-                allowed and classes where starred static member imports are
-                allowed.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>allowClassImports</td>
-              <td>
-                Control whether to allow starred class imports like
-                <code>import java.util.*;</code>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.3</td>
-            </tr>
-            <tr>
-              <td>allowStaticMemberImports</td>
-              <td>
-                Control whether to allow starred static member imports like
-                <code>import static org.junit.Assert.*;</code>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.3</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -79,7 +43,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -87,7 +51,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -97,7 +61,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -105,7 +69,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -114,7 +78,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">
@@ -122,7 +86,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example4-config">
@@ -131,7 +95,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example4-code">
@@ -139,7 +103,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example5-config">
@@ -148,7 +112,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example5-code">
@@ -156,7 +120,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example5.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example6-config">
@@ -166,7 +130,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example6-code">
@@ -174,7 +138,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstarimport/Example6.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/imports/avoidstaticimport.xml b/src/xdocs/checks/imports/avoidstaticimport.xml
index cb25a0e38b8..d4f50f61110 100644
--- a/src/xdocs/checks/imports/avoidstaticimport.xml
+++ b/src/xdocs/checks/imports/avoidstaticimport.xml
@@ -45,12 +45,7 @@
             </tr>
             <tr>
               <td>excludes</td>
-              <td>
-                Control whether to allow for certain classes via a star notation to be
-                excluded such as <code>java.lang.Math.*</code> or specific static
-                members to be excluded like <code>java.lang.System.out</code> for a variable or
-                <code>java.lang.Math.random</code> for a method. See notes section for details.
-              </td>
+              <td>Control whether to allow for certain classes via a star notation to be excluded such as <code>java.lang.Math.*</code> or specific static members to be excluded like <code>java.lang.System.out</code> for a variable or <code>java.lang.Math.random</code> for a method. See notes section for details.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>{}</code></td>
               <td>5.0</td>
diff --git a/src/xdocs/checks/imports/avoidstaticimport.xml.template b/src/xdocs/checks/imports/avoidstaticimport.xml.template
index 83d7d804c90..0f38a0b3b5f 100644
--- a/src/xdocs/checks/imports/avoidstaticimport.xml.template
+++ b/src/xdocs/checks/imports/avoidstaticimport.xml.template
@@ -35,27 +35,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>excludes</td>
-              <td>
-                Control whether to allow for certain classes via a star notation to be
-                excluded such as <code>java.lang.Math.*</code> or specific static
-                members to be excluded like <code>java.lang.System.out</code> for a variable or
-                <code>java.lang.Math.random</code> for a method. See notes section for details.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -65,7 +48,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -73,7 +56,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -82,7 +65,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -90,7 +73,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/avoidstaticimport/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/imports/customimportorder.xml b/src/xdocs/checks/imports/customimportorder.xml
index 41a2f327865..f04930ae4b6 100644
--- a/src/xdocs/checks/imports/customimportorder.xml
+++ b/src/xdocs/checks/imports/customimportorder.xml
@@ -66,7 +66,11 @@ import java.util.regex.Matcher; //#8
 
       <subsection name="Notes" id="Notes">
         <p>
-          Use the separator '###' between rules.
+          Rules are configured as a comma-separated ordered list.
+        </p>
+        <p>
+          Note: '###' group separator is deprecated (in favor of a comma-separated list),
+          but is currently supported for backward compatibility.
         </p>
         <p>
           To set RegExps for THIRD_PARTY_PACKAGE and STANDARD_JAVA_PACKAGE groups use
@@ -124,23 +128,23 @@ import com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck;
             </tr>
             <tr>
               <td>customImportOrderRules</td>
-              <td>Specify format of order declaration customizing by user.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>&quot;&quot;</code></td>
+              <td>Specify ordered list of import groups.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>{}</code></td>
               <td>5.8</td>
             </tr>
             <tr>
-              <td>standardPackageRegExp</td>
-              <td>Specify RegExp for STANDARD_JAVA_PACKAGE group imports.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^(java|javax)\.&quot;</code></td>
+              <td>separateLineBetweenGroups</td>
+              <td>Force empty line separator between import groups.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
               <td>5.8</td>
             </tr>
             <tr>
-              <td>thirdPartyPackageRegExp</td>
-              <td>Specify RegExp for THIRD_PARTY_PACKAGE group imports.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;.*&quot;</code></td>
+              <td>sortImportsInGroupAlphabetically</td>
+              <td>Force grouping alphabetically, in <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
               <td>5.8</td>
             </tr>
             <tr>
@@ -151,20 +155,17 @@ import com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck;
               <td>5.8</td>
             </tr>
             <tr>
-              <td>separateLineBetweenGroups</td>
-              <td>Force empty line separator between import groups.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
+              <td>standardPackageRegExp</td>
+              <td>Specify RegExp for STANDARD_JAVA_PACKAGE group imports.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^(java|javax)\.&quot;</code></td>
               <td>5.8</td>
             </tr>
             <tr>
-              <td>sortImportsInGroupAlphabetically</td>
-              <td>Force grouping alphabetically, in
-                <a href="https://en.wikipedia.org/wiki/ASCII#Order">
-                  ASCII sort order</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
+              <td>thirdPartyPackageRegExp</td>
+              <td>Specify RegExp for THIRD_PARTY_PACKAGE group imports.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;.*&quot;</code></td>
               <td>5.8</td>
             </tr>
           </table>
@@ -203,7 +204,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck; // OK
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, STANDARD_JAVA_PACKAGE, THIRD_PARTY_PACKAGE&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
 &lt;/module&gt;
@@ -232,7 +233,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck; // OK
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, STANDARD_JAVA_PACKAGE, THIRD_PARTY_PACKAGE&quot;/&gt;
       &lt;property name=&quot;standardPackageRegExp&quot; value=&quot;^java\.&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
@@ -263,7 +264,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck; // OK
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE&quot;/&gt;
       &lt;property name=&quot;thirdPartyPackageRegExp&quot; value=&quot;^com\.&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
@@ -293,7 +294,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck; // OK
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, SPECIAL_IMPORTS, STANDARD_JAVA_PACKAGE&quot;/&gt;
       &lt;property name=&quot;specialImportsRegExp&quot; value=&quot;^org\.&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
@@ -323,7 +324,7 @@ import org.apache.commons.io.FileUtils; // violation
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE&quot;/&gt;
       &lt;property name=&quot;specialImportsRegExp&quot; value=&quot;^org\.&quot;/&gt;
       &lt;property name=&quot;thirdPartyPackageRegExp&quot; value=&quot;^com\.&quot;/&gt;
       &lt;property name=&quot;separateLineBetweenGroups&quot; value=&quot;true&quot;/&gt;
@@ -354,7 +355,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck; // OK
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE&quot;/&gt;
       &lt;property name=&quot;specialImportsRegExp&quot; value=&quot;^org\.&quot;/&gt;
       &lt;property name=&quot;thirdPartyPackageRegExp&quot; value=&quot;^com\.&quot;/&gt;
       &lt;property name=&quot;separateLineBetweenGroups&quot; value=&quot;false&quot;/&gt;
@@ -399,7 +400,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck; // OK
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS&quot;/&gt;
+        value=&quot;STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS&quot;/&gt;
       &lt;property name=&quot;specialImportsRegExp&quot; value=&quot;^org\.&quot;/&gt;
       &lt;property name=&quot;sortImportsInGroupAlphabetically&quot; value=&quot;true&quot;/&gt;
       &lt;property name=&quot;separateLineBetweenGroups&quot; value=&quot;true&quot;/&gt;
@@ -438,7 +439,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck; // OK
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, STANDARD_JAVA_PACKAGE, SPECIAL_IMPORTS, THIRD_PARTY_PACKAGE&quot;/&gt;
       &lt;property name=&quot;specialImportsRegExp&quot; value=&quot;^org\.&quot;/&gt;
       &lt;property name=&quot;thirdPartyPackageRegExp&quot; value=&quot;^com\.&quot;/&gt;
       &lt;property name=&quot;sortImportsInGroupAlphabetically&quot; value=&quot;true&quot;/&gt;
@@ -485,7 +486,7 @@ import org.apache.commons.io.FileUtils;
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC&quot;/&gt;
+        value=&quot;THIRD_PARTY_PACKAGE, SPECIAL_IMPORTS, STANDARD_JAVA_PACKAGE, STATIC&quot;/&gt;
       &lt;property name=&quot;specialImportsRegExp&quot; value=&quot;^javax\.&quot;/&gt;
       &lt;property name=&quot;standardPackageRegExp&quot; value=&quot;^java\.&quot;/&gt;
       &lt;property name=&quot;sortImportsInGroupAlphabetically&quot; value=&quot;true&quot;/&gt;
@@ -553,7 +554,7 @@ import org.apache.commons.io.FileUtils; // should not be separated by line
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;STATIC###SAME_PACKAGE(3)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE&quot;/&gt;
+        value=&quot;STATIC, SAME_PACKAGE(3), THIRD_PARTY_PACKAGE, STANDARD_JAVA_PACKAGE&quot;/&gt;
       &lt;property name=&quot;thirdPartyPackageRegExp&quot; value=&quot;^(com|org)\.&quot;/&gt;
       &lt;property name=&quot;standardPackageRegExp&quot; value=&quot;^(java|javax)\.&quot;/&gt;
     &lt;/module&gt;
@@ -652,7 +653,7 @@ import android.*;
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;CustomImportOrder&quot;&gt;
       &lt;property name=&quot;customImportOrderRules&quot;
-        value=&quot;SAME_PACKAGE(3)###THIRD_PARTY_PACKAGE###STATIC###SPECIAL_IMPORTS&quot;/&gt;
+        value=&quot;SAME_PACKAGE(3), THIRD_PARTY_PACKAGE, STATIC, SPECIAL_IMPORTS&quot;/&gt;
       &lt;property name=&quot;specialImportsRegExp&quot; value=&quot;^android\.&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
diff --git a/src/xdocs/checks/imports/customimportorder.xml.template b/src/xdocs/checks/imports/customimportorder.xml.template
index 9be05116283..d391af72267 100644
--- a/src/xdocs/checks/imports/customimportorder.xml.template
+++ b/src/xdocs/checks/imports/customimportorder.xml.template
@@ -66,7 +66,11 @@ import java.util.regex.Matcher; //#8
 
       <subsection name="Notes" id="Notes">
         <p>
-          Use the separator '###' between rules.
+          Rules are configured as a comma-separated ordered list.
+        </p>
+        <p>
+          Note: '###' group separator is deprecated (in favor of a comma-separated list),
+          but is currently supported for backward compatibility.
         </p>
         <p>
           To set RegExps for THIRD_PARTY_PACKAGE and STANDARD_JAVA_PACKAGE groups use
@@ -114,60 +118,10 @@ import com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck;
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>customImportOrderRules</td>
-              <td>Specify format of order declaration customizing by user.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>""</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>standardPackageRegExp</td>
-              <td>Specify RegExp for STANDARD_JAVA_PACKAGE group imports.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^(java|javax)\."</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>thirdPartyPackageRegExp</td>
-              <td>Specify RegExp for THIRD_PARTY_PACKAGE group imports.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>specialImportsRegExp</td>
-              <td>Specify RegExp for SPECIAL_IMPORTS group imports.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^$"</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>separateLineBetweenGroups</td>
-              <td>Force empty line separator between import groups.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>sortImportsInGroupAlphabetically</td>
-              <td>Force grouping alphabetically, in
-                <a href="https://en.wikipedia.org/wiki/ASCII#Order">
-                  ASCII sort order</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/imports/illegalimport.xml b/src/xdocs/checks/imports/illegalimport.xml
index 271c9198f0a..46b1e64871a 100644
--- a/src/xdocs/checks/imports/illegalimport.xml
+++ b/src/xdocs/checks/imports/illegalimport.xml
@@ -35,39 +35,29 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>illegalPkgs</td>
-              <td>Specify packages to reject, if <b>regexp</b> property is not set, checks if import
-                is the part of package. If <b>regexp</b> property is set, then list of packages will
-                be interpreted as regular expressions. Note, all properties for match will be used.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>sun</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>illegalClasses</td>
-              <td>Specify class names to reject, if <b>regexp</b> property is not set, checks if
-                import equals class name. If <b>regexp</b> property is set, then list of class names
-                will be interpreted as regular expressions. Note, all properties for match will be
-                used.</td>
+              <td>Specify class names to reject, if <b>regexp</b> property is not set, checks if import equals class name. If <b>regexp</b> property is set, then list of class names will be interpreted as regular expressions. Note, all properties for match will be used.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>{}</code></td>
               <td>7.8</td>
             </tr>
+            <tr>
+              <td>illegalPkgs</td>
+              <td>Specify packages to reject, if <b>regexp</b> property is not set, checks if import is the part of package. If <b>regexp</b> property is set, then list of packages will be interpreted as regular expressions. Note, all properties for match will be used.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>sun</code></td>
+              <td>3.0</td>
+            </tr>
             <tr>
               <td>regexp</td>
-              <td>
-                Control whether the <code>illegalPkgs</code> and <code>illegalClasses</code>
-                should be interpreted as regular expressions.
-              </td>
+              <td>Control whether the <code>illegalPkgs</code> and <code>illegalClasses</code> should be interpreted as regular expressions.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>7.8</td>
             </tr>
           </table>
         </div>
-
       </subsection>
 
       <subsection name="Examples" id="Examples">
diff --git a/src/xdocs/checks/imports/illegalimport.xml.template b/src/xdocs/checks/imports/illegalimport.xml.template
index 577afbcfeef..a87f05f1dd8 100644
--- a/src/xdocs/checks/imports/illegalimport.xml.template
+++ b/src/xdocs/checks/imports/illegalimport.xml.template
@@ -27,47 +27,11 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>illegalPkgs</td>
-              <td>Specify packages to reject, if <b>regexp</b> property is not set, checks if import
-                is the part of package. If <b>regexp</b> property is set, then list of packages will
-                be interpreted as regular expressions. Note, all properties for match will be used.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>sun</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>illegalClasses</td>
-              <td>Specify class names to reject, if <b>regexp</b> property is not set, checks if
-                import equals class name. If <b>regexp</b> property is set, then list of class names
-                will be interpreted as regular expressions. Note, all properties for match will be
-                used.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>7.8</td>
-            </tr>
-            <tr>
-              <td>regexp</td>
-              <td>
-                Control whether the <code>illegalPkgs</code> and <code>illegalClasses</code>
-                should be interpreted as regular expressions.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>7.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java"/>
+          </macro>
         </div>
-
       </subsection>
 
       <subsection name="Examples" id="Examples">
diff --git a/src/xdocs/checks/imports/importcontrol.xml b/src/xdocs/checks/imports/importcontrol.xml
index 5b17aae2c8b..270d1537084 100644
--- a/src/xdocs/checks/imports/importcontrol.xml
+++ b/src/xdocs/checks/imports/importcontrol.xml
@@ -102,22 +102,14 @@
             </tr>
             <tr>
               <td>file</td>
-              <td>
-                Specify the location of the file containing the import control configuration.
-                It can be a regular file, URL or resource path. It will try loading
-                the path as a URL first, then as a file, and finally as a resource.
-              </td>
+              <td>Specify the location of the file containing the import control configuration. It can be a regular file, URL or resource path. It will try loading the path as a URL first, then as a file, and finally as a resource.</td>
               <td><a href="../../property_types.html#URI">URI</a></td>
               <td><code>null</code></td>
               <td>4.0</td>
             </tr>
             <tr>
               <td>path</td>
-              <td>
-                Specify the regular expression of file paths to which this check should apply. Files
-                that don't match the pattern will not be checked. The pattern will be matched
-                against the full absolute file path.
-              </td>
+              <td>Specify the regular expression of file paths to which this check should apply. Files that don't match the pattern will not be checked. The pattern will be matched against the full absolute file path.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;.*&quot;</code></td>
               <td>7.5</td>
diff --git a/src/xdocs/checks/imports/importcontrol.xml.template b/src/xdocs/checks/imports/importcontrol.xml.template
index c54477dede9..c4246becd15 100644
--- a/src/xdocs/checks/imports/importcontrol.xml.template
+++ b/src/xdocs/checks/imports/importcontrol.xml.template
@@ -92,37 +92,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>file</td>
-              <td>
-                Specify the location of the file containing the import control configuration.
-                It can be a regular file, URL or resource path. It will try loading
-                the path as a URL first, then as a file, and finally as a resource.
-              </td>
-              <td><a href="../../property_types.html#URI">URI</a></td>
-              <td><code>null</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>path</td>
-              <td>
-                Specify the regular expression of file paths to which this check should apply. Files
-                that don't match the pattern will not be checked. The pattern will be matched
-                against the full absolute file path.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>7.5</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/imports/importorder.xml b/src/xdocs/checks/imports/importorder.xml
index 2b660e6873a..596355a9bee 100644
--- a/src/xdocs/checks/imports/importorder.xml
+++ b/src/xdocs/checks/imports/importorder.xml
@@ -44,100 +44,64 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>option</td>
-              <td>specify policy on the relative order between type imports and static imports.</td>
-              <td><a href="../../property_types.html#ImportOrderOption">ImportOrderOption</a></td>
-              <td><code>under</code></td>
-              <td>5.0</td>
+              <td>caseSensitive</td>
+              <td>Control whether string comparison should be case-sensitive or not. Case-sensitive sorting is in <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>. It affects both type imports and static imports.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>3.3</td>
             </tr>
             <tr>
               <td>groups</td>
-              <td>
-                specify list of <b>type import</b> groups. Every group identified either by a
-                common prefix string, or by a regular expression enclosed
-                in forward slashes (e.g. <code>/regexp/</code>). All type imports,
-                which does not match any group, falls into an additional group, located at the end.
-                Thus, the empty list of type groups (the default value) means
-                one group for all type imports.
-              </td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
+              <td>Specify list of <b>type import</b> groups. Every group identified either by a common prefix string, or by a regular expression enclosed in forward slashes (e.g. <code>/regexp/</code>). All type imports, which does not match any group, falls into an additional group, located at the end. Thus, the empty list of type groups (the default value) means one group for all type imports.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>{}</code></td>
               <td>3.2</td>
             </tr>
+            <tr>
+              <td>option</td>
+              <td>Specify policy on the relative order between type imports and static imports.</td>
+              <td><a href="../../property_types.html#ImportOrderOption">ImportOrderOption</a></td>
+              <td><code>under</code></td>
+              <td>5.0</td>
+            </tr>
             <tr>
               <td>ordered</td>
-              <td>control whether type imports within each group should be sorted.
-                It doesn't affect sorting for static imports.</td>
+              <td>Control whether type imports within each group should be sorted. It doesn't affect sorting for static imports.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.2</td>
             </tr>
             <tr>
               <td>separated</td>
-              <td>
-                control whether type import groups should be separated by, at least, one
-                blank line or comment and aren't separated internally.
-                It doesn't affect separations for static imports.
-              </td>
+              <td>Control whether type import groups should be separated by, at least, one blank line or comment and aren't separated internally. It doesn't affect separations for static imports.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>3.2</td>
             </tr>
             <tr>
               <td>separatedStaticGroups</td>
-              <td>
-                control whether static import groups should be separated by, at least, one
-                blank line or comment and aren't separated internally.
-                This property has effect only when the property <code>option</code>
-                is set to <code>top</code> or <code>bottom</code> and when property
-                <code>staticGroups</code> is enabled.
-              </td>
+              <td>Control whether static import groups should be separated by, at least, one blank line or comment and aren't separated internally. This property has effect only when the property <code>option</code> is set to <code>top</code> or <code>bottom</code> and when property <code>staticGroups</code> is enabled.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.12</td>
             </tr>
             <tr>
-              <td>caseSensitive</td>
-              <td>control whether string comparison should be case-sensitive or not.
-                Case-sensitive sorting is in
-                <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>.
-                It affects both type imports and static imports.
-              </td>
+              <td>sortStaticImportsAlphabetically</td>
+              <td>Control whether <b>static imports</b> located at <b>top</b> or <b>bottom</b> are sorted within the group.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.3</td>
+              <td><code>false</code></td>
+              <td>6.5</td>
             </tr>
             <tr>
               <td>staticGroups</td>
-              <td>
-                specify list of <b>static</b> import groups. Every group identified either by a
-                common prefix string, or by a regular expression enclosed
-                in forward slashes (e.g. <code>/regexp/</code>). All static imports,
-                which does not match any group, fall into an additional group, located at the
-                end. Thus, the empty list of static groups (the default value) means
-                one group for all static imports. This property has effect only when
-                the property <code>option</code> is set to <code>top</code> or
-                <code>bottom</code>.
-              </td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
+              <td>Specify list of <b>static</b> import groups. Every group identified either by a common prefix string, or by a regular expression enclosed in forward slashes (e.g. <code>/regexp/</code>). All static imports, which does not match any group, fall into an additional group, located at the end. Thus, the empty list of static groups (the default value) means one group for all static imports. This property has effect only when the property <code>option</code> is set to <code>top</code> or <code>bottom</code>.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>{}</code></td>
               <td>8.12</td>
             </tr>
-            <tr>
-              <td>sortStaticImportsAlphabetically</td>
-              <td>
-                control whether <b>static imports</b> located at <b>top</b> or
-                <b>bottom</b> are sorted within the group.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.5</td>
-            </tr>
             <tr>
               <td>useContainerOrderingForStatic</td>
-              <td>
-                control whether to use container ordering (Eclipse IDE term) for static
-                imports or not.</td>
+              <td>Control whether to use container ordering (Eclipse IDE term) for static imports or not.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>7.1</td>
diff --git a/src/xdocs/checks/imports/importorder.xml.template b/src/xdocs/checks/imports/importorder.xml.template
index 1adc740c912..3aff06a2f8d 100644
--- a/src/xdocs/checks/imports/importorder.xml.template
+++ b/src/xdocs/checks/imports/importorder.xml.template
@@ -35,114 +35,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>specify policy on the relative order between type imports and static imports.</td>
-              <td><a href="../../property_types.html#ImportOrderOption">ImportOrderOption</a></td>
-              <td><code>under</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>groups</td>
-              <td>
-                specify list of <b>type import</b> groups. Every group identified either by a
-                common prefix string, or by a regular expression enclosed
-                in forward slashes (e.g. <code>/regexp/</code>). All type imports,
-                which does not match any group, falls into an additional group, located at the end.
-                Thus, the empty list of type groups (the default value) means
-                one group for all type imports.
-              </td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
-              <td><code>{}</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>ordered</td>
-              <td>control whether type imports within each group should be sorted.
-                It doesn't affect sorting for static imports.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>separated</td>
-              <td>
-                control whether type import groups should be separated by, at least, one
-                blank line or comment and aren't separated internally.
-                It doesn't affect separations for static imports.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>separatedStaticGroups</td>
-              <td>
-                control whether static import groups should be separated by, at least, one
-                blank line or comment and aren't separated internally.
-                This property has effect only when the property <code>option</code>
-                is set to <code>top</code> or <code>bottom</code> and when property
-                <code>staticGroups</code> is enabled.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>caseSensitive</td>
-              <td>control whether string comparison should be case-sensitive or not.
-                Case-sensitive sorting is in
-                <a href="https://en.wikipedia.org/wiki/ASCII#Order">ASCII sort order</a>.
-                It affects both type imports and static imports.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.3</td>
-            </tr>
-            <tr>
-              <td>staticGroups</td>
-              <td>
-                specify list of <b>static</b> import groups. Every group identified either by a
-                common prefix string, or by a regular expression enclosed
-                in forward slashes (e.g. <code>/regexp/</code>). All static imports,
-                which does not match any group, fall into an additional group, located at the
-                end. Thus, the empty list of static groups (the default value) means
-                one group for all static imports. This property has effect only when
-                the property <code>option</code> is set to <code>top</code> or
-                <code>bottom</code>.
-              </td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
-              <td><code>{}</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>sortStaticImportsAlphabetically</td>
-              <td>
-                control whether <b>static imports</b> located at <b>top</b> or
-                <b>bottom</b> are sorted within the group.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.5</td>
-            </tr>
-            <tr>
-              <td>useContainerOrderingForStatic</td>
-              <td>
-                control whether to use container ordering (Eclipse IDE term) for static
-                imports or not.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>7.1</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/imports/redundantimport.xml b/src/xdocs/checks/imports/redundantimport.xml
index 8923b5122f0..cd870f44707 100644
--- a/src/xdocs/checks/imports/redundantimport.xml
+++ b/src/xdocs/checks/imports/redundantimport.xml
@@ -44,15 +44,16 @@
             Example:
         </p>
         <source>
-package Test;
-import static Test.MyClass.*; // OK, static import
+import static com.puppycrawl.tools.checkstyle.checks.imports.redundantimport.Example1.*; // OK, static import
 import static java.lang.Integer.MAX_VALUE; // OK, static import
 
-import Test.MyClass; // violation, imported from the same package as the current package
-import java.lang.String; // violation, the class imported is from the 'java.lang' package
-import java.util.Scanner; // OK
-import java.util.Scanner; // violation, it is a duplicate of another import
-public class MyClass{ };
+// violation below, 'Redundant import from the same package'
+import com.puppycrawl.tools.checkstyle.checks.imports.redundantimport.Example1;
+import java.lang.String; // violation, &quot;Redundant import from the java.lang package&quot;
+import java.util.Scanner;
+import java.util.Scanner; // violation 'Duplicate import to line 18 - java.util.Scanner'
+
+public class Example1{ }
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/imports/redundantimport.xml.template b/src/xdocs/checks/imports/redundantimport.xml.template
index e9bdcb30239..2df27b5bcc3 100644
--- a/src/xdocs/checks/imports/redundantimport.xml.template
+++ b/src/xdocs/checks/imports/redundantimport.xml.template
@@ -35,7 +35,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -43,7 +43,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/redundantimport/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/imports/unusedimports.xml b/src/xdocs/checks/imports/unusedimports.xml
index 717ee93ab34..efa438ef947 100644
--- a/src/xdocs/checks/imports/unusedimports.xml
+++ b/src/xdocs/checks/imports/unusedimports.xml
@@ -30,6 +30,10 @@
           <li>
             The class imported is from the same package.
           </li>
+          <li>
+            A static method is imported when used as method reference. In that case,
+            only the type needs to be imported and that's enough to resolve the method.
+          </li>
           <li>
             <b>Optionally:</b> it is referenced in Javadoc comments. This check
             is on by default, but it is considered bad practice to introduce
@@ -100,19 +104,23 @@ import static java.util.Arrays.copyOf; //OK
 
 import java.lang.String; // violation
 
-import java.util.Stack;  // OK
+import java.util.Stack;
 import java.util.Map;   // violation
 
-import java.util.List; // OK
+import java.util.List;
+import java.util.function.Function;
+
+import static java.lang.Integer.parseInt; // violation
 
 /**
-* @link List
+* {@link List}
 */
-class MyClass{
-    Stack stack = new Stack();
-    private Object Component;
-    int[] arr = {0,0};
-    int[] array = copyOf(arr , 1);
+class Example1{
+  Stack stack = new Stack();
+  private Object Component;
+  int[] arr = {0,0};
+  int[] array = copyOf(arr , 1);
+  Function &lt;String, Integer&gt; stringToInteger = Integer::parseInt;
 }
         </source>
         <p id="Example2-config">
@@ -138,19 +146,23 @@ import static java.util.Arrays.copyOf; //OK
 
 import java.lang.String; // violation
 
-import java.util.Stack;  // OK
+import java.util.Stack;
 import java.util.Map;   // violation
 
 import java.util.List; // violation
+import java.util.function.Function;
+
+import static java.lang.Integer.parseInt; // violation
 
 /**
-* @link List
+* {@link List}
 */
-class MyClass{
-    Stack stack = new Stack();
-    private Object Component;
-    int[] arr = {0,0};
-    int[] array = copyOf(arr , 1);
+class Example2{
+  Stack stack = new Stack();
+  private Object Component;
+  int[] arr = {0,0};
+  int[] array = copyOf(arr , 1);
+  Function &lt;String, Integer&gt; stringToInteger = Integer::parseInt;
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/imports/unusedimports.xml.template b/src/xdocs/checks/imports/unusedimports.xml.template
index 019d628c6c6..aaa844d665b 100644
--- a/src/xdocs/checks/imports/unusedimports.xml.template
+++ b/src/xdocs/checks/imports/unusedimports.xml.template
@@ -30,6 +30,10 @@
           <li>
             The class imported is from the same package.
           </li>
+          <li>
+            A static method is imported when used as method reference. In that case,
+            only the type needs to be imported and that's enough to resolve the method.
+          </li>
           <li>
             <b>Optionally:</b> it is referenced in Javadoc comments. This check
             is on by default, but it is considered bad practice to introduce
@@ -59,22 +63,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>processJavadoc</td>
-              <td>Control whether to process Javadoc comments.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -84,13 +76,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -98,13 +90,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/atclauseorder.xml b/src/xdocs/checks/javadoc/atclauseorder.xml
index ef2add798d3..f676aac4b20 100644
--- a/src/xdocs/checks/javadoc/atclauseorder.xml
+++ b/src/xdocs/checks/javadoc/atclauseorder.xml
@@ -30,53 +30,43 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td><code>false</code></td>
-              <td>8.3</td>
+              <td>tagOrder</td>
+              <td>Specify the order by tags.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>@author, @deprecated, @exception, @param, @return, @see, @serial, @serialData, @serialField, @since, @throws, @version</code></td>
+              <td>6.0</td>
             </tr>
             <tr>
               <td>target</td>
               <td>Specify block tags targeted.</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">
-                  TokenTypes
-                </a>
-              </td>
+              <td>subset of tokens <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a></td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    COMPACT_CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
               </td>
               <td>6.0</td>
             </tr>
             <tr>
-              <td>tagOrder</td>
-              <td>Specify the order by tags.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>@author, @deprecated, @exception, @param,
-                @return, @see, @serial, @serialData, @serialField,
-                @since, @throws, @version</code></td>
-              <td>6.0</td>
+              <td>violateExecutionOnNonTightHtml</td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>8.3</td>
             </tr>
           </table>
         </div>
@@ -98,39 +88,163 @@
         </p>
         <source>
 /**
-* Some javadoc. // OK
+* Some javadoc.
+*
+* @author Some javadoc.
+* @version Some javadoc.
+* @param Some javadoc.
+* @return Some javadoc.
+* @throws Some javadoc.
+* @exception Some javadoc.
+* @see Some javadoc.
+* @since Some javadoc.
+* @serial Some javadoc.
+* @serialField
+* @serialData
+*/
+public class Example1 {}
+
+class Valid1 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc. // violation
+ * @deprecated
+ * @see Some javadoc. // violation
+ */
+class Invalid1 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc. // violation
+ * @deprecated
+ * @see Some javadoc. // violation
+ * @author max // violation
+ */
+enum Test1 {}
+        </source>
+        <p id="Example2-config">
+            To configure the check such that it checks in the custom order:
+        </p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AtclauseOrder&quot;&gt;
+      &lt;property name=&quot;tagOrder&quot;
+                value=&quot;@author, @since, @version, @param, @return,
+                       @throws, @exception, @deprecated,
+                       @see, @serial, @serialField, @serialData&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example2-code">
+          Example:
+        </p>
+        <source>
+/**
+* Some javadoc.
 *
-* @author Some javadoc. // OK
-* @version Some javadoc. // OK
-* @param Some javadoc. // OK
-* @return Some javadoc. // OK
-* @throws Some javadoc. // OK
-* @exception Some javadoc. // OK
-* @see Some javadoc. // OK
-* @since Some javadoc. // OK
-* @serial Some javadoc. // OK
-* @serialField // OK
-* @serialData // OK
-* @deprecated Some javadoc. // OK
+* @author Some javadoc.
+* @version Some javadoc.
+* @param Some javadoc.
+* @return Some javadoc.
+* @throws Some javadoc.
+* @exception Some javadoc.
+* @see Some javadoc.
+* @since Some javadoc. // violation
+* @serial Some javadoc.
+* @serialField
+* @serialData
 */
+public class Example2 {}
+
+class Valid2 implements Serializable {}
 
-class Valid implements Serializable
-{
-}
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated
+ * @see Some javadoc.
+ */
+class Invalid2 implements Serializable {}
 
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated Some javadoc.
+ * @see Some javadoc.
+ * @author max // violation
+ */
+enum Test2 {}
+        </source>
+        <p id="Example3-config">
+            To configure the check such that it targets only enums:
+        </p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;AtclauseOrder&quot;&gt;
+      &lt;property name=&quot;target&quot; value=&quot;ENUM_DEF&quot;/&gt;
+      &lt;property name=&quot;tagOrder&quot;
+                value=&quot;@author, @since, @version, @param, @return,
+                       @throws, @exception, @deprecated,
+                       @see, @serial, @serialField, @serialData&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example3-code">
+          Example:
+        </p>
+        <source>
 /**
 * Some javadoc.
 *
-* @since Some javadoc. // OK
-* @version Some javadoc. // Violation - wrong order
-* @deprecated
-* @see Some javadoc. // Violation - wrong order
-* @author Some javadoc. // Violation - wrong order
+* @author Some javadoc.
+* @version Some javadoc.
+* @param Some javadoc.
+* @return Some javadoc.
+* @throws Some javadoc.
+* @exception Some javadoc.
+* @see Some javadoc.
+* @since Some javadoc.
+* @serial Some javadoc.
+* @serialField
+* @serialData
 */
+public class Example3 {}
 
-class Invalid implements Serializable
-{
-}
+class Valid3 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated
+ * @see Some javadoc.
+ */
+class Invalid3 implements Serializable {}
+
+/**
+ * Some javadoc.
+ *
+ * @since Some javadoc.
+ * @version Some javadoc.
+ * @deprecated
+ * @see Some javadoc.
+ * @author Some javadoc. // violation
+ */
+enum Test3 {}
         </source>
       </subsection>
 
@@ -164,6 +278,11 @@ class Invalid implements Serializable
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/javadoc/atclauseorder.xml.template b/src/xdocs/checks/javadoc/atclauseorder.xml.template
index b3a4a2387e7..dc22497a542 100644
--- a/src/xdocs/checks/javadoc/atclauseorder.xml.template
+++ b/src/xdocs/checks/javadoc/atclauseorder.xml.template
@@ -21,64 +21,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
-            <tr>
-              <td>target</td>
-              <td>Specify block tags targeted.</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">
-                  TokenTypes
-                </a>
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-              </td>
-              <td>6.0</td>
-            </tr>
-            <tr>
-              <td>tagOrder</td>
-              <td>Specify the order by tags.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>@author, @deprecated, @exception, @param,
-                @return, @see, @serial, @serialData, @serialField,
-                @since, @throws, @version</code></td>
-              <td>6.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -88,7 +34,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -96,7 +42,39 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example1.java"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
+            To configure the check such that it checks in the custom order:
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">
+          Example:
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example2.java"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
+            To configure the check such that it targets only enums:
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example3.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">
+          Example:
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/atclauseorder/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/invalidjavadocposition.xml b/src/xdocs/checks/javadoc/invalidjavadocposition.xml
index da5968549c7..3d91dddf2c6 100644
--- a/src/xdocs/checks/javadoc/invalidjavadocposition.xml
+++ b/src/xdocs/checks/javadoc/invalidjavadocposition.xml
@@ -38,11 +38,13 @@
         </p>
         <source>
 @SuppressWarnings(&quot;serial&quot;)
+// violation below, 'Javadoc comment is placed in the wrong location'
 /**
- * This comment looks like javadoc but it at an invalid location.
- * Therefore, the text will not get into TestClass.html and the check will produce a violation.
+ * This comment looks like Javadoc but it is at an invalid location.
+ * Therefore, the text will not get into TestClass.html.
+ * And, the check will produce a violation.
  */
-public class TestClass {
+public class Example1 {
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/invalidjavadocposition.xml.template b/src/xdocs/checks/javadoc/invalidjavadocposition.xml.template
index 768a41d9cfe..9120103a02a 100644
--- a/src/xdocs/checks/javadoc/invalidjavadocposition.xml.template
+++ b/src/xdocs/checks/javadoc/invalidjavadocposition.xml.template
@@ -27,7 +27,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -36,7 +36,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/invalidjavadocposition/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/javadocblocktaglocation.xml b/src/xdocs/checks/javadoc/javadocblocktaglocation.xml
index af1f5062fcc..831a1d7cd21 100644
--- a/src/xdocs/checks/javadoc/javadocblocktaglocation.xml
+++ b/src/xdocs/checks/javadoc/javadocblocktaglocation.xml
@@ -41,6 +41,7 @@
  */
         </source>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
           <table>
@@ -55,17 +56,13 @@
               <td>tags</td>
               <td>Specify the javadoc tags to process.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>author, deprecated, exception, hidden, param, provides, return,
-                see, serial, serialData, serialField, since, throws, uses, version</code></td>
+              <td><code>author, deprecated, exception, hidden, param, provides, return, see, serial, serialData, serialField, since, throws, uses, version</code></td>
               <td>8.24</td>
             </tr>
             <tr>
               <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.24</td>
@@ -92,6 +89,7 @@
  * Plain text with {@code @see} (OK)
  * A @custom tag (OK)
  *
+ */
         </source>
         <p id="Example2-config">
           To configure the check to verify tags from
@@ -106,18 +104,22 @@
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example2-code">
+        <p id="Example3-config">
           To configure the check to verify all default tags and some custom tags in addition:
         </p>
         <source>
-&lt;module name=&quot;JavadocBlockTagLocation&quot;&gt;
-  &lt;!-- default tags --&gt;
-  &lt;property name=&quot;tags&quot; value=&quot;author, deprecated, exception, hidden&quot;/&gt;
-  &lt;property name=&quot;tags&quot; value=&quot;param, provides, return, see, serial&quot;/&gt;
-  &lt;property name=&quot;tags&quot; value=&quot;serialData, serialField, since, throws&quot;/&gt;
-  &lt;property name=&quot;tags&quot; value=&quot;uses, version&quot;/&gt;
-  &lt;!-- additional tags used in the project --&gt;
-  &lt;property name=&quot;tags&quot; value=&quot;noinspection&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;JavadocBlockTagLocation&quot;&gt;
+      &lt;!-- default tags --&gt;
+      &lt;property name=&quot;tags&quot; value=&quot;author, deprecated, exception, hidden&quot;/&gt;
+      &lt;property name=&quot;tags&quot; value=&quot;param, provides, return, see, serial&quot;/&gt;
+      &lt;property name=&quot;tags&quot; value=&quot;serialData, serialField, since, throws&quot;/&gt;
+      &lt;property name=&quot;tags&quot; value=&quot;uses, version&quot;/&gt;
+      &lt;!-- additional tags used in the project --&gt;
+      &lt;property name=&quot;tags&quot; value=&quot;noinspection&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
       </subsection>
@@ -148,6 +150,11 @@
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/javadoc/javadocblocktaglocation.xml.template b/src/xdocs/checks/javadoc/javadocblocktaglocation.xml.template
index 5e864675562..be8f4e5960e 100644
--- a/src/xdocs/checks/javadoc/javadocblocktaglocation.xml.template
+++ b/src/xdocs/checks/javadoc/javadocblocktaglocation.xml.template
@@ -41,36 +41,13 @@
  */
         </source>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tags</td>
-              <td>Specify the javadoc tags to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>author, deprecated, exception, hidden, param, provides, return,
-                see, serial, serialData, serialField, since, throws, uses, version</code></td>
-              <td>8.24</td>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.24</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocBlockTagLocationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -80,13 +57,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -95,16 +72,16 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example2-code">
+        <p id="Example3-config">
           To configure the check to verify all default tags and some custom tags in addition:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example2.txt"/>
-          <param name="type" value="code"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocblocktaglocation/Example3.java"/>
+          <param name="type" value="config"/>
         </macro>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/javadoccontentlocation.xml b/src/xdocs/checks/javadoc/javadoccontentlocation.xml
index d6f66081ef3..b8e4ead5059 100644
--- a/src/xdocs/checks/javadoc/javadoccontentlocation.xml
+++ b/src/xdocs/checks/javadoc/javadoccontentlocation.xml
@@ -84,10 +84,7 @@ public void method();
             <tr>
               <td>location</td>
               <td>Specify the policy on placement of the Javadoc content.</td>
-              <td>
-                <a href="../../property_types.html#JavadocContentLocationOption">
-                    JavadocContentLocationOption</a>
-              </td>
+              <td><a href="../../property_types.html#JavadocContentLocationOption">JavadocContentLocationOption</a></td>
               <td><code>second_line</code></td>
               <td>8.27</td>
             </tr>
@@ -103,7 +100,7 @@ public void method();
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
-    &lt;module name=&quot;JavadocContentLocationCheck&quot;/&gt;
+    &lt;module name=&quot;JavadocContentLocation&quot;/&gt;
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
@@ -112,13 +109,23 @@ public void method();
           starting on the same line as the initial asterisks:
         </p>
         <source>
-/** This comment causes a violation because it starts from the first line
-  * and spans several lines.
-  */
-/**
-  * This comment is OK because it starts from the second line.
-  */
-/** This comment is OK because it is on the single-line. */
+class Example1 {
+
+  // violation below 'Javadoc content should start from the next line.'
+  /** This comment causes a violation because it starts from the first line
+   * and spans several lines.
+   */
+  private int field1;
+
+  /**
+   * This comment is OK because it starts from the second line.
+   */
+  private int field12;
+
+  /** This comment is OK because it is on the single-line. */
+  private int field3;
+
+}
         </source>
 
         <p id="Example2-config">
@@ -127,7 +134,7 @@ public void method();
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
-    &lt;module name=&quot;JavadocContentLocationCheck&quot;&gt;
+    &lt;module name=&quot;JavadocContentLocation&quot;&gt;
       &lt;property name=&quot;location&quot; value=&quot;first_line&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
@@ -138,13 +145,23 @@ public void method();
           starting on the same line as the initial asterisks:
         </p>
         <source>
-/** This comment is OK because it starts on the first line.
+class Example2 {
+
+  /** This comment is OK because it starts on the first line.
    * There may be additional text.
    */
-/**
-  * This comment causes a violation because it starts on the second line.
-  */
-/** This single-line comment also is OK. */
+  private int field1;
+
+  // violation below, 'Javadoc content should start from the same line.'
+  /**
+   * This comment causes a violation because it starts on the second line.
+   */
+  private int field2;
+
+  /** This single-line comment also is OK. */
+  private int field3;
+
+}
         </source>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/javadoc/javadoccontentlocation.xml.template b/src/xdocs/checks/javadoc/javadoccontentlocation.xml.template
index dc29e950dda..01ecbea19c9 100644
--- a/src/xdocs/checks/javadoc/javadoccontentlocation.xml.template
+++ b/src/xdocs/checks/javadoc/javadoccontentlocation.xml.template
@@ -73,25 +73,10 @@ public void method();
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>location</td>
-              <td>Specify the policy on placement of the Javadoc content.</td>
-              <td>
-                <a href="../../property_types.html#JavadocContentLocationOption">
-                    JavadocContentLocationOption</a>
-              </td>
-              <td><code>second_line</code></td>
-              <td>8.27</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocContentLocationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -102,7 +87,7 @@ public void method();
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -111,7 +96,7 @@ public void method();
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
 
@@ -120,7 +105,7 @@ public void method();
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -129,7 +114,7 @@ public void method();
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadoccontentlocation/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/javadocmethod.xml b/src/xdocs/checks/javadoc/javadocmethod.xml
index 116856fac60..210d9c00f47 100644
--- a/src/xdocs/checks/javadoc/javadocmethod.xml
+++ b/src/xdocs/checks/javadoc/javadocmethod.xml
@@ -93,72 +93,64 @@ public int checkReturnTag(final int aTagIndex,
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>allowedAnnotations</td>
-              <td>Specify annotations that allow missed documentation.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Override</code></td>
-              <td>6.0</td>
-            </tr>
-            <tr>
-              <td>validateThrows</td>
-              <td>Control whether to validate <code>throws</code> tags.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.0</td>
-            </tr>
             <tr>
               <td>accessModifiers</td>
               <td>Specify the access modifiers where Javadoc comments are checked.</td>
-              <td>
-                <a href="../../property_types.html#AccessModifierOption.5B.5D">
-                  AccessModifierOption[]
-                </a>
-              </td>
+              <td><a href="../../property_types.html#AccessModifierOption.5B.5D">AccessModifierOption[]</a></td>
               <td><code>public, protected, package, private</code></td>
               <td>8.42</td>
             </tr>
             <tr>
               <td>allowMissingParamTags</td>
-              <td>Control whether to ignore violations when a method has parameters
-              but does not have matching <code>param</code> tags in the javadoc.</td>
+              <td>Control whether to ignore violations when a method has parameters but does not have matching <code>param</code> tags in the javadoc.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>3.1</td>
             </tr>
             <tr>
               <td>allowMissingReturnTag</td>
-              <td>Control whether to ignore violations when a method returns
-              non-void type and does not have a <code>return</code> tag in the javadoc.</td>
+              <td>Control whether to ignore violations when a method returns non-void type and does not have a <code>return</code> tag in the javadoc.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>3.1</td>
             </tr>
+            <tr>
+              <td>allowedAnnotations</td>
+              <td>Specify annotations that allow missed documentation.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>Override</code></td>
+              <td>6.0</td>
+            </tr>
+            <tr>
+              <td>validateThrows</td>
+              <td>Control whether to validate <code>throws</code> tags.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>6.0</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/javadoc/javadocmethod.xml.template b/src/xdocs/checks/javadoc/javadocmethod.xml.template
index 2469aa36f74..ac73f09eb9b 100644
--- a/src/xdocs/checks/javadoc/javadocmethod.xml.template
+++ b/src/xdocs/checks/javadoc/javadocmethod.xml.template
@@ -85,85 +85,10 @@ public int checkReturnTag(final int aTagIndex,
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowedAnnotations</td>
-              <td>Specify annotations that allow missed documentation.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Override</code></td>
-              <td>6.0</td>
-            </tr>
-            <tr>
-              <td>validateThrows</td>
-              <td>Control whether to validate <code>throws</code> tags.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.0</td>
-            </tr>
-            <tr>
-              <td>accessModifiers</td>
-              <td>Specify the access modifiers where Javadoc comments are checked.</td>
-              <td>
-                <a href="../../property_types.html#AccessModifierOption.5B.5D">
-                  AccessModifierOption[]
-                </a>
-              </td>
-              <td><code>public, protected, package, private</code></td>
-              <td>8.42</td>
-            </tr>
-            <tr>
-              <td>allowMissingParamTags</td>
-              <td>Control whether to ignore violations when a method has parameters
-              but does not have matching <code>param</code> tags in the javadoc.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>allowMissingReturnTag</td>
-              <td>Control whether to ignore violations when a method returns
-              non-void type and does not have a <code>return</code> tag in the javadoc.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml b/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml
index e9dc2295878..9ec3b821787 100644
--- a/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml
+++ b/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml
@@ -35,11 +35,8 @@
             </tr>
             <tr>
               <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.38</td>
@@ -68,36 +65,37 @@
  *   int value = 0;
  * &lt;/pre&gt;
  */
-class JavaStyle {} // ok
+class JavaStyle {}
 
 /** Valid Scala-style comment.
   * Some description here.
   **/
-class ScalaStyle {} // ok
+class ScalaStyle {}
 
 /** **
   * Asterisks on first and last lines are optional.
   * */
-class Asterisks {} // ok
+class Asterisks {}
 
 /** No asterisks are required for single-line comments. */
-class SingleLine {} // ok
+class SingleLine {}
 
-/** // violation on next blank line, javadoc has lines without leading asterisk.
+/**
 
- */
+ */ // violation above, 'Javadoc line should start with leading asterisk'
 class BlankLine {}
 
 /** Wrapped
-    single-line comment */ // violation, javadoc has lines without leading asterisk.
+    single-line comment */
+// violation above, 'Javadoc line should start with leading asterisk'
 class Wrapped {}
 
 /**
   * &lt;pre&gt;
-    int value; // violation, javadoc has lines without leading asterisk.
+    int value; // violation, 'Javadoc line should start with leading asterisk'
   * &lt;/pre&gt;
   */
-class Code {}
+class Example1 {}
         </source>
       </subsection>
 
@@ -127,6 +125,11 @@ class Code {}
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml.template b/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml.template
index a0ffc8f602e..cdb531ba034 100644
--- a/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml.template
+++ b/src/xdocs/checks/javadoc/javadocmissingleadingasterisk.xml.template
@@ -25,26 +25,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.38</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingLeadingAsteriskCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -54,13 +38,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocmissingleadingasterisk/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml b/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml
index 2a0d90fbd93..4f586c0531b 100644
--- a/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml
+++ b/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml
@@ -29,11 +29,8 @@
             </tr>
             <tr>
               <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.3</td>
@@ -88,24 +85,32 @@ class TestClass {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missed.html.close%22">
-            javadoc.missed.html.close</a>
+              javadoc.missed.html.close
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missing.whitespace%22">
-            javadoc.missing.whitespace</a>
+              javadoc.missing.whitespace
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.parse.rule.error%22">
-            javadoc.parse.rule.error</a>
+              javadoc.parse.rule.error
+            </a>
+          </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
-            javadoc.wrong.singleton.html.tag</a>
+              javadoc.wrong.singleton.html.tag
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml.template b/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml.template
index 8a1d7a86c4a..df4e269913c 100644
--- a/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml.template
+++ b/src/xdocs/checks/javadoc/javadocmissingwhitespaceafterasterisk.xml.template
@@ -19,26 +19,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMissingWhitespaceAfterAsteriskCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -71,26 +55,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missed.html.close%22">
-            javadoc.missed.html.close</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missing.whitespace%22">
-            javadoc.missing.whitespace</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.parse.rule.error%22">
-            javadoc.parse.rule.error</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
-            javadoc.wrong.singleton.html.tag</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="JavadocMissingWhitespaceAfterAsterisk"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/javadoc/javadocpackage.xml b/src/xdocs/checks/javadoc/javadocpackage.xml
index c3f5072c54e..8b9d35768b6 100644
--- a/src/xdocs/checks/javadoc/javadocpackage.xml
+++ b/src/xdocs/checks/javadoc/javadocpackage.xml
@@ -33,16 +33,14 @@
             </tr>
             <tr>
               <td>allowLegacy</td>
-              <td>
-                Allow legacy <code>package.html</code> file to be used.
-              </td>
+              <td>Allow legacy <code>package.html</code> file to be used.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.0</td>
             </tr>
             <tr>
               <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
+              <td>Specify the file extensions of the files to process.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>.java</code></td>
               <td>5.0</td>
diff --git a/src/xdocs/checks/javadoc/javadocpackage.xml.template b/src/xdocs/checks/javadoc/javadocpackage.xml.template
index a33a92b2992..fcbb5552d95 100644
--- a/src/xdocs/checks/javadoc/javadocpackage.xml.template
+++ b/src/xdocs/checks/javadoc/javadocpackage.xml.template
@@ -23,31 +23,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowLegacy</td>
-              <td>
-                Allow legacy <code>package.html</code> file to be used.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>.java</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocPackageCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/javadocparagraph.xml b/src/xdocs/checks/javadoc/javadocparagraph.xml
index a286018fcd1..3be088d49bd 100644
--- a/src/xdocs/checks/javadoc/javadocparagraph.xml
+++ b/src/xdocs/checks/javadoc/javadocparagraph.xml
@@ -36,27 +36,21 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
             <tr>
               <td>allowNewlineParagraph</td>
-              <td>
-                Control whether the &lt;p&gt; tag should be placed immediately before the first
-                word.
-              </td>
+              <td>Control whether the &lt;p&gt; tag should be placed immediately before the first word.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>6.9</td>
             </tr>
+            <tr>
+              <td>violateExecutionOnNonTightHtml</td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>8.3</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -169,6 +163,11 @@ public class TestClass {
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/javadoc/javadocparagraph.xml.template b/src/xdocs/checks/javadoc/javadocparagraph.xml.template
index 3a9aecfd0c9..183adbd6ea2 100644
--- a/src/xdocs/checks/javadoc/javadocparagraph.xml.template
+++ b/src/xdocs/checks/javadoc/javadocparagraph.xml.template
@@ -28,36 +28,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
-            <tr>
-              <td>allowNewlineParagraph</td>
-              <td>
-                Control whether the &lt;p&gt; tag should be placed immediately before the first
-                word.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.9</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/javadocstyle.xml b/src/xdocs/checks/javadoc/javadocstyle.xml
index dc7017f0a2c..afed2e70daa 100644
--- a/src/xdocs/checks/javadoc/javadocstyle.xml
+++ b/src/xdocs/checks/javadoc/javadocstyle.xml
@@ -19,6 +19,9 @@
           <li>
             Ensures the first sentence ends with proper punctuation
             (That is a period, question mark, or exclamation mark, by default).
+            Note that this check is not applied to inline <code>@return</code> tags,
+            because the Javadoc tools automatically appends a period to the end of the tag
+            content.
             Javadoc automatically places the first sentence in the
             method summary table and index. Without proper punctuation
             the Javadoc may be malformed. All items eligible for the
@@ -73,51 +76,45 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>private</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>excludeScope</td>
-              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
+              <td>checkEmptyJavadoc</td>
+              <td>Control whether to check if the Javadoc is missing a describing text.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
               <td>3.4</td>
             </tr>
             <tr>
               <td>checkFirstSentence</td>
-              <td>
-                Control whether to check the first sentence for proper end of sentence.
-              </td>
+              <td>Control whether to check the first sentence for proper end of sentence.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>3.2</td>
+            </tr>
+            <tr>
+              <td>checkHtml</td>
+              <td>Control whether to check for incomplete HTML tags.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.2</td>
             </tr>
             <tr>
               <td>endOfSentenceFormat</td>
-              <td>
-                Specify the format for matching the end of a sentence.
-              </td>
+              <td>Specify the format for matching the end of a sentence.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;([.?!][ \t\n\r\f&lt;])|([.?!]$)&quot;</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>checkEmptyJavadoc</td>
-              <td>
-                Control whether to check if the Javadoc is missing a describing text.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
+              <td>excludeScope</td>
+              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
+              <td><a href="../../property_types.html#Scope">Scope</a></td>
+              <td><code>null</code></td>
               <td>3.4</td>
             </tr>
             <tr>
-              <td>checkHtml</td>
-              <td>Control whether to check for incomplete HTML tags.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
+              <td>scope</td>
+              <td>Specify the visibility scope where Javadoc comments are checked.</td>
+              <td><a href="../../property_types.html#Scope">Scope</a></td>
+              <td><code>private</code></td>
               <td>3.2</td>
             </tr>
             <tr>
@@ -125,56 +122,56 @@
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
+                    PACKAGE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    VARIABLE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
+                    PACKAGE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    VARIABLE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>3.2</td>
@@ -204,6 +201,16 @@ public class Test {
      */
     private void methodWithValidCommentStyle() {}
 
+    // ok below, @return tag automatically inserts a period after the text
+    /**
+     * {@return {@code true} if this object
+     * has been initialized, {@code false} otherwise}
+     */
+    private boolean isInitialized()
+    {
+       return true;
+    }
+
     /**
      * Some description here // violation, the sentence must end with a proper punctuation
      */
diff --git a/src/xdocs/checks/javadoc/javadocstyle.xml.template b/src/xdocs/checks/javadoc/javadocstyle.xml.template
index 7fc4fad58ef..38f8a3aba99 100644
--- a/src/xdocs/checks/javadoc/javadocstyle.xml.template
+++ b/src/xdocs/checks/javadoc/javadocstyle.xml.template
@@ -19,6 +19,9 @@
           <li>
             Ensures the first sentence ends with proper punctuation
             (That is a period, question mark, or exclamation mark, by default).
+            Note that this check is not applied to inline <code>@return</code> tags,
+            because the Javadoc tools automatically appends a period to the end of the tag
+            content.
             Javadoc automatically places the first sentence in the
             method summary table and index. Without proper punctuation
             the Javadoc may be malformed. All items eligible for the
@@ -64,122 +67,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>private</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>excludeScope</td>
-              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>checkFirstSentence</td>
-              <td>
-                Control whether to check the first sentence for proper end of sentence.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>endOfSentenceFormat</td>
-              <td>
-                Specify the format for matching the end of a sentence.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"([.?!][ \t\n\r\f&lt;])|([.?!]$)"</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>checkEmptyJavadoc</td>
-              <td>
-                Control whether to check if the Javadoc is missing a describing text.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>checkHtml</td>
-              <td>Control whether to check for incomplete HTML tags.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml b/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml
index ddd1a39b768..a8242303b14 100644
--- a/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml
+++ b/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml
@@ -29,18 +29,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
             <tr>
               <td>offset</td>
               <td>Specify how many spaces to use for new indentation level.</td>
@@ -48,6 +36,14 @@
               <td><code>4</code></td>
               <td>6.0</td>
             </tr>
+            <tr>
+              <td>violateExecutionOnNonTightHtml</td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>8.3</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -139,24 +135,32 @@ public class Test {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missed.html.close%22">
-            javadoc.missed.html.close</a>
+              javadoc.missed.html.close
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.parse.rule.error%22">
-            javadoc.parse.rule.error</a>
+              javadoc.parse.rule.error
+            </a>
+          </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
-            javadoc.wrong.singleton.html.tag</a>
+              javadoc.wrong.singleton.html.tag
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22tag.continuation.indent%22">
-            tag.continuation.indent</a>
+              tag.continuation.indent
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml.template b/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml.template
index f3a59f6b0e9..cb73df07e00 100644
--- a/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml.template
+++ b/src/xdocs/checks/javadoc/javadoctagcontinuationindentation.xml.template
@@ -21,34 +21,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a>
-              </td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
-            <tr>
-              <td>offset</td>
-              <td>Specify how many spaces to use for new indentation level.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>6.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTagContinuationIndentationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -116,26 +92,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missed.html.close%22">
-            javadoc.missed.html.close</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.parse.rule.error%22">
-            javadoc.parse.rule.error</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
-            javadoc.wrong.singleton.html.tag</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22tag.continuation.indent%22">
-            tag.continuation.indent</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="JavadocTagContinuationIndentation"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/javadoc/javadoctype.xml b/src/xdocs/checks/javadoc/javadoctype.xml
index 53426e9556d..d3a430076ca 100644
--- a/src/xdocs/checks/javadoc/javadoctype.xml
+++ b/src/xdocs/checks/javadoc/javadoctype.xml
@@ -47,10 +47,31 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>private</code></td>
+              <td>allowMissingParamTags</td>
+              <td>Control whether to ignore violations when a class has type parameters but does not have matching param tags in the Javadoc.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>4.0</td>
+            </tr>
+            <tr>
+              <td>allowUnknownTags</td>
+              <td>Control whether to ignore violations when a Javadoc tag is not recognised.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>5.1</td>
+            </tr>
+            <tr>
+              <td>allowedAnnotations</td>
+              <td>Specify annotations that allow skipping validation at all. Only short names are allowed, e.g. <code>Generated</code>.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>Generated</code></td>
+              <td>8.15</td>
+            </tr>
+            <tr>
+              <td>authorFormat</td>
+              <td>Specify the pattern for <code>@author</code> tag.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>null</code></td>
               <td>3.0</td>
             </tr>
             <tr>
@@ -61,10 +82,10 @@
               <td>3.4</td>
             </tr>
             <tr>
-              <td>authorFormat</td>
-              <td>Specify the pattern for <code>@author</code> tag.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
+              <td>scope</td>
+              <td>Specify the visibility scope where Javadoc comments are checked.</td>
+              <td><a href="../../property_types.html#Scope">Scope</a></td>
+              <td><code>private</code></td>
               <td>3.0</td>
             </tr>
             <tr>
@@ -74,59 +95,33 @@
               <td><code>null</code></td>
               <td>3.0</td>
             </tr>
-            <tr>
-              <td>allowMissingParamTags</td>
-              <td>Control whether to ignore violations when a class has type parameters
-                  but does not have matching param tags in the Javadoc.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>allowUnknownTags</td>
-              <td>Control whether to ignore violations when a Javadoc tag is not recognised.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.1</td>
-            </tr>
-            <tr>
-              <td>allowedAnnotations</td>
-              <td>
-                Specify annotations that allow skipping validation at all.
-                Only short names are allowed, e.g. <code>Generated</code>.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Generated</code></td>
-              <td>8.15</td>
-            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/javadoc/javadoctype.xml.template b/src/xdocs/checks/javadoc/javadoctype.xml.template
index ca9c47beaa0..71a8ff08c97 100644
--- a/src/xdocs/checks/javadoc/javadoctype.xml.template
+++ b/src/xdocs/checks/javadoc/javadoctype.xml.template
@@ -38,100 +38,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>private</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>excludeScope</td>
-              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>authorFormat</td>
-              <td>Specify the pattern for <code>@author</code> tag.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>versionFormat</td>
-              <td>Specify the pattern for <code>@version</code> tag.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>allowMissingParamTags</td>
-              <td>Control whether to ignore violations when a class has type parameters
-                  but does not have matching param tags in the Javadoc.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>allowUnknownTags</td>
-              <td>Control whether to ignore violations when a Javadoc tag is not recognised.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.1</td>
-            </tr>
-            <tr>
-              <td>allowedAnnotations</td>
-              <td>
-                Specify annotations that allow skipping validation at all.
-                Only short names are allowed, e.g. <code>Generated</code>.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Generated</code></td>
-              <td>8.15</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/javadocvariable.xml b/src/xdocs/checks/javadoc/javadocvariable.xml
index c61af379d1d..fd18e540a16 100644
--- a/src/xdocs/checks/javadoc/javadocvariable.xml
+++ b/src/xdocs/checks/javadoc/javadocvariable.xml
@@ -25,13 +25,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>private</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>excludeScope</td>
               <td>Specify the visibility scope where Javadoc comments are not checked.</td>
@@ -46,19 +39,24 @@
               <td><code>null</code></td>
               <td>5.8</td>
             </tr>
+            <tr>
+              <td>scope</td>
+              <td>Specify the visibility scope where Javadoc comments are checked.</td>
+              <td><a href="../../property_types.html#Scope">Scope</a></td>
+              <td><code>private</code></td>
+              <td>3.0</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
+                    ENUM_CONSTANT_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
+                    ENUM_CONSTANT_DEF</a>
                   .
               </td>
               <td>3.0</td>
@@ -83,16 +81,17 @@
           there is no javadoc for any scope member.
         </p>
         <source>
-public class Test {
-private int a; // violation, missing javadoc for private member
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // violation, missing javadoc for protected member
-public int d; // violation, missing javadoc for public member
-/*package*/ int e; // violation, missing javadoc for package member
+public class Example1 {
+  private int a; // violation
+
+  /**
+   * Some description here
+   */
+  private int b;
+  protected int c; // violation
+  public int d; // violation
+  /*package*/ int e; // violation
+
 }
         </source>
 
@@ -115,16 +114,16 @@ public int d; // violation, missing javadoc for public member
           is no javadoc for <code>public</code> member.
         </p>
         <source>
-public class Test {
-private int a; // OK
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // OK
-public int d; // violation, missing javadoc for public member
-/*package*/ int e; // OK
+public class Example2 {
+  private int a;
+
+  /**
+   * Some description here
+   */
+  private int b;
+  protected int c;
+  public int d; // violation
+  /*package*/ int e;
 }
         </source>
 
@@ -149,16 +148,16 @@ public int d; // violation, missing javadoc for public member
           ignores <code>protected</code> member.
         </p>
         <source>
-public class Test {
-private int a; // violation, missing javadoc for private member
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // OK
-public int d; // OK
-/*package*/ int e; // violation, missing javadoc for package member
+public class Example3 {
+  private int a; // violation
+
+  /**
+   * Some description here
+   */
+  private int b;
+  protected int c;
+  public int d;
+  /*package*/ int e; // violation
 }
         </source>
         <p id="Example4-config">
@@ -181,18 +180,16 @@ public int d; // OK
           name <code>log</code> or <code>logger</code>.
         </p>
         <source>
-public class Test {
-private int a; // violation, missing javadoc for private member
-
-/**
- * Some description here
- */
-private int b; // OK
-protected int c; // violation, missing javadoc for protected member
-public int d; // violation, missing javadoc for public member
-/*package*/ int e; // violation, missing javadoc for package member
-private int log; // OK
-private int logger; // OK
+public class Example4 {
+  private int a; // violation
+
+  /**
+   * Some description here
+  */
+  private int b;
+  protected int c; // violation
+  public int d; // violation
+  /*package*/ int e; // violation
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/javadocvariable.xml.template b/src/xdocs/checks/javadoc/javadocvariable.xml.template
index 40429fc8bb3..1167053277e 100644
--- a/src/xdocs/checks/javadoc/javadocvariable.xml.template
+++ b/src/xdocs/checks/javadoc/javadocvariable.xml.template
@@ -17,53 +17,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>private</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>excludeScope</td>
-              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>ignoreNamePattern</td>
-              <td>Specify the regexp to define variable names to ignore.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -73,7 +30,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -82,7 +39,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
 
@@ -93,7 +50,7 @@
 
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -102,7 +59,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
 
@@ -113,7 +70,7 @@
 
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">
@@ -123,7 +80,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example4-config">
@@ -133,7 +90,7 @@
 
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example4-code">
@@ -143,7 +100,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/javadoc/missingjavadocmethod.xml b/src/xdocs/checks/javadoc/missingjavadocmethod.xml
index 42e916ea1fc..791e85ff5d3 100644
--- a/src/xdocs/checks/javadoc/missingjavadocmethod.xml
+++ b/src/xdocs/checks/javadoc/missingjavadocmethod.xml
@@ -60,10 +60,10 @@ public boolean isSomething()
               <th>since</th>
             </tr>
             <tr>
-              <td>minLineCount</td>
-              <td>Control the minimal amount of lines in method to allow no documentation.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>-1</code></td>
+              <td>allowMissingPropertyJavadoc</td>
+              <td>Control whether to allow missing Javadoc on accessor methods for properties (setters and getters).</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
               <td>8.21</td>
             </tr>
             <tr>
@@ -74,61 +74,56 @@ public boolean isSomething()
               <td>8.21</td>
             </tr>
             <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
+              <td>excludeScope</td>
+              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
               <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>public</code></td>
+              <td><code>null</code></td>
               <td>8.21</td>
             </tr>
             <tr>
-              <td>excludeScope</td>
-              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
+              <td>ignoreMethodNamesRegex</td>
+              <td>Ignore method whose names are matching specified regex.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>8.21</td>
             </tr>
             <tr>
-              <td>allowMissingPropertyJavadoc</td>
-              <td>
-                Control whether to allow missing Javadoc on accessor methods for
-                properties (setters and getters).
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
+              <td>minLineCount</td>
+              <td>Control the minimal amount of lines in method to allow no documentation.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>-1</code></td>
               <td>8.21</td>
             </tr>
             <tr>
-              <td>ignoreMethodNamesRegex</td>
-              <td>ignore method whose names are matching specified regex.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
+              <td>scope</td>
+              <td>Specify the visibility scope where Javadoc comments are checked.</td>
+              <td><a href="../../property_types.html#Scope">Scope</a></td>
+              <td><code>public</code></td>
               <td>8.21</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>8.21</td>
diff --git a/src/xdocs/checks/javadoc/missingjavadocmethod.xml.template b/src/xdocs/checks/javadoc/missingjavadocmethod.xml.template
index e2c230cac73..962559b6a09 100644
--- a/src/xdocs/checks/javadoc/missingjavadocmethod.xml.template
+++ b/src/xdocs/checks/javadoc/missingjavadocmethod.xml.template
@@ -51,89 +51,10 @@ public boolean isSomething()
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>minLineCount</td>
-              <td>Control the minimal amount of lines in method to allow no documentation.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>-1</code></td>
-              <td>8.21</td>
-            </tr>
-            <tr>
-              <td>allowedAnnotations</td>
-              <td>Configure annotations that allow missed documentation.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Override</code></td>
-              <td>8.21</td>
-            </tr>
-            <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>public</code></td>
-              <td>8.21</td>
-            </tr>
-            <tr>
-              <td>excludeScope</td>
-              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
-              <td>8.21</td>
-            </tr>
-            <tr>
-              <td>allowMissingPropertyJavadoc</td>
-              <td>
-                Control whether to allow missing Javadoc on accessor methods for
-                properties (setters and getters).
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.21</td>
-            </tr>
-            <tr>
-              <td>ignoreMethodNamesRegex</td>
-              <td>ignore method whose names are matching specified regex.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.21</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>8.21</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/missingjavadoctype.xml b/src/xdocs/checks/javadoc/missingjavadoctype.xml
index 017b93de96d..638d20b1996 100644
--- a/src/xdocs/checks/javadoc/missingjavadoctype.xml
+++ b/src/xdocs/checks/javadoc/missingjavadoctype.xml
@@ -29,26 +29,22 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>scope</td>
-              <td>specify the visibility scope where Javadoc comments are checked.</td>
+              <td>excludeScope</td>
+              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
               <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>public</code></td>
+              <td><code>null</code></td>
               <td>8.20</td>
             </tr>
             <tr>
-              <td>excludeScope</td>
-              <td>specify the visibility scope where Javadoc comments are not checked.</td>
+              <td>scope</td>
+              <td>Specify the visibility scope where Javadoc comments are checked.</td>
               <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
+              <td><code>public</code></td>
               <td>8.20</td>
             </tr>
             <tr>
               <td>skipAnnotations</td>
-              <td>
-                specify annotations that allow missed documentation.
-                If annotation is present in target sources in multiple forms of qualified
-                name, all forms should be listed in this property.
-              </td>
+              <td>Specify annotations that allow missed documentation. If annotation is present in target sources in multiple forms of qualified name, all forms should be listed in this property.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>Generated</code></td>
               <td>8.20</td>
@@ -56,31 +52,30 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                   .
               </td>
               <td>8.20</td>
diff --git a/src/xdocs/checks/javadoc/missingjavadoctype.xml.template b/src/xdocs/checks/javadoc/missingjavadoctype.xml.template
index 44fde834ee2..30b38a49683 100644
--- a/src/xdocs/checks/javadoc/missingjavadoctype.xml.template
+++ b/src/xdocs/checks/javadoc/missingjavadoctype.xml.template
@@ -20,72 +20,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>scope</td>
-              <td>specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>public</code></td>
-              <td>8.20</td>
-            </tr>
-            <tr>
-              <td>excludeScope</td>
-              <td>specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
-              <td>8.20</td>
-            </tr>
-            <tr>
-              <td>skipAnnotations</td>
-              <td>
-                specify annotations that allow missed documentation.
-                If annotation is present in target sources in multiple forms of qualified
-                name, all forms should be listed in this property.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>Generated</code></td>
-              <td>8.20</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>8.20</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocTypeCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml b/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml
index 4dd8e3097ff..c2bdb8d25e8 100644
--- a/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml
+++ b/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml
@@ -26,11 +26,8 @@
             </tr>
             <tr>
               <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.3</td>
@@ -40,28 +37,28 @@
               <td>javadoc tokens to check</td>
               <td>subset of javadoc tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#PARAM_LITERAL">
-                  PARAM_LITERAL</a>
+                    PARAM_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#RETURN_LITERAL">
-                  RETURN_LITERAL</a>
+                    RETURN_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#THROWS_LITERAL">
-                  THROWS_LITERAL</a>
+                    THROWS_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#EXCEPTION_LITERAL">
-                  EXCEPTION_LITERAL</a>
+                    EXCEPTION_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#DEPRECATED_LITERAL">
-                  DEPRECATED_LITERAL</a>
+                    DEPRECATED_LITERAL</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#PARAM_LITERAL">
-                  PARAM_LITERAL</a>
+                    PARAM_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#RETURN_LITERAL">
-                  RETURN_LITERAL</a>
+                    RETURN_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#THROWS_LITERAL">
-                  THROWS_LITERAL</a>
+                    THROWS_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#EXCEPTION_LITERAL">
-                  EXCEPTION_LITERAL</a>
+                    EXCEPTION_LITERAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#DEPRECATED_LITERAL">
-                  DEPRECATED_LITERAL</a>
+                    DEPRECATED_LITERAL</a>
                   .
               </td>
               <td>7.3</td>
@@ -92,6 +89,16 @@ class Test
   /**
   * Some summary.
   *
+  * &lt;code&gt;@param&lt;/code&gt; a Some description
+  * &lt;code&gt;@param&lt;/code&gt; b
+  * &lt;code&gt;@deprecated&lt;/code&gt;
+  * &lt;code&gt;@throws&lt;/code&gt; Exception
+  * &lt;code&gt;@return&lt;/code&gt;
+  */
+  public int method(String a, int b) throws Exception {
+    return 1;
+  }
+}
         </source>
         <p id="Example2-config">
           To configure the check to validate <code>@param</code>,
@@ -116,6 +123,16 @@ class Test
   /**
   * Some summary.
   *
+  * &lt;code&gt;@param&lt;/code&gt; a Some description
+  * &lt;code&gt;@param&lt;/code&gt; b
+  * &lt;code&gt;@deprecated&lt;/code&gt;
+  * &lt;code&gt;@throws&lt;/code&gt; Exception
+  * &lt;code&gt;@return&lt;/code&gt;
+  */
+  public int method(String a, int b) throws Exception {
+    return 1;
+  }
+}
         </source>
       </subsection>
 
@@ -144,6 +161,11 @@ class Test
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml.template b/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml.template
index 8a499d9006b..61a5249495f 100644
--- a/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml.template
+++ b/src/xdocs/checks/javadoc/nonemptyatclausedescription.xml.template
@@ -16,57 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
-            <tr>
-              <td>javadocTokens</td>
-              <td>javadoc tokens to check</td>
-              <td>subset of javadoc tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#PARAM_LITERAL">
-                  PARAM_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#RETURN_LITERAL">
-                  RETURN_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#THROWS_LITERAL">
-                  THROWS_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#EXCEPTION_LITERAL">
-                  EXCEPTION_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#DEPRECATED_LITERAL">
-                  DEPRECATED_LITERAL</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#PARAM_LITERAL">
-                  PARAM_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#RETURN_LITERAL">
-                  RETURN_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#THROWS_LITERAL">
-                  THROWS_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#EXCEPTION_LITERAL">
-                  EXCEPTION_LITERAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/JavadocTokenTypes.html#DEPRECATED_LITERAL">
-                  DEPRECATED_LITERAL</a>
-                  .
-              </td>
-              <td>7.3</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml b/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml
index 081dab94413..dc42d2fb964 100644
--- a/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml
+++ b/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml
@@ -13,6 +13,7 @@
           Checks that one blank line before the block tag if it is present in Javadoc.
         </p>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
           <table>
@@ -25,11 +26,8 @@
             </tr>
             <tr>
               <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.36</td>
@@ -92,24 +90,32 @@ public boolean testMethod(int firstParam) {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missed.html.close%22">
-                javadoc.missed.html.close</a>
+              javadoc.missed.html.close
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.parse.rule.error%22">
-                javadoc.parse.rule.error</a>
+              javadoc.parse.rule.error
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.tag.line.before%22">
-                javadoc.tag.line.before</a>
+              javadoc.tag.line.before
+            </a>
+          </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
           </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
-                javadoc.wrong.singleton.html.tag</a>
+              javadoc.wrong.singleton.html.tag
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml.template b/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml.template
index 3f410f2908b..c75910cf8b6 100644
--- a/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml.template
+++ b/src/xdocs/checks/javadoc/requireemptylinebeforeblocktaggroup.xml.template
@@ -13,28 +13,13 @@
           Checks that one blank line before the block tag if it is present in Javadoc.
         </p>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.36</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/RequireEmptyLineBeforeBlockTagGroupCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -86,26 +71,10 @@ public boolean testMethod(int firstParam) {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.missed.html.close%22">
-                javadoc.missed.html.close</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.parse.rule.error%22">
-                javadoc.parse.rule.error</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.tag.line.before%22">
-                javadoc.tag.line.before</a>
-          </li>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
-                javadoc.wrong.singleton.html.tag</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="RequireEmptyLineBeforeBlockTagGroup"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/javadoc/singlelinejavadoc.xml b/src/xdocs/checks/javadoc/singlelinejavadoc.xml
index 0dc0af3b9e3..a1bacb7f072 100644
--- a/src/xdocs/checks/javadoc/singlelinejavadoc.xml
+++ b/src/xdocs/checks/javadoc/singlelinejavadoc.xml
@@ -27,37 +27,28 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
+              <td>ignoreInlineTags</td>
+              <td>Control whether <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
+ inline tags</a> must be ignored.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
+              <td><code>true</code></td>
+              <td>6.8</td>
             </tr>
             <tr>
               <td>ignoredTags</td>
-              <td>
-                Specify
-                <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
-                block tags</a> which are ignored by the check.
-              </td>
+              <td>Specify <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
+ block tags</a> which are ignored by the check.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>{}</code></td>
               <td>6.8</td>
             </tr>
             <tr>
-              <td>ignoreInlineTags</td>
-              <td>
-                Control whether
-                <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
-                inline tags</a> must be ignored.
-              </td>
+              <td>violateExecutionOnNonTightHtml</td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.8</td>
+              <td><code>false</code></td>
+              <td>8.3</td>
             </tr>
           </table>
         </div>
@@ -277,6 +268,11 @@ public int foobar() {
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/javadoc/singlelinejavadoc.xml.template b/src/xdocs/checks/javadoc/singlelinejavadoc.xml.template
index b42f40cf196..0bca2384b10 100644
--- a/src/xdocs/checks/javadoc/singlelinejavadoc.xml.template
+++ b/src/xdocs/checks/javadoc/singlelinejavadoc.xml.template
@@ -18,48 +18,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
-            <tr>
-              <td>ignoredTags</td>
-              <td>
-                Specify
-                <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
-                block tags</a> which are ignored by the check.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>6.8</td>
-            </tr>
-            <tr>
-              <td>ignoreInlineTags</td>
-              <td>
-                Control whether
-                <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDBEFIF">
-                inline tags</a> must be ignored.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/summaryjavadoc.xml b/src/xdocs/checks/javadoc/summaryjavadoc.xml
index afc3db13f72..a4177a0cbb6 100644
--- a/src/xdocs/checks/javadoc/summaryjavadoc.xml
+++ b/src/xdocs/checks/javadoc/summaryjavadoc.xml
@@ -30,17 +30,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
             <tr>
               <td>forbiddenSummaryFragments</td>
               <td>Specify the regexp for forbidden summary fragments.</td>
@@ -55,6 +44,14 @@
               <td><code>&quot;.&quot;</code></td>
               <td>6.2</td>
             </tr>
+            <tr>
+              <td>violateExecutionOnNonTightHtml</td>
+              <td>Control when to print violations if the Javadoc being examined by this check violates the tight html rules defined at <a href="../../writingjavadocchecks.html#Tight-HTML_rules">
+     Tight-HTML Rules</a>.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>8.3</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -221,6 +218,11 @@ public class Test {
               javadoc.parse.rule.error
             </a>
           </li>
+          <li>
+            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.unclosedHtml%22">
+              javadoc.unclosedHtml
+            </a>
+          </li>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fjavadoc%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22javadoc.wrong.singleton.html.tag%22">
               javadoc.wrong.singleton.html.tag
diff --git a/src/xdocs/checks/javadoc/summaryjavadoc.xml.template b/src/xdocs/checks/javadoc/summaryjavadoc.xml.template
index 3294beb305f..8f68c4390e5 100644
--- a/src/xdocs/checks/javadoc/summaryjavadoc.xml.template
+++ b/src/xdocs/checks/javadoc/summaryjavadoc.xml.template
@@ -22,40 +22,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateExecutionOnNonTightHtml</td>
-              <td>
-                Control when to print violations if the Javadoc being examined by this check
-                violates the tight html rules defined at
-                <a href="../../writingjavadocchecks.html#Tight-HTML_rules">Tight-HTML Rules</a>.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.3</td>
-            </tr>
-            <tr>
-              <td>forbiddenSummaryFragments</td>
-              <td>Specify the regexp for forbidden summary fragments.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^$"</code></td>
-              <td>6.0</td>
-            </tr>
-            <tr>
-              <td>period</td>
-              <td>Specify the period symbol at the end of first javadoc sentence.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>"."</code></td>
-              <td>6.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/javadoc/writetag.xml b/src/xdocs/checks/javadoc/writetag.xml
index 4faf30fbe67..34c1137593b 100644
--- a/src/xdocs/checks/javadoc/writetag.xml
+++ b/src/xdocs/checks/javadoc/writetag.xml
@@ -52,38 +52,38 @@
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>4.2</td>
diff --git a/src/xdocs/checks/javadoc/writetag.xml.template b/src/xdocs/checks/javadoc/writetag.xml.template
index 9a2d0d0c872..ef21afe6071 100644
--- a/src/xdocs/checks/javadoc/writetag.xml.template
+++ b/src/xdocs/checks/javadoc/writetag.xml.template
@@ -18,77 +18,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tag</td>
-              <td>Specify the name of tag.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>4.2</td>
-            </tr>
-            <tr>
-              <td>tagFormat</td>
-              <td>Specify the regexp to match tag content.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>4.2</td>
-            </tr>
-            <tr>
-              <td>tagSeverity</td>
-              <td>Specify the severity level when tag is found and printed.</td>
-              <td><a href="../../property_types.html#SeverityLevel">SeverityLevel</a></td>
-              <td><code>info</code></td>
-              <td>4.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>4.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml b/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml
index aaf8481b433..5537f1cc51e 100644
--- a/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml
+++ b/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml
@@ -46,10 +46,7 @@
             </tr>
             <tr>
               <td>max</td>
-              <td>
-                Specify the maximum number of boolean operations allowed in one
-                expression.
-              </td>
+              <td>Specify the maximum number of boolean operations allowed in one expression.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>3</code></td>
               <td>3.4</td>
@@ -57,31 +54,30 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
+                    LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
+                    BAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
+                    BOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
+                    BXOR</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
                     LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
+                    BAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
+                    BOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
+                    BXOR</a>
                   .
               </td>
               <td>3.4</td>
@@ -103,16 +99,22 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-public class Test
+public class Example1
 {
   public static void main(String ... args)
   {
     boolean a = true;
     boolean b = false;
 
-    boolean c = (a &amp; b) | (b ^ a);       // OK, 1(&amp;) + 1(|) + 1(^) = 3 (max allowed 3)
+    boolean c = (a &amp; b) | (b ^ a); // OK, 1(&amp;) + 1(|) + 1(^) = 3 (max allowed 3)
 
-    boolean d = (a &amp; b) ^ (a || b) | a;  // violation, 1(&amp;) + 1(^) + 1(||) + 1(|) = 4
+    boolean d = (a &amp; b) | (b ^ a) | (a ^ b);
+    // violation above, 'Boolean expression complexity is 5 (max allowed is 3)'
+    // 1(&amp;) + 1(|) + 1(^) + 1(|) + 1(^) = 5
+
+    boolean e = a ^ (a || b) ^ (b || a) &amp; (a | b);
+    // violation above, 'Boolean expression complexity is 6 (max allowed is 3)'
+    // 1(^) + 1(||) + 1(^) + 1(||) + 1(&amp;) + 1(|) = 6
   }
 }
         </source>
@@ -131,17 +133,21 @@ public class Test
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-public class Test
+public class Example2
 {
   public static void main(String ... args)
   {
     boolean a = true;
     boolean b = false;
 
-    boolean c = (a &amp; b) | (b ^ a) | (a ^ b);   // OK, 1(&amp;) + 1(|) + 1(^) + 1(|) + 1(^) = 5
+    boolean c = (a &amp; b) | (b ^ a); // OK, 1(&amp;) + 1(|) + 1(^) = 3 (max allowed 5)
+
+    boolean d = (a &amp; b) | (b ^ a) | (a ^ b);
+    // OK above, 1(&amp;) + 1(|) + 1(^) + 1(|) + 1(^) = 5
 
-    boolean d = (a | b) ^ (a | b) ^ (a || b) &amp; b; // violation,
-                                                 // 1(|) + 1(^) + 1(|) + 1(^) + 1(||) + 1(&amp;) = 6
+    boolean e = a ^ (a || b) ^ (b || a) &amp; (a | b);
+    // violation above, 'Boolean expression complexity is 6 (max allowed is 5)'
+    // 1(^) + 1(||) + 1(^) + 1(||) + 1(&amp;) + 1(|) = 6
   }
 }
         </source>
@@ -160,18 +166,21 @@ public class Test
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-public class Test
+public class Example3
 {
   public static void main(String ... args)
   {
     boolean a = true;
     boolean b = false;
 
-    boolean c = (!a &amp;&amp; b) | (a || !b) ^ a;    // OK, 1(&amp;&amp;) + 1(||) + 1(^) = 3
-                                              // | is ignored here
+    boolean c = (a &amp; b) | (b ^ a); // OK, 1(^) = 1 (max allowed 3)
+
+    boolean d = (a &amp; b) | (b ^ a) | (a ^ b);
+    // OK above, 1(^) + 1(^) = 2, &amp; and | are ignored here
 
-    boolean d = a ^ (a || b) ^ (b || a) &amp; a; // violation, 1(^) + 1(||) + 1(^) + 1(||) = 4
-                                             // &amp; is ignored here
+    boolean e = a ^ (a || b) ^ (b || a) &amp; (a | b);
+    // violation above, 'Boolean expression complexity is 4 (max allowed is 3)'
+    // 1(^) + 1(||) + 1(^) + 1(||) = 4, &amp; and | are ignored here
   }
 }
         </source>
diff --git a/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml.template b/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml.template
index 091c35cab8c..800f99fa445 100644
--- a/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml.template
+++ b/src/xdocs/checks/metrics/booleanexpressioncomplexity.xml.template
@@ -36,57 +36,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>
-                Specify the maximum number of boolean operations allowed in one
-                expression.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>3</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                    LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
-                  .
-              </td>
-              <td>3.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -96,13 +49,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -111,13 +64,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -126,13 +79,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/metrics/booleanexpressioncomplexity/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/metrics/classdataabstractioncoupling.xml b/src/xdocs/checks/metrics/classdataabstractioncoupling.xml
index 97327609d97..747d4af88be 100644
--- a/src/xdocs/checks/metrics/classdataabstractioncoupling.xml
+++ b/src/xdocs/checks/metrics/classdataabstractioncoupling.xml
@@ -80,37 +80,19 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>max</td>
-              <td>Specify the maximum threshold allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>7</code></td>
-              <td>3.4</td>
+              <td>excludeClassesRegexps</td>
+              <td>Specify user-configured regular expressions to ignore classes.</td>
+              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
+              <td><code>^$</code></td>
+              <td>7.7</td>
             </tr>
             <tr>
               <td>excludedClasses</td>
               <td>Specify user-configured class names to ignore.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>
-                ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte,
-                Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet,
-                Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException,
-                IllegalStateException, IndexOutOfBoundsException, IntStream, Integer,
-                LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map,
-                NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong,
-                Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short,
-                SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder,
-                SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void,
-                boolean, byte, char, double, float, int, long, short, var, void</code>
-              </td>
+              <td><code>ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, float, int, long, short, var, void</code></td>
               <td>5.7</td>
             </tr>
-            <tr>
-              <td>excludeClassesRegexps</td>
-              <td>Specify user-configured regular expressions to ignore classes.</td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
-              <td><code>^$</code></td>
-              <td>7.7</td>
-            </tr>
             <tr>
               <td>excludedPackages</td>
               <td>Specify user-configured packages to ignore.</td>
@@ -118,6 +100,13 @@
               <td><code>{}</code></td>
               <td>7.7</td>
             </tr>
+            <tr>
+              <td>max</td>
+              <td>Specify the maximum threshold allowed.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>7</code></td>
+              <td>3.4</td>
+            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/metrics/classdataabstractioncoupling.xml.template b/src/xdocs/checks/metrics/classdataabstractioncoupling.xml.template
index 3e1553b37d6..79a02a19f59 100644
--- a/src/xdocs/checks/metrics/classdataabstractioncoupling.xml.template
+++ b/src/xdocs/checks/metrics/classdataabstractioncoupling.xml.template
@@ -71,54 +71,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum threshold allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>7</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>excludedClasses</td>
-              <td>Specify user-configured class names to ignore.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>
-                ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte,
-                Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet,
-                Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException,
-                IllegalStateException, IndexOutOfBoundsException, IntStream, Integer,
-                LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map,
-                NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong,
-                Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short,
-                SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder,
-                SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void,
-                boolean, byte, char, double, float, int, long, short, var, void</code>
-              </td>
-              <td>5.7</td>
-            </tr>
-            <tr>
-              <td>excludeClassesRegexps</td>
-              <td>Specify user-configured regular expressions to ignore classes.</td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
-              <td><code>^$</code></td>
-              <td>7.7</td>
-            </tr>
-            <tr>
-              <td>excludedPackages</td>
-              <td>Specify user-configured packages to ignore.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>7.7</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/metrics/classfanoutcomplexity.xml b/src/xdocs/checks/metrics/classfanoutcomplexity.xml
index df6ceddd28f..aac83973838 100644
--- a/src/xdocs/checks/metrics/classfanoutcomplexity.xml
+++ b/src/xdocs/checks/metrics/classfanoutcomplexity.xml
@@ -46,47 +46,33 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>max</td>
-              <td>Specify the maximum threshold allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>20</code></td>
-              <td>3.4</td>
+              <td>excludeClassesRegexps</td>
+              <td>Specify user-configured regular expressions to ignore classes.</td>
+              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
+              <td><code>^$</code></td>
+              <td>7.7</td>
             </tr>
             <tr>
               <td>excludedClasses</td>
               <td>Specify user-configured class names to ignore.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>
-                ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte,
-                Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet,
-                Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException,
-                IllegalStateException, IndexOutOfBoundsException, IntStream, Integer,
-                LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map,
-                NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong,
-                Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short,
-                SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder,
-                SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void,
-                boolean, byte, char, double, float, int, long, short, var, void</code>
-              </td>
+              <td><code>ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, float, int, long, short, var, void</code></td>
               <td>5.7</td>
             </tr>
-            <tr>
-              <td>excludeClassesRegexps</td>
-              <td>Specify user-configured regular expressions to ignore classes.</td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
-              <td><code>^$</code></td>
-              <td>7.7</td>
-            </tr>
             <tr>
               <td>excludedPackages</td>
-              <td>
-                Specify user-configured packages to ignore. All excluded packages
-                should end with a period, so it also appends a dot to a package name.
-              </td>
+              <td>Specify user-configured packages to ignore.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>{}</code></td>
               <td>7.7</td>
             </tr>
+            <tr>
+              <td>max</td>
+              <td>Specify the maximum threshold allowed.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>20</code></td>
+              <td>3.4</td>
+            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/metrics/classfanoutcomplexity.xml.template b/src/xdocs/checks/metrics/classfanoutcomplexity.xml.template
index cd4d8ade9ab..d6bbcde38f6 100644
--- a/src/xdocs/checks/metrics/classfanoutcomplexity.xml.template
+++ b/src/xdocs/checks/metrics/classfanoutcomplexity.xml.template
@@ -37,57 +37,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum threshold allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>20</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>excludedClasses</td>
-              <td>Specify user-configured class names to ignore.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>
-                ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte,
-                Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet,
-                Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException,
-                IllegalStateException, IndexOutOfBoundsException, IntStream, Integer,
-                LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map,
-                NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong,
-                Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short,
-                SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder,
-                SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void,
-                boolean, byte, char, double, float, int, long, short, var, void</code>
-              </td>
-              <td>5.7</td>
-            </tr>
-            <tr>
-              <td>excludeClassesRegexps</td>
-              <td>Specify user-configured regular expressions to ignore classes.</td>
-              <td><a href="../../property_types.html#Pattern.5B.5D">Pattern[]</a></td>
-              <td><code>^$</code></td>
-              <td>7.7</td>
-            </tr>
-            <tr>
-              <td>excludedPackages</td>
-              <td>
-                Specify user-configured packages to ignore. All excluded packages
-                should end with a period, so it also appends a dot to a package name.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>7.7</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/metrics/cyclomaticcomplexity.xml b/src/xdocs/checks/metrics/cyclomaticcomplexity.xml
index 7e7822305ce..c69a88130e5 100644
--- a/src/xdocs/checks/metrics/cyclomaticcomplexity.xml
+++ b/src/xdocs/checks/metrics/cyclomaticcomplexity.xml
@@ -66,57 +66,53 @@
               <td><code>false</code></td>
               <td>6.11</td>
             </tr>
-
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
+                    LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
+                    LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                   .
               </td>
               <td>3.2</td>
diff --git a/src/xdocs/checks/metrics/cyclomaticcomplexity.xml.template b/src/xdocs/checks/metrics/cyclomaticcomplexity.xml.template
index f1ae86d2e8e..6ddc9617b2b 100644
--- a/src/xdocs/checks/metrics/cyclomaticcomplexity.xml.template
+++ b/src/xdocs/checks/metrics/cyclomaticcomplexity.xml.template
@@ -44,84 +44,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum threshold allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>10</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>switchBlockAsSingleDecisionPoint</td>
-              <td>Control whether to treat the whole switch block as a single decision point.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.11</td>
-            </tr>
-
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                  .
-              </td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/metrics/javancss.xml b/src/xdocs/checks/metrics/javancss.xml
index 85c41d94dab..3cf614b0624 100644
--- a/src/xdocs/checks/metrics/javancss.xml
+++ b/src/xdocs/checks/metrics/javancss.xml
@@ -50,42 +50,30 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>methodMaximum</td>
-              <td>
-                Specify the maximum allowed number of non commenting lines in a
-                method.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>50</code></td>
-              <td>3.5</td>
-            </tr>
             <tr>
               <td>classMaximum</td>
-              <td>
-                Specify the maximum allowed number of non commenting lines in a
-                class.
-              </td>
+              <td>Specify the maximum allowed number of non commenting lines in a class.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>1500</code></td>
               <td>3.5</td>
             </tr>
             <tr>
               <td>fileMaximum</td>
-              <td>
-                Specify the maximum allowed number of non commenting lines in a
-                file including all top level and nested classes.
-              </td>
+              <td>Specify the maximum allowed number of non commenting lines in a file including all top level and nested classes.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>2000</code></td>
               <td>3.5</td>
             </tr>
+            <tr>
+              <td>methodMaximum</td>
+              <td>Specify the maximum allowed number of non commenting lines in a method.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>50</code></td>
+              <td>3.5</td>
+            </tr>
             <tr>
               <td>recordMaximum</td>
-              <td>
-                  Specify the maximum allowed number of non commenting lines in a
-                  record.
-              </td>
+              <td>Specify the maximum allowed number of non commenting lines in a record.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>150</code></td>
               <td>8.36</td>
diff --git a/src/xdocs/checks/metrics/javancss.xml.template b/src/xdocs/checks/metrics/javancss.xml.template
index 6f947959120..4ca0e32cdaa 100644
--- a/src/xdocs/checks/metrics/javancss.xml.template
+++ b/src/xdocs/checks/metrics/javancss.xml.template
@@ -42,55 +42,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>methodMaximum</td>
-              <td>
-                Specify the maximum allowed number of non commenting lines in a
-                method.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>50</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>classMaximum</td>
-              <td>
-                Specify the maximum allowed number of non commenting lines in a
-                class.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>1500</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>fileMaximum</td>
-              <td>
-                Specify the maximum allowed number of non commenting lines in a
-                file including all top level and nested classes.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>2000</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>recordMaximum</td>
-              <td>
-                  Specify the maximum allowed number of non commenting lines in a
-                  record.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>150</code></td>
-              <td>8.36</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/metrics/npathcomplexity.xml.template b/src/xdocs/checks/metrics/npathcomplexity.xml.template
index ce32fb0c761..c889e4a3c3a 100644
--- a/src/xdocs/checks/metrics/npathcomplexity.xml.template
+++ b/src/xdocs/checks/metrics/npathcomplexity.xml.template
@@ -105,22 +105,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum threshold allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>200</code></td>
-              <td>3.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/arraytypestyle.xml b/src/xdocs/checks/misc/arraytypestyle.xml
index ba52cb28cb5..eaf23317a97 100644
--- a/src/xdocs/checks/misc/arraytypestyle.xml
+++ b/src/xdocs/checks/misc/arraytypestyle.xml
@@ -36,9 +36,7 @@
             </tr>
             <tr>
               <td>javaStyle</td>
-              <td>
-                Control whether to enforce Java style (true) or C style (false).
-              </td>
+              <td>Control whether to enforce Java style (true) or C style (false).</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.1</td>
@@ -62,15 +60,15 @@
           Example:
         </p>
         <source>
-public class MyClass {
-  int[] nums; // OK
-  String strings[]; // violation
+public class Example1 {
+  int[] nums; // ok since default format checks for Java style
+  String strings[]; // violation, 'Array brackets at illegal position'
 
-  char[] toCharArray() { // OK
+  char[] toCharArray() {
     return null;
   }
 
-  byte getData()[] { // violation
+  byte getData()[] { // violation, 'Array brackets at illegal position'
     return null;
   }
 }
@@ -91,15 +89,15 @@ public class MyClass {
           Example:
         </p>
         <source>
-public class MyClass {
-  int[] nums; // violation
-  String strings[]; // OK
+public class Example2 {
+  int[] nums; // violation, 'Array brackets at illegal position'
+  String strings[]; // OK as follows C style since 'javaStyle' set to false
 
   char[] toCharArray() { // OK
     return null;
   }
 
-  byte getData()[] { // violation
+  byte getData()[] { // violation, 'Array brackets at illegal position'
     return null;
   }
 }
diff --git a/src/xdocs/checks/misc/arraytypestyle.xml.template b/src/xdocs/checks/misc/arraytypestyle.xml.template
index 49c8a8b1310..92f598ab562 100644
--- a/src/xdocs/checks/misc/arraytypestyle.xml.template
+++ b/src/xdocs/checks/misc/arraytypestyle.xml.template
@@ -26,24 +26,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>javaStyle</td>
-              <td>
-                Control whether to enforce Java style (true) or C style (false).
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.1</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -53,7 +39,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -61,7 +47,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -69,7 +55,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -77,7 +63,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/arraytypestyle/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml b/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml
index c9a27cf254a..4745354715d 100644
--- a/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml
+++ b/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml
@@ -33,15 +33,15 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>allowEscapesForControlCharacters</td>
-              <td>Allow use escapes for non-printable, control characters.</td>
+              <td>allowByTailComment</td>
+              <td>Allow use escapes if trail comment is present.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.8</td>
             </tr>
             <tr>
-              <td>allowByTailComment</td>
-              <td>Allow use escapes if trail comment is present.</td>
+              <td>allowEscapesForControlCharacters</td>
+              <td>Allow use escapes for non-printable, control characters.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.8</td>
@@ -70,19 +70,32 @@
         </p>
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
-  &lt;module name=&quot;TreeWalker&quot;&gt;
-    &lt;module name=&quot;AvoidEscapedUnicodeCharacters&quot;/&gt;
-  &lt;/module&gt;
+    &lt;module name=&quot;TreeWalker&quot;&gt;
+        &lt;module name=&quot;AvoidEscapedUnicodeCharacters&quot;/&gt;
+    &lt;/module&gt;
 &lt;/module&gt;
         </source>
         <p id="Example1-code">
           Examples of using Unicode:
         </p>
         <source>
-String unitAbbrev = &quot;&#x3bc;s&quot;;     // OK, perfectly clear even without a comment.
-String unitAbbrev = &quot;\u03bcs&quot;;// violation, the reader has no idea what this is.
-return '\ufeff' + content;    // OK, an example of non-printable,
-                              // control characters (byte order mark).
+public class Example1 {
+  // OK, perfectly clear even without a comment.
+  String unitAbbrev = &quot;&#x3bc;s&quot;;
+  // violation below, the reader has no idea what this is. 'should be avoided.'
+  String unitAbbrev1 = &quot;\u03bcs&quot;;
+  // violation below
+  String unitAbbrev2 = &quot;\u03bc\u03bc\u03bc&quot;;
+  // violation below
+  String unitAbbrev3 = &quot;\u03bcs&quot;; // it is  &#x3bc;s
+  // violation below
+  String unitAbbrev4 = &quot;\u03bc\u03bcs&quot;;
+  public static int content() {
+    char content = 'r';
+    // violation below
+    return '\ufeff' + content;
+  }
+}
         </source>
         <p id="Example2-config">
           An example of how to configure the check to allow using escapes
@@ -101,9 +114,23 @@ return '\ufeff' + content;    // OK, an example of non-printable,
           Example of using escapes for non-printable, control characters:
         </p>
         <source>
-String unitAbbrev = &quot;&#x3bc;s&quot;;      // OK, a normal String
-String unitAbbrev = &quot;\u03bcs&quot;; // violation, &quot;\u03bcs&quot; is a printable character.
-return '\ufeff' + content;     // OK, non-printable control character.
+public class Example2 {
+  // OK, a normal String below
+  String unitAbbrev = &quot;&#x3bc;s&quot;;
+  // violation below, &#x3bc;s is a printable character. 'should be avoided.'
+  String unitAbbrev1 = &quot;\u03bcs&quot;;
+  // violation below
+  String unitAbbrev2 = &quot;\u03bc\u03bc\u03bc&quot;;
+  // violation below
+  String unitAbbrev3 = &quot;\u03bcs&quot;;
+  // violation below
+  String unitAbbrev4 = &quot;\u03bc\u03bcs&quot;;
+  public static int content() {
+    char content = 'r';
+    // OK, non-printable control character.
+    return '\ufeff' + content;
+  }
+}
         </source>
         <p id="Example3-config">
           An example of how to configure the check to allow using escapes
@@ -122,10 +149,23 @@ return '\ufeff' + content;     // OK, non-printable control character.
           Example of using escapes if trail comment is present:
         </p>
         <source>
-String unitAbbrev = &quot;&#x3bc;s&quot;;      // OK, a normal String
-String unitAbbrev = &quot;\u03bcs&quot;; // OK, Greek letter mu, &quot;s&quot;
-return '\ufeff' + content;
-// -----^--------------------- violation, comment is not used within same line.
+public class Example3 {
+  // OK, a normal String below
+  String unitAbbrev = &quot;&#x3bc;s&quot;;
+  // violation below
+  String unitAbbrev1 = &quot;\u03bcs&quot;;
+  // violation below
+  String unitAbbrev2 = &quot;\u03bc\u03bc\u03bc&quot;;
+  // violation below
+  String unitAbbrev3 = &quot;\u03bcs&quot;;
+  // ok, because there is trailing comment and allowByTailComment=true
+  String unitAbbrev4 = &quot;\u03bc\u03bcs&quot;; // it is  &#x3bc;s
+  public static int content() {
+    char content = 'r';
+    // violation below
+    return '\ufeff' + content;
+  }
+}
         </source>
         <p id="Example4-config">
           An example of how to configure the check to allow if
@@ -142,11 +182,23 @@ return '\ufeff' + content;
         </source>
         <p id="Example4-code">Example of using escapes if all characters in literal are escaped:</p>
         <source>
-String unitAbbrev = &quot;&#x3bc;s&quot;;      // OK, a normal String
-String unitAbbrev = &quot;\u03bcs&quot;; // violation, not all characters are escaped ('s').
-String unitAbbrev = &quot;\u03bc\u03bc\u03bc&quot;; // OK
-String unitAbbrev = &quot;\u03bc\u03bcs&quot;;// violation, not all characters are escaped ('s').
-return '\ufeff' + content;          // OK, all control characters are escaped
+public class Example4 {
+  // OK, a normal String below
+  String unitAbbrev = &quot;&#x3bc;s&quot;;
+  // violation below, not all characters are escaped ('s'). 'should be avoided.'
+  String unitAbbrev1 = &quot;\u03bcs&quot;;
+  // ok, because below are escape characters and allowIfAllCharacters = true.
+  String unitAbbrev2 = &quot;\u03bc\u03bc\u03bc&quot;;
+  // violation below
+  String unitAbbrev3 = &quot;\u03bcs&quot;; // it is  &#x3bc;s
+  // violation below, not all characters are escaped ('s'). 'should be avoided.'
+  String unitAbbrev4 = &quot;\u03bc\u03bcs&quot;;
+  public static int content() {
+    char content = 'r';
+    // OK, all control characters are escaped below
+    return '\ufeff' + content;
+  }
+}
         </source>
         <p id="Example5-config">
           An example of how to configure the check to allow using escapes
@@ -163,11 +215,23 @@ return '\ufeff' + content;          // OK, all control characters are escaped
         </source>
         <p id="Example5-code">Example of using escapes for non-printable whitespace characters:</p>
         <source>
-String unitAbbrev = &quot;&#x3bc;s&quot;;       // OK, a normal String
-String unitAbbrev1 = &quot;\u03bcs&quot;; // violation, printable escape character.
-String unitAbbrev2 = &quot;\u03bc\u03bc\u03bc&quot;; // violation, printable escape character.
-String unitAbbrev3 = &quot;\u03bc\u03bcs&quot;;// violation, printable escape character.
-return '\ufeff' + content;           // OK, non-printable escape character.
+public class Example5 {
+  // OK, a normal String below.
+  String unitAbbrev = &quot;&#x3bc;s&quot;;
+  // violation below, printable escape character. 'should be avoided.'
+  String unitAbbrev1 = &quot;\u03bcs&quot;;
+  // violation below, printable escape character. 'should be avoided.'
+  String unitAbbrev2 = &quot;\u03bc\u03bc\u03bc&quot;;
+  // violation below
+  String unitAbbrev3 = &quot;\u03bcs&quot;; // it is &#x3bc;s
+  // violation below
+  String unitAbbrev4 = &quot;\u03bc\u03bcs&quot;;
+  public static int content() {
+    char content = 'r';
+    // OK, non-printable escape character below
+    return '\ufeff' + content;
+  }
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml.template b/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml.template
index 18b0c5c4f11..87274af667d 100644
--- a/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml.template
+++ b/src/xdocs/checks/misc/avoidescapedunicodecharacters.xml.template
@@ -24,43 +24,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowEscapesForControlCharacters</td>
-              <td>Allow use escapes for non-printable, control characters.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>allowByTailComment</td>
-              <td>Allow use escapes if trail comment is present.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>allowIfAllCharactersEscaped</td>
-              <td>Allow if all characters in literal are escaped.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>allowNonPrintableEscapes</td>
-              <td>Allow use escapes for non-printable, whitespace characters.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -70,7 +37,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -78,7 +45,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -87,7 +54,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -95,7 +62,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -104,7 +71,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">
@@ -112,7 +79,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example4-config">
@@ -121,13 +88,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example4-code">Example of using escapes if all characters in literal are escaped:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example5-config">
@@ -136,13 +103,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example5-code">Example of using escapes for non-printable whitespace characters:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/avoidescapedunicodecharacters/Example5.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/misc/commentsindentation.xml b/src/xdocs/checks/misc/commentsindentation.xml
index 5bb74413555..b323640bb55 100644
--- a/src/xdocs/checks/misc/commentsindentation.xml
+++ b/src/xdocs/checks/misc/commentsindentation.xml
@@ -17,6 +17,7 @@
           here</a>
         </p>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
           <table>
@@ -30,19 +31,18 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SINGLE_LINE_COMMENT">
-                  SINGLE_LINE_COMMENT</a>
+                    SINGLE_LINE_COMMENT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BLOCK_COMMENT_BEGIN">
-                  BLOCK_COMMENT_BEGIN</a>
+                    BLOCK_COMMENT_BEGIN</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SINGLE_LINE_COMMENT">
-                  SINGLE_LINE_COMMENT</a>
+                    SINGLE_LINE_COMMENT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BLOCK_COMMENT_BEGIN">
-                  BLOCK_COMMENT_BEGIN</a>
+                    BLOCK_COMMENT_BEGIN</a>
                   .
               </td>
               <td>6.10</td>
diff --git a/src/xdocs/checks/misc/commentsindentation.xml.template b/src/xdocs/checks/misc/commentsindentation.xml.template
index d5c4f91280c..b4c3ed3be9b 100644
--- a/src/xdocs/checks/misc/commentsindentation.xml.template
+++ b/src/xdocs/checks/misc/commentsindentation.xml.template
@@ -17,37 +17,13 @@
           here</a>
         </p>
       </subsection>
+
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SINGLE_LINE_COMMENT">
-                  SINGLE_LINE_COMMENT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BLOCK_COMMENT_BEGIN">
-                  BLOCK_COMMENT_BEGIN</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SINGLE_LINE_COMMENT">
-                  SINGLE_LINE_COMMENT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BLOCK_COMMENT_BEGIN">
-                  BLOCK_COMMENT_BEGIN</a>
-                  .
-              </td>
-              <td>6.10</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/descendanttoken.xml b/src/xdocs/checks/misc/descendanttoken.xml
index 8880baa6647..01479e8224f 100644
--- a/src/xdocs/checks/misc/descendanttoken.xml
+++ b/src/xdocs/checks/misc/descendanttoken.xml
@@ -36,20 +36,10 @@
             <tr>
               <td>limitedTokens</td>
               <td>Specify set of tokens with limited occurrences as descendants.</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
+              <td>subset of tokens <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a></td>
               <td><code>{}</code></td>
               <td>3.2</td>
             </tr>
-            <tr>
-              <td>minimumDepth</td>
-              <td>Specify the minimum depth for descendant counts.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>3.2</td>
-            </tr>
             <tr>
               <td>maximumDepth</td>
               <td>Specify the maximum depth for descendant counts.</td>
@@ -58,10 +48,10 @@
               <td>3.2</td>
             </tr>
             <tr>
-              <td>minimumNumber</td>
-              <td>Specify a minimum count for descendants.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
+              <td>maximumMessage</td>
+              <td>Define the violation message when the maximum count is exceeded.</td>
+              <td><a href="../../property_types.html#String">String</a></td>
+              <td><code>null</code></td>
               <td>3.2</td>
             </tr>
             <tr>
@@ -72,14 +62,11 @@
               <td>3.2</td>
             </tr>
             <tr>
-              <td>sumTokenCounts</td>
-              <td>
-                Control whether the number of tokens found should be calculated
-                from the sum of the individual token counts.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
+              <td>minimumDepth</td>
+              <td>Specify the minimum depth for descendant counts.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>0</code></td>
+              <td>3.2</td>
             </tr>
             <tr>
               <td>minimumMessage</td>
@@ -89,12 +76,19 @@
               <td>3.2</td>
             </tr>
             <tr>
-              <td>maximumMessage</td>
-              <td>Define the violation message when the maximum count is exceeded.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
+              <td>minimumNumber</td>
+              <td>Specify a minimum count for descendants.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>0</code></td>
               <td>3.2</td>
             </tr>
+            <tr>
+              <td>sumTokenCounts</td>
+              <td>Control whether the number of tokens found should be calculated from the sum of the individual token counts.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>5.0</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
diff --git a/src/xdocs/checks/misc/descendanttoken.xml.template b/src/xdocs/checks/misc/descendanttoken.xml.template
index 4082de14108..fd17ab36e9f 100644
--- a/src/xdocs/checks/misc/descendanttoken.xml.template
+++ b/src/xdocs/checks/misc/descendanttoken.xml.template
@@ -25,87 +25,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>limitedTokens</td>
-              <td>Specify set of tokens with limited occurrences as descendants.</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a>
-              </td>
-              <td><code>{}</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>minimumDepth</td>
-              <td>Specify the minimum depth for descendant counts.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>maximumDepth</td>
-              <td>Specify the maximum depth for descendant counts.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>2147483647</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>minimumNumber</td>
-              <td>Specify a minimum count for descendants.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>maximumNumber</td>
-              <td>Specify a maximum count for descendants.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>2147483647</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>sumTokenCounts</td>
-              <td>
-                Control whether the number of tokens found should be calculated
-                from the sum of the individual token counts.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>minimumMessage</td>
-              <td>Define the violation message when the minimum count is not reached.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>maximumMessage</td>
-              <td>Define the violation message when the maximum count is exceeded.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>set of any supported
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">
-                    tokens</a>
-              </td>
-              <td><code>empty</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java"/>
+         </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/finalparameters.xml b/src/xdocs/checks/misc/finalparameters.xml
index 2f7294bebe7..b77fc048d33 100644
--- a/src/xdocs/checks/misc/finalparameters.xml
+++ b/src/xdocs/checks/misc/finalparameters.xml
@@ -44,23 +44,22 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#FOR_EACH_CLAUSE">
-                  FOR_EACH_CLAUSE</a>
+                    FOR_EACH_CLAUSE</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                   .
               </td>
               <td>3.0</td>
@@ -85,13 +84,13 @@
           Example:
         </p>
         <source>
-public class Point {
-  public Point() { } // ok
-  public Point(final int m) { } // ok
-  public Point(final int m,int n) { } // violation, n should be final
-  public void methodOne(final int x) { } // ok
-  public void methodTwo(int x) { } // violation, x should be final
-  public static void main(String[] args) { } // violation, args should be final
+public class Example1 {
+  public Example1() { }
+  public Example1(final int m) { }
+  public Example1(final int m, int n) { } // violation, 'n should be final'
+  public void methodOne(final int x) { }
+  public void methodTwo(int x) { } // violation, 'x should be final'
+  public static void main(String[] args) { } // violation, 'args should be final'
 }
         </source>
         <p id="Example2-config">
@@ -111,13 +110,13 @@ public class Point {
           Example:
         </p>
         <source>
-public class Point {
-  public Point() { } // ok
-  public Point(final int m) { } // ok
-  public Point(final int m,int n) { } // violation, n should be final
-  public void methodOne(final int x) { } // ok
-  public void methodTwo(int x) { } // ok
-  public static void main(String[] args) { } // ok
+public class Example2 {
+  public Example2() { }
+  public Example2(final int m) { }
+  public Example2(final int m, int n) { } // violation, 'n should be final'
+  public void methodOne(final int x) { }
+  public void methodTwo(int x) { }
+  public static void main(String[] args) { }
 }
         </source>
         <p id="Example3-config">
@@ -138,13 +137,13 @@ public class Point {
           Example:
         </p>
         <source>
-public class Point {
-  public Point() { } // ok
-  public Point(final int m) { } // ok
-  public Point(final int m,int n) { } // ok
-  public void methodOne(final int x) { } // ok
-  public void methodTwo(int x) { } // ok
-  public static void main(String[] args) { } // violation, args should be final
+public class Example3 {
+  public Example3() { }
+  public Example3(final int m) { }
+  public Example3(final int m, int n) { }
+  public void methodOne(final int x) { }
+  public void methodTwo(int x) { }
+  public static void main(String[] args) { } // violation, 'args should be final'
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/misc/finalparameters.xml.template b/src/xdocs/checks/misc/finalparameters.xml.template
index ce5a2e78c5e..a2187f1ff47 100644
--- a/src/xdocs/checks/misc/finalparameters.xml.template
+++ b/src/xdocs/checks/misc/finalparameters.xml.template
@@ -26,46 +26,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>ignorePrimitiveTypes</td>
-              <td>Ignore primitive types as parameters.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#FOR_EACH_CLAUSE">
-                  FOR_EACH_CLAUSE</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -76,7 +40,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -84,7 +48,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -93,7 +57,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -101,7 +65,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -111,7 +75,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">
@@ -119,7 +83,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/finalparameters/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/misc/indentation.xml b/src/xdocs/checks/misc/indentation.xml
index 868a56ec598..143d49d1671 100644
--- a/src/xdocs/checks/misc/indentation.xml
+++ b/src/xdocs/checks/misc/indentation.xml
@@ -57,11 +57,16 @@ if ((condition1 &amp;&amp; condition2)
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>arrayInitIndent</td>
+              <td>Specify how far an array initialization should be indented when on next line.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>4</code></td>
+              <td>5.8</td>
+            </tr>
             <tr>
               <td>basicOffset</td>
-              <td>
-                Specify how far new indentation level should be indented when on the next line.
-              </td>
+              <td>Specify how far new indentation level should be indented when on the next line.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>4</code></td>
               <td>3.1</td>
@@ -81,36 +86,25 @@ if ((condition1 &amp;&amp; condition2)
               <td>3.1</td>
             </tr>
             <tr>
-              <td>throwsIndent</td>
-              <td>Specify how far a throws clause should be indented when on next line.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>5.7</td>
-            </tr>
-            <tr>
-              <td>arrayInitIndent</td>
-              <td>Specify how far an array initialisation should be indented when on next line.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>5.8</td>
+              <td>forceStrictCondition</td>
+              <td>Force strict indent level in line wrapping case. If value is true, line wrap indent have to be same as lineWrappingIndentation parameter. If value is false, line wrap indent could be bigger on any value user would like.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>6.3</td>
             </tr>
             <tr>
               <td>lineWrappingIndentation</td>
-              <td>
-                Specify how far continuation line should be indented when line-wrapping is present.
-              </td>
+              <td>Specify how far continuation line should be indented when line-wrapping is present.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>4</code></td>
               <td>5.9</td>
             </tr>
             <tr>
-              <td>forceStrictCondition</td>
-              <td>Force strict indent level in line wrapping case. If value is true, line wrap
-                  indent have to be same as lineWrappingIndentation parameter. If value is false,
-                  line wrap indent could be bigger on any value user would like.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.3</td>
+              <td>throwsIndent</td>
+              <td>Specify how far a throws clause should be indented when on next line.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>4</code></td>
+              <td>5.7</td>
             </tr>
           </table>
         </div>
diff --git a/src/xdocs/checks/misc/indentation.xml.template b/src/xdocs/checks/misc/indentation.xml.template
index d9d51756300..e17c16dfc44 100644
--- a/src/xdocs/checks/misc/indentation.xml.template
+++ b/src/xdocs/checks/misc/indentation.xml.template
@@ -49,70 +49,10 @@ if ((condition1 &amp;&amp; condition2)
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>basicOffset</td>
-              <td>
-                Specify how far new indentation level should be indented when on the next line.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>braceAdjustment</td>
-              <td>Specify how far a braces should be indented when on the next line.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>caseIndent</td>
-              <td>Specify how far a case label should be indented when on next line.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>throwsIndent</td>
-              <td>Specify how far a throws clause should be indented when on next line.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>5.7</td>
-            </tr>
-            <tr>
-              <td>arrayInitIndent</td>
-              <td>Specify how far an array initialisation should be indented when on next line.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>lineWrappingIndentation</td>
-              <td>
-                Specify how far continuation line should be indented when line-wrapping is present.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>4</code></td>
-              <td>5.9</td>
-            </tr>
-            <tr>
-              <td>forceStrictCondition</td>
-              <td>Force strict indent level in line wrapping case. If value is true, line wrap
-                  indent have to be same as lineWrappingIndentation parameter. If value is false,
-                  line wrap indent could be bigger on any value user would like.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.3</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/newlineatendoffile.xml b/src/xdocs/checks/misc/newlineatendoffile.xml
index 9aa92bb3030..8dd4f71a775 100644
--- a/src/xdocs/checks/misc/newlineatendoffile.xml
+++ b/src/xdocs/checks/misc/newlineatendoffile.xml
@@ -70,25 +70,20 @@ StaticMethodCandidateCheck.name = Static Method Candidate
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>lineSeparator</td>
-              <td>Specify the type of line separator.</td>
-              <td>
-                <a href="../../property_types.html#LineSeparatorOption">
-                  LineSeparatorOption
-                </a>
-              </td>
-              <td><code>lf_cr_crlf</code></td>
-              <td>3.1</td>
-            </tr>
             <tr>
               <td>fileExtensions</td>
-              <td>Specify the file type extension of the files to check.</td>
+              <td>Specify the file extensions of the files to process.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>all files</code></td>
               <td>3.1</td>
             </tr>
-
+            <tr>
+              <td>lineSeparator</td>
+              <td>Specify the type of line separator.</td>
+              <td><a href="../../property_types.html#LineSeparatorOption">LineSeparatorOption</a></td>
+              <td><code>lf_cr_crlf</code></td>
+              <td>3.1</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -102,21 +97,21 @@ StaticMethodCandidateCheck.name = Static Method Candidate
   &lt;module name=&quot;NewlineAtEndOfFile&quot;/&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example1-code">Example:</p>
+        <p id="Example1-code">Correct Example:</p>
         <source>
-// File ending with a new line
-public class Test {&#x2936;
-&#x2936;
-}&#x2936; // ok
-Note: The comment // ok is a virtual, not actually present in the file
+public class Example1 { // &#x2936;
+// &#x2936;
+} // &#x2936; // ok, file ends with a new line.
+        </source>
 
-// File ending without a new line
-public class Test1 {&#x2936;
-&#x2936;
-} // violation, the file does not end with a new line
+        <p id="Example2-code">Violation Example:</p>
+        <source>
+public class Example2 { // &#x2936;
+// &#x2936;
+} // no &#x2936; below it is violation
         </source>
 
-        <p id="Example2-config">
+        <p id="Example3-config">
           To configure the check to always use Unix-style line separators:
         </p>
         <source>
@@ -126,21 +121,13 @@ public class Test1 {&#x2936;
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example2-code">Example:</p>
+        <p id="Example3-code">Example:</p>
         <source>
-// File ending with a new line
-public class Test {&#x2936;
-&#x2936;
-}&#x2936; // ok
-Note: The comment // ok is a virtual, not actually present in the file
-
-// File ending without a new line
-public class Test1 {&#x2936;
-&#x2936;
-}&#x240d;&#x2936; // violation, expected line ending for file is LF(\n), but CRLF(\r\n) is detected
+public class Example3 { // &#x2936;
+} // &#x240d;&#x2936;  it is violation as line ending is different from expected
         </source>
 
-        <p id="Example3-config">
+        <p id="Example4-config">
           To configure the check to work only on Java, XML and Python files:
         </p>
         <source>
@@ -150,17 +137,22 @@ public class Test1 {&#x2936;
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example3-code">Example:</p>
+        <p id="Example4-code">Python file <code>Example4.py</code>:</p>
         <source>
-// Any java file
-public class Test {&#x2936;
-} // violation, file should end with a new line.
+print(&quot;Hello world!&quot;)
+# no &#x2936; below it is violation
+        </source>
 
-// Any py file
-print(&quot;Hello World&quot;) // violation, file should end with a new line.
+        <p id="Example5-code">Java file <code>Example5.java</code>:</p>
+        <source>
+public class Example5 { // &#x2936;
+// &#x2936;
+} // no &#x2936; below it is violation
+        </source>
 
-// Any txt file
-This is a sample text file. // ok, this file is not specified in the config.
+        <p id="Example6-code">Text file <code>Example6.txt</code>:</p>
+        <source>
+Sample txt file. // ok, this file is not specified in the config.
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/newlineatendoffile.xml.template b/src/xdocs/checks/misc/newlineatendoffile.xml.template
index a38fd30bfbc..12ec0678d43 100644
--- a/src/xdocs/checks/misc/newlineatendoffile.xml.template
+++ b/src/xdocs/checks/misc/newlineatendoffile.xml.template
@@ -62,34 +62,10 @@ StaticMethodCandidateCheck.name = Static Method Candidate
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>lineSeparator</td>
-              <td>Specify the type of line separator.</td>
-              <td>
-                <a href="../../property_types.html#LineSeparatorOption">
-                  LineSeparatorOption
-                </a>
-              </td>
-              <td><code>lf_cr_crlf</code></td>
-              <td>3.1</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of the files to check.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>3.1</td>
-            </tr>
-
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -99,43 +75,64 @@ StaticMethodCandidateCheck.name = Static Method Candidate
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example1-code">Example:</p>
+        <p id="Example1-code">Correct Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.java"/>
+          <param name="type" value="code"/>
+        </macro>
+
+        <p id="Example2-code">Violation Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
 
-        <p id="Example2-config">
+        <p id="Example3-config">
           To configure the check to always use Unix-style line separators:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example2-code">Example:</p>
+        <p id="Example3-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
 
-        <p id="Example3-config">
+        <p id="Example4-config">
           To configure the check to work only on Java, XML and Python files:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example4.py"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example3-code">Example:</p>
+        <p id="Example4-code">Python file <code>Example4.py</code>:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example4.py"/>
+          <param name="type" value="code"/>
+        </macro>
+
+        <p id="Example5-code">Java file <code>Example5.java</code>:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example5.java"/>
+          <param name="type" value="code"/>
+        </macro>
+
+        <p id="Example6-code">Text file <code>Example6.txt</code>:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/newlineatendoffile/Example6.txt"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/misc/nocodeinfile.xml b/src/xdocs/checks/misc/nocodeinfile.xml
index 539a46d9f11..0c2146ea8a1 100644
--- a/src/xdocs/checks/misc/nocodeinfile.xml
+++ b/src/xdocs/checks/misc/nocodeinfile.xml
@@ -12,6 +12,7 @@
       <subsection name="Description" id="Description">
         <p>
           Checks whether file contains code.
+          Java compiler is not raising errors on files with no code or all commented out.
           Files which are considered to have no code:
         </p>
         <ul>
@@ -38,19 +39,20 @@
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
-          Example:
-        </p>
-        <p id="Example1-code">
-          Content of the files:
-        </p>
+        <p id="Example1-code">Example:</p>
         <source>
-// single-line comment // violation
+// the violation is on first line of file
+// public class Example1 {
+// single-line comment is not code
+// }
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-/* // violation
- block comment
+// the violation is on first line of file
+/*
+ public class Example2 {
+ block comment is not code
+ }
 */
         </source>
       </subsection>
diff --git a/src/xdocs/checks/misc/nocodeinfile.xml.template b/src/xdocs/checks/misc/nocodeinfile.xml.template
index 8c7924aad21..8d4cfa3ae1d 100644
--- a/src/xdocs/checks/misc/nocodeinfile.xml.template
+++ b/src/xdocs/checks/misc/nocodeinfile.xml.template
@@ -12,6 +12,7 @@
       <subsection name="Description" id="Description">
         <p>
           Checks whether file contains code.
+          Java compiler is not raising errors on files with no code or all commented out.
           Files which are considered to have no code:
         </p>
         <ul>
@@ -33,24 +34,19 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p>
-          Example:
-        </p>
-        <p id="Example1-code">
-          Content of the files:
-        </p>
+        <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/nocodeinfile/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/misc/orderedproperties.xml b/src/xdocs/checks/misc/orderedproperties.xml
index 3b3d9df5a38..b512870926a 100644
--- a/src/xdocs/checks/misc/orderedproperties.xml
+++ b/src/xdocs/checks/misc/orderedproperties.xml
@@ -43,7 +43,7 @@
             </tr>
             <tr>
               <td>fileExtensions</td>
-              <td>Specify file type extension of the files to check.</td>
+              <td>Specify the file extensions of the files to process.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>.properties</code></td>
               <td>8.22</td>
diff --git a/src/xdocs/checks/misc/orderedproperties.xml.template b/src/xdocs/checks/misc/orderedproperties.xml.template
index 342b0e0d86b..4a2eb39eed2 100644
--- a/src/xdocs/checks/misc/orderedproperties.xml.template
+++ b/src/xdocs/checks/misc/orderedproperties.xml.template
@@ -33,22 +33,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify file type extension of the files to check.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>.properties</code></td>
-              <td>8.22</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/outertypefilename.xml b/src/xdocs/checks/misc/outertypefilename.xml
index 9be2f2ff773..9455f61ba98 100644
--- a/src/xdocs/checks/misc/outertypefilename.xml
+++ b/src/xdocs/checks/misc/outertypefilename.xml
@@ -27,35 +27,35 @@
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example1-code">Example of class Test in a file named Test.java</p>
+        <p id="Example1-code">
+          Example file content with name of file Example1.java
+        </p>
         <source>
-public class Test { // OK
-
-}
+public class Example1 {}
         </source>
-        <p id="Example2-code">Example of class Foo in a file named Test.java</p>
+        <p id="Example2-code">
+          Example file content with name of file Example2.java
+        </p>
         <source>
-class Foo { // violation
-
-}
+class Example2ButNotSameName {} // violation
         </source>
-        <p id="Example3-code">Example of interface Foo in a file named Test.java</p>
+        <p id="Example3-code">
+          Example file content with name of file Example3.java
+        </p>
         <source>
-interface Foo { // violation
-
-}
+interface Example3ButNotSameName {} // violation
         </source>
-        <p id="Example4-code">Example of enum Foo in a file named Test.java</p>
+        <p id="Example4-code">
+          Example file content with name of file Example4.java
+        </p>
         <source>
-enum Foo { // violation
-
-}
+enum Example4ButNotSameName {} // violation
         </source>
-        <p id="Example5-code">Example of record Foo in a file named Test.java</p>
+        <p id="Example5-code">
+          Example file content with name of file Example5.java
+        </p>
         <source>
-record Foo { // violation
-
-}
+class Example5ButNotSameName {} // violation
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/outertypefilename.xml.template b/src/xdocs/checks/misc/outertypefilename.xml.template
index 51bfc92d622..d947cc16325 100644
--- a/src/xdocs/checks/misc/outertypefilename.xml.template
+++ b/src/xdocs/checks/misc/outertypefilename.xml.template
@@ -22,37 +22,47 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example1-code">Example of class Test in a file named Test.java</p>
+        <p id="Example1-code">
+          Example file content with name of file Example1.java
+        </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
-        <p id="Example2-code">Example of class Foo in a file named Test.java</p>
+        <p id="Example2-code">
+          Example file content with name of file Example2.java
+        </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
-        <p id="Example3-code">Example of interface Foo in a file named Test.java</p>
+        <p id="Example3-code">
+          Example file content with name of file Example3.java
+        </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
-        <p id="Example4-code">Example of enum Foo in a file named Test.java</p>
+        <p id="Example4-code">
+          Example file content with name of file Example4.java
+        </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
-        <p id="Example5-code">Example of record Foo in a file named Test.java</p>
+        <p id="Example5-code">
+          Example file content with name of file Example5.java
+        </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/Example5.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/misc/todocomment.xml b/src/xdocs/checks/misc/todocomment.xml
index 1eae2660444..0837a3abbc0 100644
--- a/src/xdocs/checks/misc/todocomment.xml
+++ b/src/xdocs/checks/misc/todocomment.xml
@@ -63,8 +63,16 @@
           Example:
         </p>
         <source>
-i++; // TODO: do differently in future   // violation
-i++; // todo: do differently in future   // OK
+public class Example1 {
+  int i;
+  int x;
+  public void test() {
+    i++;   // TODO: do differently in future    // violation
+    i++;   // todo: do differently in future
+    i=i/x; // FIXME: handle x = 0 case
+    i=i/x; // FIX :  handle x = 0 case
+  }
+}
         </source>
         <p id="Example2-config">
           To configure the check for comments that contain <code>TODO</code> and <code>FIXME</code>:
@@ -82,10 +90,16 @@ i++; // todo: do differently in future   // OK
           Example:
         </p>
         <source>
-i++;   // TODO: do differently in future   // violation
-i++;   // todo: do differently in future   // OK
-i=i/x; // FIXME: handle x = 0 case         // violation
-i=i/x; // FIX :  handle x = 0 case         // OK
+public class Example2 {
+  int i;
+  int x;
+  public void test() {
+    i++;   // TODO: do differently in future    // violation
+    i++;   // todo: do differently in future
+    i=i/x; // FIXME: handle x = 0 case          // violation
+    i=i/x; // FIX :  handle x = 0 case
+  }
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/todocomment.xml.template b/src/xdocs/checks/misc/todocomment.xml.template
index e64537d2905..28755c10d63 100644
--- a/src/xdocs/checks/misc/todocomment.xml.template
+++ b/src/xdocs/checks/misc/todocomment.xml.template
@@ -20,22 +20,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify pattern to match comments against.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"TODO:"</code></td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -54,7 +42,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">
@@ -62,7 +50,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -70,7 +58,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">
@@ -78,7 +66,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/todocomment/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/misc/trailingcomment.xml b/src/xdocs/checks/misc/trailingcomment.xml
index f58792c9836..b1c866b6c3e 100644
--- a/src/xdocs/checks/misc/trailingcomment.xml
+++ b/src/xdocs/checks/misc/trailingcomment.xml
@@ -90,8 +90,7 @@ d = e / f;        // Another comment for this line
             </tr>
             <tr>
               <td>legalComment</td>
-              <td>Define pattern for text allowed in trailing comments. This
-                  pattern will not be applied to multiline comments.</td>
+              <td>Define pattern for text allowed in trailing comments. This pattern will not be applied to multiline comments.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>4.2</td>
diff --git a/src/xdocs/checks/misc/trailingcomment.xml.template b/src/xdocs/checks/misc/trailingcomment.xml.template
index 707abea0f52..4172271882e 100644
--- a/src/xdocs/checks/misc/trailingcomment.xml.template
+++ b/src/xdocs/checks/misc/trailingcomment.xml.template
@@ -73,30 +73,10 @@ d = e / f;        // Another comment for this line
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify pattern for strings allowed before the comment.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[\s});]*$"</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>legalComment</td>
-              <td>Define pattern for text allowed in trailing comments. This
-                  pattern will not be applied to multiline comments.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>4.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/translation.xml b/src/xdocs/checks/misc/translation.xml
index 888475b7a37..289f0157313 100644
--- a/src/xdocs/checks/misc/translation.xml
+++ b/src/xdocs/checks/misc/translation.xml
@@ -54,6 +54,12 @@ messages.properties: Key 'ok' missing.
           one language code) of required translations the check will also check for
           existence of default translation files in project.
         </p>
+        <p>
+          Note: If your project uses preprocessed translation files and the original files
+          do not have the <code>properties</code> extension,
+          you can specify additional file extensions
+          via the <code>fileExtensions</code> property.
+        </p>
         <p>
           Attention: the check will perform the validation of ISO codes if the option
           is used. So, if you specify, for example, &quot;mm&quot; for language code, TranslationCheck
@@ -77,34 +83,24 @@ messages.properties: Key 'ok' missing.
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>
-                Specify file type extension to identify translation files. Setting
-                this property is typically only required if your
-                translation files are preprocessed and the original files
-                do not have the extension <code>.properties</code>
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>.properties</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>baseName</td>
-              <td>Specify
-                <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/ResourceBundle.html">
-                Base name</a> of resource bundles which contain message resources. It helps
-                the check to distinguish config and localization resources.
-              </td>
+              <td>Specify <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/ResourceBundle.html">
+ Base name</a> of resource bundles which contain message resources. It helps the check to distinguish config and localization resources.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^messages.*$&quot;</code></td>
               <td>6.17</td>
             </tr>
+            <tr>
+              <td>fileExtensions</td>
+              <td>Specify the file extensions of the files to process.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>.properties</code></td>
+              <td>3.0</td>
+            </tr>
             <tr>
               <td>requiredTranslations</td>
-              <td>
-                Specify language codes of required translations which must exist in project.
-              </td>
+              <td>Specify language codes of required translations which must exist in project.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>{}</code></td>
               <td>6.11</td>
diff --git a/src/xdocs/checks/misc/translation.xml.template b/src/xdocs/checks/misc/translation.xml.template
index e7ff394fae6..bbfff6d0ab3 100644
--- a/src/xdocs/checks/misc/translation.xml.template
+++ b/src/xdocs/checks/misc/translation.xml.template
@@ -54,6 +54,12 @@ messages.properties: Key 'ok' missing.
           one language code) of required translations the check will also check for
           existence of default translation files in project.
         </p>
+        <p>
+          Note: If your project uses preprocessed translation files and the original files
+          do not have the <code>properties</code> extension,
+          you can specify additional file extensions
+          via the <code>fileExtensions</code> property.
+        </p>
         <p>
           Attention: the check will perform the validation of ISO codes if the option
           is used. So, if you specify, for example, "mm" for language code, TranslationCheck
@@ -69,47 +75,10 @@ messages.properties: Key 'ok' missing.
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>
-                Specify file type extension to identify translation files. Setting
-                this property is typically only required if your
-                translation files are preprocessed and the original files
-                do not have the extension <code>.properties</code>
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>.properties</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>baseName</td>
-              <td>Specify
-                <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/ResourceBundle.html">
-                Base name</a> of resource bundles which contain message resources. It helps
-                the check to distinguish config and localization resources.
-              </td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^messages.*$"</code></td>
-              <td>6.17</td>
-            </tr>
-            <tr>
-              <td>requiredTranslations</td>
-              <td>
-                Specify language codes of required translations which must exist in project.
-              </td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>6.11</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/uncommentedmain.xml b/src/xdocs/checks/misc/uncommentedmain.xml
index 0fb42c998cf..a94d52c1adb 100644
--- a/src/xdocs/checks/misc/uncommentedmain.xml
+++ b/src/xdocs/checks/misc/uncommentedmain.xml
@@ -35,8 +35,7 @@
             </tr>
             <tr>
               <td>excludedClasses</td>
-              <td>Specify pattern for qualified names of classes which are allowed
-              to have a <code>main</code> method.</td>
+              <td>Specify pattern for qualified names of classes which are allowed to have a <code>main</code> method.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^$&quot;</code></td>
               <td>3.2</td>
diff --git a/src/xdocs/checks/misc/uncommentedmain.xml.template b/src/xdocs/checks/misc/uncommentedmain.xml.template
index 2386902cf9d..83301ec3a48 100644
--- a/src/xdocs/checks/misc/uncommentedmain.xml.template
+++ b/src/xdocs/checks/misc/uncommentedmain.xml.template
@@ -25,23 +25,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>excludedClasses</td>
-              <td>Specify pattern for qualified names of classes which are allowed
-              to have a <code>main</code> method.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^$"</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/uniqueproperties.xml b/src/xdocs/checks/misc/uniqueproperties.xml
index 7884482daf9..8dfab2e6844 100644
--- a/src/xdocs/checks/misc/uniqueproperties.xml
+++ b/src/xdocs/checks/misc/uniqueproperties.xml
@@ -33,7 +33,7 @@
             </tr>
             <tr>
               <td>fileExtensions</td>
-              <td>Specify file type extension of the files to check.</td>
+              <td>Specify the file extensions of the files to process.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>.properties</code></td>
               <td>5.7</td>
diff --git a/src/xdocs/checks/misc/uniqueproperties.xml.template b/src/xdocs/checks/misc/uniqueproperties.xml.template
index 17e1bf5e22d..8384c7ee80a 100644
--- a/src/xdocs/checks/misc/uniqueproperties.xml.template
+++ b/src/xdocs/checks/misc/uniqueproperties.xml.template
@@ -23,22 +23,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify file type extension of the files to check.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>.properties</code></td>
-              <td>5.7</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/misc/upperell.xml b/src/xdocs/checks/misc/upperell.xml
index 5c3bb9edb68..2a1f208d2f4 100644
--- a/src/xdocs/checks/misc/upperell.xml
+++ b/src/xdocs/checks/misc/upperell.xml
@@ -35,7 +35,7 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-class Test {
+class Example1 {
   long var1 = 508987; // OK
   long var2 = 508987l; // violation
   long var3 = 508987L; // OK
diff --git a/src/xdocs/checks/misc/upperell.xml.template b/src/xdocs/checks/misc/upperell.xml.template
index 6cf48e6da35..b3559dc7749 100644
--- a/src/xdocs/checks/misc/upperell.xml.template
+++ b/src/xdocs/checks/misc/upperell.xml.template
@@ -28,13 +28,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/upperell/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml
index 4af79281730..d660bf3a23e 100644
--- a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml
+++ b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml
@@ -51,27 +51,21 @@ public final class Person {
             </tr>
             <tr>
               <td>violateImpliedStaticOnNestedEnum</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on nested enums in classes and records.</td>
+              <td>Control whether to enforce that <code>static</code> is explicitly coded on nested enums in classes and records.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.16</td>
             </tr>
             <tr>
               <td>violateImpliedStaticOnNestedInterface</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on nested interfaces in classes and records.</td>
+              <td>Control whether to enforce that <code>static</code> is explicitly coded on nested interfaces in classes and records.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.16</td>
             </tr>
             <tr>
               <td>violateImpliedStaticOnNestedRecord</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on nested records in classes and records.</td>
+              <td>Control whether to enforce that <code>static</code> is explicitly coded on nested records in classes and records.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.36</td>
diff --git a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template
index 31685ed2121..a5460f99c6c 100644
--- a/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template
+++ b/src/xdocs/checks/modifier/classmemberimpliedmodifier.xml.template
@@ -41,42 +41,10 @@ public final class Person {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateImpliedStaticOnNestedEnum</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on nested enums in classes and records.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.16</td>
-            </tr>
-            <tr>
-              <td>violateImpliedStaticOnNestedInterface</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on nested interfaces in classes and records.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.16</td>
-            </tr>
-            <tr>
-              <td>violateImpliedStaticOnNestedRecord</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on nested records in classes and records.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.36</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ClassMemberImpliedModifierCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml b/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml
index 538b176c2f8..fe426fbc250 100644
--- a/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml
+++ b/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml
@@ -92,64 +92,50 @@ public interface AddressFactory {
               <th>since</th>
             </tr>
             <tr>
-              <td>violateImpliedPublicField</td>
-              <td>
-                Control whether to enforce that <code>public</code> is explicitly coded
-                on interface fields.</td>
+              <td>violateImpliedAbstractMethod</td>
+              <td>Control whether to enforce that <code>abstract</code> is explicitly coded on interface methods.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.12</td>
             </tr>
             <tr>
-              <td>violateImpliedStaticField</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on interface fields.</td>
+              <td>violateImpliedFinalField</td>
+              <td>Control whether to enforce that <code>final</code> is explicitly coded on interface fields.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.12</td>
             </tr>
             <tr>
-              <td>violateImpliedFinalField</td>
-              <td>
-                Control whether to enforce that <code>final</code> is explicitly coded
-                on interface fields.</td>
+              <td>violateImpliedPublicField</td>
+              <td>Control whether to enforce that <code>public</code> is explicitly coded on interface fields.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.12</td>
             </tr>
             <tr>
               <td>violateImpliedPublicMethod</td>
-              <td>
-                Control whether to enforce that <code>public</code> is explicitly coded
-                on interface methods.</td>
+              <td>Control whether to enforce that <code>public</code> is explicitly coded on interface methods.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.12</td>
             </tr>
             <tr>
-              <td>violateImpliedAbstractMethod</td>
-              <td>
-                Control whether to enforce that <code>abstract</code> is explicitly coded
-                on interface methods.</td>
+              <td>violateImpliedPublicNested</td>
+              <td>Control whether to enforce that <code>public</code> is explicitly coded on interface nested types.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.12</td>
             </tr>
             <tr>
-              <td>violateImpliedPublicNested</td>
-              <td>
-                Control whether to enforce that <code>public</code> is explicitly coded
-                on interface nested types.</td>
+              <td>violateImpliedStaticField</td>
+              <td>Control whether to enforce that <code>static</code> is explicitly coded on interface fields.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.12</td>
             </tr>
             <tr>
               <td>violateImpliedStaticNested</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on interface nested types.</td>
+              <td>Control whether to enforce that <code>static</code> is explicitly coded on interface nested types.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>8.12</td>
diff --git a/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml.template b/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml.template
index df0af427c20..39843e755b9 100644
--- a/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml.template
+++ b/src/xdocs/checks/modifier/interfacememberimpliedmodifier.xml.template
@@ -83,78 +83,10 @@ public interface AddressFactory {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>violateImpliedPublicField</td>
-              <td>
-                Control whether to enforce that <code>public</code> is explicitly coded
-                on interface fields.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>violateImpliedStaticField</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on interface fields.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>violateImpliedFinalField</td>
-              <td>
-                Control whether to enforce that <code>final</code> is explicitly coded
-                on interface fields.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>violateImpliedPublicMethod</td>
-              <td>
-                Control whether to enforce that <code>public</code> is explicitly coded
-                on interface methods.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>violateImpliedAbstractMethod</td>
-              <td>
-                Control whether to enforce that <code>abstract</code> is explicitly coded
-                on interface methods.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>violateImpliedPublicNested</td>
-              <td>
-                Control whether to enforce that <code>public</code> is explicitly coded
-                on interface nested types.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.12</td>
-            </tr>
-            <tr>
-              <td>violateImpliedStaticNested</td>
-              <td>
-                Control whether to enforce that <code>static</code> is explicitly coded
-                on interface nested types.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.12</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/modifier/redundantmodifier.xml b/src/xdocs/checks/modifier/redundantmodifier.xml
index 091f38da862..51c25834d4e 100644
--- a/src/xdocs/checks/modifier/redundantmodifier.xml
+++ b/src/xdocs/checks/modifier/redundantmodifier.xml
@@ -156,52 +156,51 @@ public class ClassExtending extends ClassExample {
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE">
-                  RESOURCE</a>
+                    RESOURCE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
+                    RECORD_DEF</a>
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE">
-                  RESOURCE</a>
+                    RESOURCE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
+                    RECORD_DEF</a>
+                  .
               </td>
               <td>3.0</td>
             </tr>
diff --git a/src/xdocs/checks/modifier/redundantmodifier.xml.template b/src/xdocs/checks/modifier/redundantmodifier.xml.template
index a51759e5b97..25850119ee1 100644
--- a/src/xdocs/checks/modifier/redundantmodifier.xml.template
+++ b/src/xdocs/checks/modifier/redundantmodifier.xml.template
@@ -145,67 +145,10 @@ public class ClassExtending extends ClassExample {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE">
-                  RESOURCE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE">
-                  RESOURCE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/abbreviationaswordinname.xml b/src/xdocs/checks/naming/abbreviationaswordinname.xml
index 5bd2e8bf486..484e38dd8cd 100644
--- a/src/xdocs/checks/naming/abbreviationaswordinname.xml
+++ b/src/xdocs/checks/naming/abbreviationaswordinname.xml
@@ -52,9 +52,7 @@
             </tr>
             <tr>
               <td>allowedAbbreviationLength</td>
-              <td>Indicate the number of consecutive capital letters allowed in targeted
-               identifiers (abbreviations in the classes, interfaces, variables and methods
-               names, ... ).</td>
+              <td>Indicate the number of consecutive capital letters allowed in targeted identifiers (abbreviations in the classes, interfaces, variables and methods names, ... ).</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>3</code></td>
               <td>5.8</td>
@@ -74,82 +72,79 @@
               <td>5.8</td>
             </tr>
             <tr>
-              <td>ignoreStatic</td>
-              <td>Allow to skip variables with <code>static</code> modifier.</td>
+              <td>ignoreOverriddenMethods</td>
+              <td>Allow to ignore methods tagged with <code>@Override</code> annotation (that usually mean inherited name).</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.8</td>
             </tr>
             <tr>
-              <td>ignoreStaticFinal</td>
-              <td>Allow to skip variables with both <code>static</code>
-                and <code>final</code> modifiers.</td>
+              <td>ignoreStatic</td>
+              <td>Allow to skip variables with <code>static</code> modifier.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
-              <td>8.32</td>
+              <td>5.8</td>
             </tr>
             <tr>
-              <td>ignoreOverriddenMethods</td>
-              <td>Allow to ignore methods tagged with <code>@Override</code> annotation
-              (that usually mean inherited name).</td>
+              <td>ignoreStaticFinal</td>
+              <td>Allow to skip variables with both <code>static</code> and <code>final</code> modifiers.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
-              <td>5.8</td>
+              <td>8.32</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
+                    PARAMETER_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
+                    PATTERN_VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
+                    RECORD_COMPONENT_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
+                    PARAMETER_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
+                    VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
+                    PATTERN_VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
+                    RECORD_COMPONENT_DEF</a>
                   .
               </td>
               <td>5.8</td>
diff --git a/src/xdocs/checks/naming/abbreviationaswordinname.xml.template b/src/xdocs/checks/naming/abbreviationaswordinname.xml.template
index f3c7bd3b98a..ffd65a95850 100644
--- a/src/xdocs/checks/naming/abbreviationaswordinname.xml.template
+++ b/src/xdocs/checks/naming/abbreviationaswordinname.xml.template
@@ -42,119 +42,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowedAbbreviationLength</td>
-              <td>Indicate the number of consecutive capital letters allowed in targeted
-               identifiers (abbreviations in the classes, interfaces, variables and methods
-               names, ... ).</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>3</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>allowedAbbreviations</td>
-              <td>Specify abbreviations that must be skipped for checking.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>{}</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>ignoreFinal</td>
-              <td>Allow to skip variables with <code>final</code> modifier.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>ignoreStatic</td>
-              <td>Allow to skip variables with <code>static</code> modifier.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>ignoreStaticFinal</td>
-              <td>Allow to skip variables with both <code>static</code>
-                and <code>final</code> modifiers.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>8.32</td>
-            </tr>
-            <tr>
-              <td>ignoreOverriddenMethods</td>
-              <td>Allow to ignore methods tagged with <code>@Override</code> annotation
-              (that usually mean inherited name).</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF</a>
-                  .
-              </td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/abstractclassname.xml b/src/xdocs/checks/naming/abstractclassname.xml
index 6584df51cfc..e910f5a30ae 100644
--- a/src/xdocs/checks/naming/abstractclassname.xml
+++ b/src/xdocs/checks/naming/abstractclassname.xml
@@ -39,22 +39,14 @@
             </tr>
             <tr>
               <td>ignoreModifier</td>
-              <td>
-                Control whether to ignore checking for the
-                <code>abstract</code> modifier on classes that match the
-                name.
-              </td>
+              <td>Control whether to ignore checking for the <code>abstract</code> modifier on classes that match the name.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.3</td>
             </tr>
             <tr>
               <td>ignoreName</td>
-              <td>
-                Control whether to ignore checking the name. Realistically
-                only useful if using the check to identify that match name
-                and do not have the <code>abstract</code> modifier.
-              </td>
+              <td>Control whether to ignore checking the name. Realistically only useful if using the check to identify that match name and do not have the <code>abstract</code> modifier.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.3</td>
diff --git a/src/xdocs/checks/naming/abstractclassname.xml.template b/src/xdocs/checks/naming/abstractclassname.xml.template
index c5c2b7682aa..9eb12a4ee37 100644
--- a/src/xdocs/checks/naming/abstractclassname.xml.template
+++ b/src/xdocs/checks/naming/abstractclassname.xml.template
@@ -22,44 +22,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^Abstract.+$"</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>ignoreModifier</td>
-              <td>
-                Control whether to ignore checking for the
-                <code>abstract</code> modifier on classes that match the
-                name.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.3</td>
-            </tr>
-            <tr>
-              <td>ignoreName</td>
-              <td>
-                Control whether to ignore checking the name. Realistically
-                only useful if using the check to identify that match name
-                and do not have the <code>abstract</code> modifier.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.3</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/catchparametername.xml b/src/xdocs/checks/naming/catchparametername.xml
index cdba1dd9d3b..1e2a6229fe3 100644
--- a/src/xdocs/checks/naming/catchparametername.xml
+++ b/src/xdocs/checks/naming/catchparametername.xml
@@ -40,11 +40,9 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td>
-                <code>&quot;^(e|t|ex|[a-z][a-z][a-zA-Z]+)$&quot;</code>
-              </td>
+              <td><code>&quot;^(e|t|ex|[a-z][a-z][a-zA-Z]+)$&quot;</code></td>
               <td>6.14</td>
             </tr>
           </table>
@@ -65,31 +63,23 @@
         <p id="Example1-code">Example:
         </p>
         <source>
-public class MyTest {
+public class Example1 {
   public void myTest() {
     try {
-      // ...
-    } catch (ArithmeticException e) { // OK
-      // ...
-    } catch (ArrayIndexOutOfBoundsException ex) { // OK
-      // ...
-    } catch (Throwable t) { // OK
-      // ...
-    } catch (IndexOutOfBoundsException e123) { // violation, digits
-                                               // not allowed
-      // ...
-    } catch (NullPointerException ab) { // violation, should have at least
-                                        // three characters if not e|t|ex
-      // ...
-    } catch (ArrayStoreException abc) { // OK
-      // ...
-    } catch (InterruptedException aBC) { // violation, first two characters
-                                         // should be in lowercase
-      // ...
-    } catch (RuntimeException abC) { // OK
-      // ...
-    } catch (Exception abCD) { // OK
-      // ...
+      throw new InterruptedException();
+    } catch (ArithmeticException e) {
+    } catch (ArrayIndexOutOfBoundsException ex) {
+    } catch (IndexOutOfBoundsException e123) {
+      // violation above, 'Name 'e123' must match pattern'
+    } catch (NullPointerException ab) {
+      // violation above, 'Name 'ab' must match pattern'
+    } catch (ArrayStoreException abc) {
+    } catch (InterruptedException aBC) {
+      // violation above, 'Name 'aBC' must match pattern'
+    } catch (RuntimeException abC) {
+    } catch (Exception EighthException) {
+      // violation above, 'Name 'EighthException' must match pattern'
+    } catch (Throwable t) {
     }
   }
 }
@@ -110,19 +100,22 @@ public class MyTest {
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-public class MyTest {
+public class Example2 {
   public void myTest() {
     try {
-      // ...
-    } catch (ArithmeticException ex) { // OK
-      // ...
-    } catch (ArrayIndexOutOfBoundsException ex2) { // OK
-      // ...
-    } catch (IOException thirdException) { // OK
-      // ...
-    } catch (Exception FourthException) { // violation, the initial letter
-                                          // should be lowercase
-      // ...
+      throw new InterruptedException();
+    } catch (ArithmeticException e) {
+      // violation above, 'Name 'e' must match pattern'
+    } catch (ArrayIndexOutOfBoundsException ex) {
+    } catch (IndexOutOfBoundsException e123) {
+    } catch (NullPointerException ab) {
+    } catch (ArrayStoreException abc) {
+    } catch (InterruptedException aBC) {
+    } catch (RuntimeException abC) {
+    } catch (Exception EighthException) {
+      // violation above, 'Name 'EighthException' must match pattern'
+    } catch (Throwable t) {
+      // violation above, 'Name 't' must match pattern'
     }
   }
 }
diff --git a/src/xdocs/checks/naming/catchparametername.xml.template b/src/xdocs/checks/naming/catchparametername.xml.template
index 8b6d7040b79..83771a6d972 100644
--- a/src/xdocs/checks/naming/catchparametername.xml.template
+++ b/src/xdocs/checks/naming/catchparametername.xml.template
@@ -30,24 +30,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td>
-                <code>"^(e|t|ex|[a-z][a-z][a-zA-Z]+)$"</code>
-              </td>
-              <td>6.14</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -57,14 +43,14 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p>
@@ -74,13 +60,13 @@
         <p id="Example2-config">Configuration:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/catchparametername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/classtypeparametername.xml b/src/xdocs/checks/naming/classtypeparametername.xml
index 2b1740c8f36..76e224cc6ea 100644
--- a/src/xdocs/checks/naming/classtypeparametername.xml
+++ b/src/xdocs/checks/naming/classtypeparametername.xml
@@ -24,7 +24,7 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[A-Z]$&quot;</code></td>
               <td>5.0</td>
@@ -46,11 +46,13 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-class MyClass1&lt;T&gt; {}        // OK
-class MyClass2&lt;t&gt; {}        // violation
-class MyClass3&lt;abc&gt; {}      // violation
-class MyClass4&lt;LISTENER&gt; {} // violation
-class MyClass5&lt;RequestT&gt; {} // violation
+class Example1 {
+  class MyClass1&lt;T&gt; {}
+  class MyClass2&lt;t&gt; {}        // violation
+  class MyClass3&lt;abc&gt; {}      // violation
+  class MyClass4&lt;LISTENER&gt; {} // violation
+  class MyClass5&lt;RequestT&gt; {} // violation
+}
         </source>
         <p id="Example2-config">
           To configure the check for names that are uppercase word:
@@ -66,11 +68,13 @@ class MyClass5&lt;RequestT&gt; {} // violation
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-class MyClass1&lt;T&gt; {}        // violation
-class MyClass2&lt;t&gt; {}        // violation
-class MyClass3&lt;abc&gt; {}      // violation
-class MyClass4&lt;LISTENER&gt; {} // OK
-class MyClass5&lt;RequestT&gt; {} // violation
+class Example2 {
+  class MyClass1&lt;T&gt; {}        // violation
+  class MyClass2&lt;t&gt; {}        // violation
+  class MyClass3&lt;abc&gt; {}      // violation
+  class MyClass4&lt;LISTENER&gt; {}
+  class MyClass5&lt;RequestT&gt; {} // violation
+}
         </source>
         <p id="Example3-config">
           To configure the check for names that are camel case word with T as suffix
@@ -87,11 +91,13 @@ class MyClass5&lt;RequestT&gt; {} // violation
         </source>
         <p id="Example3-code">Example:</p>
         <source>
-class MyClass1&lt;T&gt; {}        // violation
-class MyClass2&lt;t&gt; {}        // violation
-class MyClass3&lt;abc&gt; {}      // violation
-class MyClass4&lt;LISTENER&gt; {} // violation
-class MyClass5&lt;RequestT&gt; {} // OK
+class Example3 {
+  class MyClass1&lt;T&gt; {}
+  class MyClass2&lt;t&gt; {}        // violation
+  class MyClass3&lt;abc&gt; {}      // violation
+  class MyClass4&lt;LISTENER&gt; {} // violation
+  class MyClass5&lt;RequestT&gt; {}
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/classtypeparametername.xml.template b/src/xdocs/checks/naming/classtypeparametername.xml.template
index 5b09d33c286..5030d4e4132 100644
--- a/src/xdocs/checks/naming/classtypeparametername.xml.template
+++ b/src/xdocs/checks/naming/classtypeparametername.xml.template
@@ -14,22 +14,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[A-Z]$"</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -39,13 +27,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -53,13 +41,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -68,13 +56,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/classtypeparametername/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/constantname.xml b/src/xdocs/checks/naming/constantname.xml
index d3b354fb846..2a1616a91ed 100644
--- a/src/xdocs/checks/naming/constantname.xml
+++ b/src/xdocs/checks/naming/constantname.xml
@@ -28,42 +28,40 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
+              <td>applyToPackage</td>
+              <td>Control if check should apply to package-private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
+              <td>applyToPrivate</td>
+              <td>Control if check should apply to private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
+              <td>applyToProtected</td>
+              <td>Control if check should apply to protected members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
+              <td>applyToPublic</td>
+              <td>Control if check should apply to public members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$&quot;</code></td>
+              <td>3.0</td>
+            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/naming/constantname.xml.template b/src/xdocs/checks/naming/constantname.xml.template
index e7a00f04e22..ac86748baf1 100644
--- a/src/xdocs/checks/naming/constantname.xml.template
+++ b/src/xdocs/checks/naming/constantname.xml.template
@@ -19,52 +19,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/illegalidentifiername.xml b/src/xdocs/checks/naming/illegalidentifiername.xml
index d040bcd8303..f57e014b3e5 100644
--- a/src/xdocs/checks/naming/illegalidentifiername.xml
+++ b/src/xdocs/checks/naming/illegalidentifiername.xml
@@ -33,126 +33,71 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>&quot;(?i)^(?!(record|yield|var|permits|sealed|_)$).+$&quot;</code>
-              </td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;(?i)^(?!(record|yield|var|permits|sealed|_)$).+$&quot;</code></td>
               <td>8.36</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA
-                </a>
-                .
+                    CLASS_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+                    INTERFACE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
+                    ENUM_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
+                    ANNOTATION_FIELD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
+                    PARAMETER_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
+                    VARIABLE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                    METHOD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
+                    ENUM_CONSTANT_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
+                    PATTERN_VARIABLE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
+                    RECORD_COMPONENT_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
+                    LAMBDA</a>
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA
-                </a>
-                .
+                    CLASS_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
+                    INTERFACE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
+                    ENUM_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
+                    ANNOTATION_FIELD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
+                    PARAMETER_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
+                    VARIABLE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                    METHOD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
+                    ENUM_CONSTANT_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
+                    PATTERN_VARIABLE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
+                    RECORD_COMPONENT_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
+                    LAMBDA</a>
+                  .
               </td>
               <td>8.36</td>
             </tr>
@@ -174,21 +119,31 @@
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-public class TestClass {
-    public static void main(String... args) {
-        var var = 4; // violation, &quot;var&quot; should not be used as an identifier.
-        int record = 15; // violation, &quot;record&quot; should not be used as an identifier.
-        String yield = &quot;yield&quot;; // violation, &quot;yield&quot; should not be used as an identifier.
+public class Example1 {
+  Integer var = 4; // violation, 'Name 'var' must match pattern'
+  int record = 15; // violation, 'Name 'record' must match pattern'
+  String yield = &quot;yield&quot;;
+  // violation above, 'Name 'yield' must match pattern'
+
+  record Record(Record r){} // violation, 'Name 'Record' must match pattern'
 
-        record Record // violation, &quot;Record&quot; should not be used as an identifier.
-        (Record record) { // violation, &quot;record&quot; should not be used as an identifier.
-        }
+  record R(Record record){} // violation, 'Name 'record' must match pattern'
 
-        String yieldString = &quot;yieldString&quot;; // ok, part of another word
-        record MyRecord(){} // ok, part of another word
-        var variable = 2; // ok, part of another word
-        String _; // violation, underscore should not be used as an identifier.
-    }
+  String yieldString = &quot;yieldString&quot;;
+  // ok above, word 'yield' is not used as an identifier by itself
+  record MyRecord(){}
+  // ok above, word 'Record' is not used as an identifier by itself
+  Integer variable = 2;
+  // ok above, word 'var' is not used as an identifier by itself
+
+  int open = 4; // ok, word 'open' can be used as an identifier
+  Object transitive = &quot;transitive&quot;;
+  // ok above, word 'transitive' can be used as an identifier
+
+  int openInt = 4;
+  // ok above, word 'openInt' can be used as an identifier
+  Object transitiveObject = &quot;transitiveObject&quot;;
+  // ok above, word 'transitiveObject' can be used as an identifier
 }
         </source>
         <p>
@@ -200,24 +155,39 @@ public class TestClass {
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;IllegalIdentifierName&quot;&gt;
-        &lt;property name=&quot;format&quot; value=&quot;(?i)^(?!(record|yield|var
-                        |permits|sealed|open|transitive|_)$).+$&quot;/&gt;
+      &lt;property name=&quot;format&quot;
+        value=&quot;(?i)^(?!(record|yield|var|permits|sealed|open|transitive|_)$).+$&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-public class TestClass {
-    public static void main(String... args) {
+public class Example2 {
+  Integer var = 4; // violation, 'Name 'var' must match pattern'
+  int record = 15; // violation, 'Name 'record' must match pattern'
+  String yield = &quot;yield&quot;;
+  // violation above, 'Name 'yield' must match pattern'
+
+  record Record(Record r){} // violation, 'Name 'Record' must match pattern'
+
+  record R(Record record){} // violation, 'Name 'record' must match pattern'
+
+  String yieldString = &quot;yieldString&quot;;
+  // ok above, word 'yield' is not used as an identifier by itself
+  record MyRecord(){}
+  // ok above, word 'Record' is not used as an identifier by itself
+  Integer variable = 2;
+  // ok above, word 'var' is not used as an identifier by itself
 
-    int open = 4; // violation, &quot;open&quot; should not be used as an identifier
-    Object transitive = &quot;transitive&quot;; // violation, &quot;transitive&quot; should not
-                                      // be used as an identifier
+  int open = 4; // violation, 'Name 'open' must match pattern'
+  Object transitive = &quot;transitive&quot;;
+  // violation above, 'Name 'transitive' must match pattern'
 
-    int openInt = 4; // ok, &quot;open&quot; is part of another word
-    Object transitiveObject = &quot;transitiveObject&quot;; // ok, &quot;transitive&quot; is part of another word
-    }
+  int openInt = 4;
+  // ok above, word 'open' is not used as an identifier by itself
+  Object transitiveObject = &quot;transitiveObject&quot;;
+  // ok above, word 'transitive' is not used as an identifier by itself
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/naming/illegalidentifiername.xml.template b/src/xdocs/checks/naming/illegalidentifiername.xml.template
index 1446aa27d16..cbb372b3963 100644
--- a/src/xdocs/checks/naming/illegalidentifiername.xml.template
+++ b/src/xdocs/checks/naming/illegalidentifiername.xml.template
@@ -23,140 +23,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>"(?i)^(?!(record|yield|var|permits|sealed|_)$).+$"</code>
-              </td>
-              <td>8.36</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA
-                </a>
-                .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                  PARAMETER_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                  VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PATTERN_VARIABLE_DEF">
-                  PATTERN_VARIABLE_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_COMPONENT_DEF">
-                  RECORD_COMPONENT_DEF
-                </a>
-                ,
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA
-                </a>
-                .
-              </td>
-              <td>8.36</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/IllegalIdentifierNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -167,13 +37,13 @@
         <p id="Example1-config">Configuration:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p>
@@ -183,13 +53,13 @@
         <p id="Example2-config">Configuration:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/illegalidentifiername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/interfacetypeparametername.xml b/src/xdocs/checks/naming/interfacetypeparametername.xml
index d0d66ad3e70..4eda96b02eb 100644
--- a/src/xdocs/checks/naming/interfacetypeparametername.xml
+++ b/src/xdocs/checks/naming/interfacetypeparametername.xml
@@ -26,7 +26,7 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[A-Z]$&quot;</code></td>
               <td>5.8</td>
@@ -48,8 +48,10 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-interface FirstInterface&lt;T&gt; {} // OK
-interface SecondInterface&lt;t&gt; {} // violation, name 't' must match pattern '^[A-Z]$'
+class Example1 {
+  interface FirstInterface&lt;T&gt; {}
+  interface SecondInterface&lt;t&gt; {} // violation
+}
         </source>
         <p id="Example2-config">
           An example of how to configure the check for names that are only a single
@@ -66,10 +68,11 @@ interface SecondInterface&lt;t&gt; {} // violation, name 't' must match pattern
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-interface FirstInterface&lt;T&gt; {} // OK
-interface SecondInterface&lt;t&gt; {} // OK
-interface ThirdInterface&lt;type&gt; {} // violation, name 'type' must
-                                        // match pattern '^[a-zA-Z]$'
+class Example2 {
+  interface FirstInterface&lt;T&gt; {}
+  interface SecondInterface&lt;t&gt; {}
+  interface ThirdInterface&lt;type&gt; {} // violation
+}
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/interfacetypeparametername.xml.template b/src/xdocs/checks/naming/interfacetypeparametername.xml.template
index 1f111652977..27393c2b0b0 100644
--- a/src/xdocs/checks/naming/interfacetypeparametername.xml.template
+++ b/src/xdocs/checks/naming/interfacetypeparametername.xml.template
@@ -16,22 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[A-Z]$"</code></td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/InterfaceTypeParameterNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -41,13 +29,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -56,13 +44,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/interfacetypeparametername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/lambdaparametername.xml b/src/xdocs/checks/naming/lambdaparametername.xml
index 016215a43af..bfa96704139 100644
--- a/src/xdocs/checks/naming/lambdaparametername.xml
+++ b/src/xdocs/checks/naming/lambdaparametername.xml
@@ -26,7 +26,7 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
               <td>8.11</td>
@@ -48,9 +48,11 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-Function&lt;String, String&gt; function1 = s -&gt; s.toLowerCase(); // OK
-Function&lt;String, String&gt; function2 = S -&gt; S.toLowerCase(); // violation, name 'S'
-                                               // must match pattern '^[a-z][a-zA-Z0-9]*$'
+class Example1 {
+  Function&lt;String, String&gt; function1 = s -&gt; s.toLowerCase();
+  Function&lt;String, String&gt; function2 =
+          S -&gt; S.toLowerCase(); // violation
+}
         </source>
         <p id="Example2-config">
           An example of how to configure the check for names that begin with a lower case letter,
@@ -67,16 +69,14 @@ Function&lt;String, String&gt; function2 = S -&gt; S.toLowerCase(); // violation
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
-  Function&lt;String, String&gt; function1 = str -&gt; str.toUpperCase().trim(); // OK
-  Function&lt;String, String&gt; function2 = _s -&gt; _s.trim(); // violation, name '_s'
-                                             // must match pattern '^[a-z]([a-zA-Z]+)*$'
+class Example2 {
+  Function&lt;String, String&gt; function1 = str -&gt; str.toUpperCase().trim();
+  Function&lt;String, String&gt; function2 = _s -&gt; _s.trim(); // violation
 
   public boolean myMethod(String sentence) {
     return Stream.of(sentence.split(&quot; &quot;))
-            .map(word -&gt; word.trim()) // OK
-            .anyMatch(Word -&gt; &quot;in&quot;.equals(Word)); // violation, name 'Word'
-                                   // must match pattern '^[a-z]([a-zA-Z]+)*$'
+            .map(word -&gt; word.trim())
+            .anyMatch(Word -&gt; &quot;in&quot;.equals(Word)); // violation
   }
 }
         </source>
diff --git a/src/xdocs/checks/naming/lambdaparametername.xml.template b/src/xdocs/checks/naming/lambdaparametername.xml.template
index 0bd9bfddff0..700bd2b4c6f 100644
--- a/src/xdocs/checks/naming/lambdaparametername.xml.template
+++ b/src/xdocs/checks/naming/lambdaparametername.xml.template
@@ -16,22 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z][a-zA-Z0-9]*$"</code></td>
-              <td>8.11</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LambdaParameterNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -41,13 +29,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -56,13 +44,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/lambdaparametername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/localfinalvariablename.xml b/src/xdocs/checks/naming/localfinalvariablename.xml
index a5d2c3244eb..24d8dd5eb2b 100644
--- a/src/xdocs/checks/naming/localfinalvariablename.xml
+++ b/src/xdocs/checks/naming/localfinalvariablename.xml
@@ -28,7 +28,7 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
               <td>3.0</td>
@@ -36,8 +36,7 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
                     VARIABLE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
@@ -68,9 +67,25 @@
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
-    &lt;module name=&quot;LocalFinalVariableName&quot;/&gt;
+    &lt;module name=&quot;LocalFinalVariableName&quot;&gt;
+       &lt;property name=&quot;format&quot; value=&quot;^[a-z][a-zA-Z0-9]*$&quot;/&gt;
+    &lt;/module&gt;
   &lt;/module&gt;
 &lt;/module&gt;
+        </source>
+        <p id="Example1-code">Code Example:</p>
+        <source>
+class Example1{
+  void MyMethod() {
+    try {
+      final int VAR1 = 5; // violation
+      final int var1 = 10;
+    } catch (Exception ex) {
+      final int VAR2 = 15; // violation
+      final int var2 = 20;
+    }
+  }
+}
         </source>
         <p id="Example2-config">
           An example of how to configure the check for names that are only upper case letters and
@@ -87,14 +102,14 @@
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
+class Example2 {
   void MyMethod() {
     try {
-      final int VAR1 = 5; // OK
-      final int var1 = 10; // violation,  name 'var1' must match pattern &quot;^[A-Z][A-Z0-9]*$&quot;
+      final int VAR1 = 5;
+      final int var1 = 10; // violation
     } catch (Exception ex) {
-      final int VAR2 = 15; // OK
-      final int var2 = 20; // violation,  name 'var2' must match pattern &quot;^[A-Z][A-Z0-9]*$&quot;
+      final int VAR2 = 15;
+      final int var2 = 20; // violation
     }
   }
 }
@@ -115,16 +130,16 @@ class MyClass {
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-class MyClass {
+class Example3 {
   void MyMethod() {
-    try(Scanner scanner = new Scanner()) { // violation, name 'scanner' must
-                                           // match pattern '^[A-Z][A-Z0-9]*$'
-      final int VAR1 = 5; // OK
-      final int var1 = 10; // OK
-    } catch (final Exception ex) { // violation, name 'ex'
-                                   // must match pattern '^[A-Z][A-Z0-9]*$'
-      final int VAR2 = 15; // OK
-      final int var2 = 20; // OK
+    try(Scanner scanner = new Scanner(System.in)) { // violation
+
+      final int VAR1 = 5;
+      final int var1 = 10;
+    } catch (final Exception ex) { // violation
+
+      final int VAR2 = 15;
+      final int var2 = 20;
     }
   }
 }
diff --git a/src/xdocs/checks/naming/localfinalvariablename.xml.template b/src/xdocs/checks/naming/localfinalvariablename.xml.template
index 81ff8c1b3dd..690341bbc59 100644
--- a/src/xdocs/checks/naming/localfinalvariablename.xml.template
+++ b/src/xdocs/checks/naming/localfinalvariablename.xml.template
@@ -18,46 +18,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z][a-zA-Z0-9]*$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                    PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE">
-                    RESOURCE</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PARAMETER_DEF">
-                    PARAMETER_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE">
-                    RESOURCE</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -67,22 +31,28 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
+        <p id="Example1-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example1.java"/>
+          <param name="type" value="code"/>
+        </macro>
         <p id="Example2-config">
           An example of how to configure the check for names that are only upper case letters and
           digits is:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -91,13 +61,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/localvariablename.xml b/src/xdocs/checks/naming/localvariablename.xml
index 806580197bb..52045da9af3 100644
--- a/src/xdocs/checks/naming/localvariablename.xml
+++ b/src/xdocs/checks/naming/localvariablename.xml
@@ -25,25 +25,21 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>allowOneCharVarInForLoop</td>
-              <td>
-                Allow one character variable name in
-                <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/for.html">
-                  initialization expressions</a> in FOR loop if one char variable name
-                  is prohibited by {@code format} regexp.
-              </td>
+              <td>Allow one character variable name in <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/for.html">
+ initialization expressions</a> in FOR loop if one char variable name is prohibited by <code>format</code> regexp.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.8</td>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
+              <td>3.0</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -62,14 +58,12 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-class MyClass {
+class Example1 {
   void MyMethod() {
-    for (int var = 1; var &lt; 10; var++) {} // OK
-    for (int VAR = 1; VAR &lt; 10; VAR++) {} // violation, name 'VAR' must match
-                                          // pattern '^[a-z][a-zA-Z0-9]*$'
-    for (int i = 1; i &lt; 10; i++) {} // OK
-    for (int var_1 = 0; var_1 &lt; 10; var_1++) {} // violation, name 'var_1' must match
-                                                   // pattern '^[a-z][a-zA-Z0-9]*$'
+    for (int var = 1; var &lt; 10; var++) {}
+    for (int VAR = 1; VAR &lt; 10; VAR++) {} // violation
+    for (int i = 1; i &lt; 10; i++) {}
+    for (int var_1 = 0; var_1 &lt; 10; var_1++) {} // violation
   }
 }
         </source>
@@ -88,13 +82,12 @@ class MyClass {
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
+class Example2 {
   void MyMethod() {
-    for (int var = 1; var &lt; 10; var++) {} // OK
-    for (int VAR = 1; VAR &lt; 10; VAR++) {} // violation, name 'VAR' must match
-                                             // pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-    for (int i = 1; i &lt; 10; i++) {} // OK
-    for (int var_1 = 0; var_1 &lt; 10; var_1++) {} // OK
+    for (int var = 1; var &lt; 10; var++) {}
+    for (int VAR = 1; VAR &lt; 10; VAR++) {} // violation
+    for (int i = 1; i &lt; 10; i++) {}
+    for (int var_1 = 0; var_1 &lt; 10; var_1++) {}
   }
 }
         </source>
@@ -103,11 +96,15 @@ class MyClass {
           in FOR loop:
         </p>
         <source>
-for(int i = 1; i &lt; 10; i++) {}
-for(int K = 1; K &lt; 10; K++) {}
-List list = new ArrayList();
-for (Object o : list) {}
-for (Object O : list) {}
+class Example3 {
+  void myMethod () {
+    for(int i = 1; i &lt; 10; i++) {}
+    for(int K = 1; K &lt; 10; K++) {} // violation
+    List list = new ArrayList();
+    for (Object o : list) {}
+    for (Object O : list) {} // violation
+  }
+}
         </source>
 
         <p id="Example4-config">
@@ -127,22 +124,22 @@ for (Object O : list) {}
         </source>
         <p id="Example4-code">Code Example:</p>
         <source>
-class MyClass {
+class Example4 {
   void MyMethod() {
     int good = 1;
     int g = 0; // violation
-    for (int v = 1; v &lt; 10; v++) { // OK
-        int a = 1; // violation
+    for (int v = 1; v &lt; 10; v++) {
+      int a = 1; // violation
     }
-    for (int V = 1; V &lt; 10; V++) { // OK
-        int I = 1; // violation
+    for (int V = 1; V &lt; 10; V++) {
+      int I = 1; // violation
     }
     List list = new ArrayList();
-    for (Object o : list) { // OK
-        String a = &quot;&quot;; // violation
+    for (Object o : list) {
+      String a = &quot;&quot;; // violation
     }
-    for (Object O : list) { // OK
-        String A = &quot;&quot;; // violation
+    for (Object O : list) {
+      String A = &quot;&quot;; // violation
     }
   }
 }
@@ -161,11 +158,11 @@ class MyClass {
         </source>
         <p id="Example5-code">Code Example:</p>
         <source>
-class MyClass {
+class Example5 {
   void MyMethod() {
     int goodName = 0;
     int i = 1; // violation
-    for (int var = 1; var &lt; 10; var++) { //OK
+    for (int var = 1; var &lt; 10; var++) {
       int j = 1; // violation
     }
   }
diff --git a/src/xdocs/checks/naming/localvariablename.xml.template b/src/xdocs/checks/naming/localvariablename.xml.template
index 54a6a15b54c..35ff7f4930a 100644
--- a/src/xdocs/checks/naming/localvariablename.xml.template
+++ b/src/xdocs/checks/naming/localvariablename.xml.template
@@ -17,34 +17,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z][a-zA-Z0-9]*$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>allowOneCharVarInForLoop</td>
-              <td>
-                Allow one character variable name in
-                <a href="https://docs.oracle.com/javase/tutorial/java/nutsandbolts/for.html">
-                  initialization expressions</a> in FOR loop if one char variable name
-                  is prohibited by {@code format} regexp.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -55,13 +31,13 @@
 
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -70,13 +46,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-code">
@@ -85,7 +61,7 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
 
@@ -96,13 +72,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example4-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example5-config">
@@ -110,13 +86,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example5-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/localvariablename/Example5.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/membername.xml b/src/xdocs/checks/naming/membername.xml
index 7e9a18726b6..df677b66136 100644
--- a/src/xdocs/checks/naming/membername.xml
+++ b/src/xdocs/checks/naming/membername.xml
@@ -25,42 +25,40 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
+              <td>applyToPackage</td>
+              <td>Control if check should apply to package-private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.4</td>
             </tr>
             <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
+              <td>applyToPrivate</td>
+              <td>Control if check should apply to private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.4</td>
             </tr>
             <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
+              <td>applyToProtected</td>
+              <td>Control if check should apply to protected members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.4</td>
             </tr>
             <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
+              <td>applyToPublic</td>
+              <td>Control if check should apply to public members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.4</td>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
+              <td>3.0</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -78,23 +76,23 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-class MyClass {
-  public int num1; // OK
-  protected int num2; // OK
-  final int num3 = 3; // OK
-  private int num4; // OK
-
-  static int num5; // ignored: not an instance variable
-  public static final int CONSTANT = 1; // ignored: not an instance variable
-
-  public int NUM1; // violation, name 'NUM1'
-                   // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  protected int NUM2; // violation, name 'NUM2'
-                      // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  final int NUM3; // violation, name 'NUM3'
-                  // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  private int NUM4; // violation, name 'NUM4'
-                    // must match pattern '^[a-z][a-zA-Z0-9]*$'
+class Example1 {
+  public int num1;
+  protected int num2;
+  final int num3 = 3;
+  private int num4;
+
+  static int num5;
+  public static final int CONSTANT = 1;
+
+  public int NUM1; // violation
+
+  protected int NUM2; // violation
+
+  int NUM3; // violation
+
+  private int NUM4; // violation
+
 }
         </source>
         <p id="Example2-config">
@@ -117,13 +115,13 @@ class MyClass {
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
-  public int num1; // violation, name 'num1'
-                   // must match pattern '^m[A-Z][a-zA-Z0-9]*$'
-  protected int num2; // OK
-  int num3; // OK
-  private int num4; // violation, name 'num4'
-                    // must match pattern '^m[A-Z][a-zA-Z0-9]*$'
+class Example2 {
+  public int num1; // violation
+
+  protected int num2;
+  int num3;
+  private int num4; // violation
+
 }
         </source>
         <p id="Example3-config">
@@ -142,13 +140,13 @@ class MyClass {
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-class MyClass {
-  public int NUM1; // OK
-  protected int NUM2; // violation, name 'NUM2'
-                      // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  int NUM3; // violation, name 'NUM3'
-            // must match pattern '^[a-z][a-zA-Z0-9]*$'
-  private int NUM4; // OK
+class Example3 {
+  public int NUM1;
+  protected int NUM2; // violation
+
+  int NUM3; // violation
+
+  private int NUM4;
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/naming/membername.xml.template b/src/xdocs/checks/naming/membername.xml.template
index afc74781c6e..7cf24f2ff1f 100644
--- a/src/xdocs/checks/naming/membername.xml.template
+++ b/src/xdocs/checks/naming/membername.xml.template
@@ -16,52 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z][a-zA-Z0-9]*$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -71,13 +29,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -89,13 +47,13 @@
 
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -104,13 +62,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/methodname.xml b/src/xdocs/checks/naming/methodname.xml
index 3b526f2580a..2efd347d297 100644
--- a/src/xdocs/checks/naming/methodname.xml
+++ b/src/xdocs/checks/naming/methodname.xml
@@ -32,64 +32,48 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>allowClassName</td>
-              <td>
-                Controls whether to allow a method name to have the same
-                name as the residing class name. This is not to be confused
-                with a constructor. An easy mistake is to place a return
-                type on a constructor declaration which turns it into a
-                method. For example:
-                <div class="wrapper">
-                  <pre>
-class MyClass {
-    public void MyClass() {} //this is a method
-    public MyClass() {} //this is a constructor
-}
-                  </pre>
-                </div>
-              </td>
+              <td>Control whether to allow a method name to have the same name as the enclosing class name. Setting this property <code>false</code> helps to avoid confusion between constructors and methods.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
+              <td>applyToPackage</td>
+              <td>Control if check should apply to package-private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.1</td>
             </tr>
             <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
+              <td>applyToPrivate</td>
+              <td>Control if check should apply to private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.1</td>
             </tr>
             <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
+              <td>applyToProtected</td>
+              <td>Control if check should apply to protected members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.1</td>
             </tr>
             <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
+              <td>applyToPublic</td>
+              <td>Control if check should apply to public members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.1</td>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
+              <td>3.0</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -107,13 +91,11 @@ class MyClass {
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-class MyClass {
-  public void firstMethod1() {} // OK
-  protected void secondMethod() {} // OK
-  private void ThirdMethod() {} // violation, method name must match to the
-                                // default pattern '^[a-z][a-zA-Z0-9]*$'
-  public void fourth_Method4() {} // violation, method name must match to the
-                                 // default pattern '^[a-z][a-zA-Z0-9]*$'
+class Example1 {
+  public void method1() {}
+  protected void method2() {}
+  private void Method3() {} // violation
+  public void Method4() {} // violation
 }
         </source>
         <p id="Example2-config">
@@ -131,10 +113,9 @@ class MyClass {
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
-  public void myMethod() {} // OK
-  public void MyMethod() {} // violation, name &quot;MyMethod&quot;
-                            // should match the pattern &quot;^[a-z](_?[a-zA-Z0-9]+)*$&quot;
+class Example2 {
+  public void method1() {}
+  public void Method2() {} // violation
 }
         </source>
         <p id="Example3-config">
@@ -153,10 +134,9 @@ class MyClass {
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-class MyClass {
-  public MyClass() {} // OK
-  public void MyClass() {} // OK, method Name 'MyClass' is allowed to be
-                           // equal to the enclosing class name
+class Example3 {
+  public Example3() {}
+  public void Example3() {}
 }
         </source>
         <p id="Example4-config">
@@ -175,10 +155,9 @@ class MyClass {
         </source>
         <p id="Example4-code">Code Example:</p>
         <source>
-class MyClass {
-  public MyClass() {} // OK
-  public void MyClass() {} // violation, method Name 'MyClass' must not
-                           // equal the enclosing class name
+class Example4 {
+  public Example4() {}
+  public void Example4() {} // violation
 }
         </source>
         <p id="Example5-config">
@@ -197,13 +176,11 @@ class MyClass {
         </source>
         <p id="Example5-code">Code Example:</p>
         <source>
-class MyClass {
-  public void FirstMethod() {} // OK
-  protected void SecondMethod() {} // OK
-  private void ThirdMethod() {} // violation, name 'ThirdMethod' must match
-                                // pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-  void FourthMethod() {} // violation, name 'FourthMethod' must match
-                         // pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
+class Example5 {
+  public void Method1() {}
+  protected void Method2() {}
+  private void Method3() {} // violation
+  void Method4() {} // violation
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/naming/methodname.xml.template b/src/xdocs/checks/naming/methodname.xml.template
index be37669a8b0..3e8ff62f5ee 100644
--- a/src/xdocs/checks/naming/methodname.xml.template
+++ b/src/xdocs/checks/naming/methodname.xml.template
@@ -24,73 +24,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z][a-zA-Z0-9]*$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>allowClassName</td>
-              <td>
-                Controls whether to allow a method name to have the same
-                name as the residing class name. This is not to be confused
-                with a constructor. An easy mistake is to place a return
-                type on a constructor declaration which turns it into a
-                method. For example:
-                <div class="wrapper">
-                  <pre>
-class MyClass {
-    public void MyClass() {} //this is a method
-    public MyClass() {} //this is a constructor
-}
-                  </pre>
-                </div>
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.1</td>
-            </tr>
-            <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.1</td>
-            </tr>
-            <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.1</td>
-            </tr>
-            <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.1</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -100,13 +37,13 @@ class MyClass {
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -115,13 +52,13 @@ class MyClass {
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -130,13 +67,13 @@ class MyClass {
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example4-config">
@@ -145,13 +82,13 @@ class MyClass {
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example4-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example5-config">
@@ -159,13 +96,13 @@ class MyClass {
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example5-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/Example5.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/methodtypeparametername.xml b/src/xdocs/checks/naming/methodtypeparametername.xml
index 81b594d9ba8..160ac9a4aae 100644
--- a/src/xdocs/checks/naming/methodtypeparametername.xml
+++ b/src/xdocs/checks/naming/methodtypeparametername.xml
@@ -26,7 +26,7 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[A-Z]$&quot;</code></td>
               <td>5.0</td>
@@ -48,11 +48,11 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-class MyClass {
-  public &lt;T&gt; void method1() {} // OK
-  public &lt;a&gt; void method2() {} // violation, name 'a' must match pattern '^[A-Z]$'
-  public &lt;K, V&gt; void method3() {} // OK
-  public &lt;k, V&gt; void method4() {} // violation, name 'k' must match pattern '^[A-Z]$'
+class Example1 {
+  public &lt;T&gt; void method1() {}
+  public &lt;a&gt; void method2() {} // violation
+  public &lt;K, V&gt; void method3() {}
+  public &lt;k, V&gt; void method4() {} // violation
 }
         </source>
         <p id="Example2-config">
@@ -69,11 +69,11 @@ class MyClass {
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
-  public &lt;T&gt; void method1() {} // OK
-  public &lt;a&gt; void method2() {} // OK
-  public &lt;K, V&gt; void method3() {} // OK
-  public &lt;k, V&gt; void method4() {} // OK
+class Example2 {
+  public &lt;T&gt; void method1() {}
+  public &lt;a&gt; void method2() {}
+  public &lt;K, V&gt; void method3() {}
+  public &lt;k, V&gt; void method4() {}
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/naming/methodtypeparametername.xml.template b/src/xdocs/checks/naming/methodtypeparametername.xml.template
index 58dc17771af..3009c8fb0fc 100644
--- a/src/xdocs/checks/naming/methodtypeparametername.xml.template
+++ b/src/xdocs/checks/naming/methodtypeparametername.xml.template
@@ -16,22 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[A-Z]$"</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -41,13 +29,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -55,13 +43,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/methodtypeparametername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/packagename.xml b/src/xdocs/checks/naming/packagename.xml
index 9da187191a3..5a6f443f5b4 100644
--- a/src/xdocs/checks/naming/packagename.xml
+++ b/src/xdocs/checks/naming/packagename.xml
@@ -36,7 +36,7 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Control the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[a-z]+(\.[a-zA-Z_]\w*)*$&quot;</code></td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/naming/packagename.xml.template b/src/xdocs/checks/naming/packagename.xml.template
index 488adb6e38d..717acc3acec 100644
--- a/src/xdocs/checks/naming/packagename.xml.template
+++ b/src/xdocs/checks/naming/packagename.xml.template
@@ -26,22 +26,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z]+(\.[a-zA-Z_]\w*)*$"</code></td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/parametername.xml b/src/xdocs/checks/naming/parametername.xml
index 4c82e562b79..aed5a414fe4 100644
--- a/src/xdocs/checks/naming/parametername.xml
+++ b/src/xdocs/checks/naming/parametername.xml
@@ -38,33 +38,27 @@
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>accessModifiers</td>
+              <td>Access modifiers of methods where parameters are checked.</td>
+              <td><a href="../../property_types.html#AccessModifierOption.5B.5D">AccessModifierOption[]</a></td>
+              <td><code>public, protected, package, private</code></td>
+              <td>7.5</td>
+            </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
               <td>3.0</td>
             </tr>
             <tr>
               <td>ignoreOverridden</td>
-              <td>
-                Allows to skip methods with Override annotation from validation.
-              </td>
+              <td>Allows to skip methods with Override annotation from validation.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>6.12.1</td>
             </tr>
-            <tr>
-              <td>accessModifiers</td>
-              <td>Access modifiers of methods where parameters are checked.</td>
-              <td>
-                <a href="../../property_types.html#AccessModifierOption.5B.5D">
-                  AccessModifierOption[]
-                </a>
-              </td>
-              <td><code>public, protected, package, private</code></td>
-              <td>7.5</td>
-            </tr>
           </table>
         </div>
       </subsection>
@@ -82,9 +76,9 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int V2) {} // violation, name 'V2' must match pattern '^[a-z][a-zA-Z0-9]*$'
+class Example1 {
+  void method1(int v1) {}
+  void method2(int V2) {} // violation
 }
         </source>
         <p id="Example2-config">
@@ -102,10 +96,10 @@ class MyClass {
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int v_2) {} // OK
-  void method3(int V3) {} // violation, name 'V3' must match pattern '^[a-z][_a-zA-Z0-9]+$'
+class Example2 {
+  void method1(int v1) {}
+  void method2(int v_2) {}
+  void method3(int V3) {} // violation
 }
         </source>
 
@@ -124,9 +118,9 @@ class MyClass {
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int V2) {} // violation, name 'V2' must match pattern '^[a-z][a-zA-Z0-9]*$'
+class Example3 {
+  void method1(int v1) {}
+  void method2(int V2) {} // violation
   @Override
   public boolean equals(Object V3) { // OK
     return true;
@@ -148,10 +142,10 @@ class MyClass {
         </source>
         <p id="Example4-code">Code Example:</p>
         <source>
-class MyClass {
-  void method1(int v1) {} // OK
-  void method2(int v_2) {} // violation, name 'v_2' must match pattern '^[a-z][a-zA-Z0-9]+$'
-  void method3(int V3) {} // violation, name 'V3' must match pattern '^[a-z][a-zA-Z0-9]+$'
+class Example4 {
+  void method1(int v1) {}
+  void method2(int v_2) {} // violation
+  void method3(int V3) {} // violation
 }
         </source>
         <p id="Example5-config">
@@ -179,13 +173,11 @@ class MyClass {
         </source>
         <p id="Example5-code">Code Example:</p>
         <source>
-class MyClass {
-  void method1(int v1) {} // OK
-  protected method2(int V2) {} // violation, Parameter name 'V2'
-                               // must match pattern '^[a-z]([a-z0-9][a-zA-Z0-9]*)?$'
-  private method3(int a) {} // OK
-  public method4(int b) {} // violation, Parameter name 'b'
-                           // must match pattern '^[a-z][a-z0-9][a-zA-Z0-9]*$'
+class Example5 {
+  void fn1(int v1) {}
+  protected void fn2(int V2) {} // violation &quot;Parameter name 'V2' must match pattern&quot;
+  private void fn3(int a) {}
+  public void fn4(int b) {} // violation &quot;Parameter name 'b' must match pattern&quot;
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/naming/parametername.xml.template b/src/xdocs/checks/naming/parametername.xml.template
index 6eaf4ea10b0..5b3a125fcc6 100644
--- a/src/xdocs/checks/naming/parametername.xml.template
+++ b/src/xdocs/checks/naming/parametername.xml.template
@@ -30,42 +30,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z][a-zA-Z0-9]*$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>ignoreOverridden</td>
-              <td>
-                Allows to skip methods with Override annotation from validation.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.12.1</td>
-            </tr>
-            <tr>
-              <td>accessModifiers</td>
-              <td>Access modifiers of methods where parameters are checked.</td>
-              <td>
-                <a href="../../property_types.html#AccessModifierOption.5B.5D">
-                  AccessModifierOption[]
-                </a>
-              </td>
-              <td><code>public, protected, package, private</code></td>
-              <td>7.5</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -75,13 +43,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -90,13 +58,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
 
@@ -106,13 +74,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example4-config">
@@ -121,13 +89,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example4-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example5-config">
@@ -137,13 +105,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example5-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/Example5.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/patternvariablename.xml b/src/xdocs/checks/naming/patternvariablename.xml
index 9702de572a3..587ce1c8986 100644
--- a/src/xdocs/checks/naming/patternvariablename.xml
+++ b/src/xdocs/checks/naming/patternvariablename.xml
@@ -26,7 +26,7 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
+              <td>Sets the pattern to match valid identifiers.</td>
               <td><a href="../../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
               <td>8.36</td>
@@ -49,14 +49,13 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-class MyClass {
-    MyClass(Object o1){
-        if (o1 instanceof String STRING) { // violation, name 'STRING' must
-        // match pattern '^[a-z][a-zA-Z0-9]*$'
-        }
-        if (o1 instanceof Integer num) { // OK
-        }
-    }
+class Example1 {
+  void foo(Object o1){
+    if (o1 instanceof String STRING) {} // violation
+    if (o1 instanceof Integer num) {}
+    if (o1 instanceof Integer num_1) {} // violation
+    if (o1 instanceof Integer n) {}
+  }
 }
         </source>
         <p id="Example2-config">
@@ -74,16 +73,13 @@ class MyClass {
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
-    MyClass(Object o1){
-        if (o1 instanceof String STR) { // violation, name 'STR' must
-        // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-        }
-        if (o1 instanceof Integer num) { // OK
-        }
-        if (o1 instanceof Integer num_1) { // OK
-        }
-    }
+class Example2 {
+  void foo(Object o1){
+    if (o1 instanceof String STRING) {} // violation
+    if (o1 instanceof Integer num) {}
+    if (o1 instanceof Integer num_1) {}
+    if (o1 instanceof Integer n) {}
+  }
 }
         </source>
         <p id="Example3-config">
@@ -101,14 +97,13 @@ class MyClass {
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-class MyClass {
-    MyClass(Object o1){
-        if (o1 instanceof String s) { // violation, name 's' must
-        // match pattern '^[a-z][_a-zA-Z0-9]{2,}$'
-        }
-        if (o1 instanceof Integer num) { // OK
-        }
-    }
+class Example3 {
+  void foo(Object o1){
+    if (o1 instanceof String STRING) {} // violation
+    if (o1 instanceof Integer num) {}
+    if (o1 instanceof Integer num_1) {}
+    if (o1 instanceof Integer n) {} // violation
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/naming/patternvariablename.xml.template b/src/xdocs/checks/naming/patternvariablename.xml.template
index 337dc11f830..77e9c6bc2bc 100644
--- a/src/xdocs/checks/naming/patternvariablename.xml.template
+++ b/src/xdocs/checks/naming/patternvariablename.xml.template
@@ -16,22 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[a-z][a-zA-Z0-9]*$"</code></td>
-              <td>8.36</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PatternVariableNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -42,13 +30,13 @@
 
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -57,13 +45,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -72,13 +60,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/patternvariablename/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/recordcomponentname.xml b/src/xdocs/checks/naming/recordcomponentname.xml
index 1535fa0c25d..43349c9a77f 100644
--- a/src/xdocs/checks/naming/recordcomponentname.xml
+++ b/src/xdocs/checks/naming/recordcomponentname.xml
@@ -24,13 +24,9 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code>
-              </td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
               <td>8.40</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/naming/recordcomponentname.xml.template b/src/xdocs/checks/naming/recordcomponentname.xml.template
index fad4b751a40..7316dc5445e 100644
--- a/src/xdocs/checks/naming/recordcomponentname.xml.template
+++ b/src/xdocs/checks/naming/recordcomponentname.xml.template
@@ -14,26 +14,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>"^[a-z][a-zA-Z0-9]*$"</code>
-              </td>
-              <td>8.40</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordComponentNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/recordtypeparametername.xml b/src/xdocs/checks/naming/recordtypeparametername.xml
index 8c0a7cf268c..560864bcbe8 100644
--- a/src/xdocs/checks/naming/recordtypeparametername.xml
+++ b/src/xdocs/checks/naming/recordtypeparametername.xml
@@ -24,13 +24,9 @@
             </tr>
             <tr>
               <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>&quot;^[A-Z]$&quot;</code>
-              </td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[A-Z]$&quot;</code></td>
               <td>8.36</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/naming/recordtypeparametername.xml.template b/src/xdocs/checks/naming/recordtypeparametername.xml.template
index 94cf71c47ac..c672530325f 100644
--- a/src/xdocs/checks/naming/recordtypeparametername.xml.template
+++ b/src/xdocs/checks/naming/recordtypeparametername.xml.template
@@ -14,26 +14,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td>
-                <a href="../../property_types.html#Pattern">Pattern</a>
-              </td>
-              <td>
-                <code>"^[A-Z]$"</code>
-              </td>
-              <td>8.36</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/RecordTypeParameterNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/naming/staticvariablename.xml b/src/xdocs/checks/naming/staticvariablename.xml
index fb6fda1314c..dee3c48e83e 100644
--- a/src/xdocs/checks/naming/staticvariablename.xml
+++ b/src/xdocs/checks/naming/staticvariablename.xml
@@ -26,42 +26,40 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
+              <td>applyToPackage</td>
+              <td>Control if check should apply to package-private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
+              <td>applyToPrivate</td>
+              <td>Control if check should apply to private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
+              <td>applyToProtected</td>
+              <td>Control if check should apply to protected members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
+              <td>applyToPublic</td>
+              <td>Control if check should apply to public members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
+              <td>3.0</td>
+            </tr>
           </table>
         </div>
       </subsection>
@@ -79,10 +77,16 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-class MyClass {
-  public static int goodStatic = 2; // OK
-  private static int BadStatic = 2; // violation, name 'BadStatic'
-                                    // must match pattern '^[a-z][a-zA-Z0-9]*$'
+class Example1 {
+  public static int goodStatic = 2;
+  private static int badStatic = 2;
+  public static int ItStatic1 = 2; // violation, 'must match pattern'
+  protected static int ItStatic2 = 2; // violation, 'must match pattern'
+  private static int ItStatic = 2; // violation, 'must match pattern'
+  public static int it_static = 2; // violation, 'must match pattern'
+  public static int It_Static = 2; // violation, 'must match pattern'
+  private static int It_Static1 = 2; // violation, 'must match pattern'
+  static int It_Static2 = 2; // violation, 'must match pattern'
 }
         </source>
         <p id="Example2-config">
@@ -100,12 +104,16 @@ class MyClass {
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-class MyClass {
-  public static int GoodStatic1 = 2; // OK
-  protected static int GoodStatic2 = 2; //OK
-  private static int goodStatic = 2 // OK
-  private static int BadStatic = 2; // violation, name 'BadStatic'
-                                    // must match pattern '^[a-z][a-zA-Z0-9]*$'
+class Example2 {
+  public static int goodStatic = 2;
+  private static int badStatic = 2;
+  public static int ItStatic1 = 2;
+  protected static int ItStatic2 = 2;
+  private static int ItStatic = 2; // violation, 'must match pattern'
+  public static int it_static = 2;
+  public static int It_Static = 2;
+  private static int It_Static1 = 2; // violation, 'must match pattern'
+  static int It_Static2 = 2; // violation, 'must match pattern'
 }
         </source>
         <p id="Example3-config">
@@ -126,12 +134,16 @@ class MyClass {
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-class MyClass {
-  public static int good_static = 2; // OK
-  public static int Bad_Static = 2; // violation, name 'Bad_Static'
-                                    // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-  private static int Good_Static1 = 2; // OK
-  static int Good_Static2 = 2; // OK
+class Example3 {
+  public static int goodStatic = 2;
+  private static int badStatic = 2;
+  public static int ItStatic1 = 2; // violation, 'must match pattern'
+  protected static int ItStatic2 = 2; // violation, 'must match pattern'
+  private static int ItStatic = 2;
+  public static int it_static = 2;
+  public static int It_Static = 2; // violation, 'must match pattern'
+  private static int It_Static1 = 2;
+  static int It_Static2 = 2;
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/naming/staticvariablename.xml.template b/src/xdocs/checks/naming/staticvariablename.xml.template
index d1989177300..459b7eba868 100644
--- a/src/xdocs/checks/naming/staticvariablename.xml.template
+++ b/src/xdocs/checks/naming/staticvariablename.xml.template
@@ -17,52 +17,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^[a-z][a-zA-Z0-9]*$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -72,13 +30,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -86,13 +44,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -102,13 +60,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/naming/typename.xml b/src/xdocs/checks/naming/typename.xml
index f855ab57e57..c70b8a4dc34 100644
--- a/src/xdocs/checks/naming/typename.xml
+++ b/src/xdocs/checks/naming/typename.xml
@@ -25,70 +25,67 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^[A-Z][a-zA-Z0-9]*$&quot;</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
+              <td>applyToPackage</td>
+              <td>Control if check should apply to package-private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
+              <td>applyToPrivate</td>
+              <td>Control if check should apply to private members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
+              <td>applyToProtected</td>
+              <td>Control if check should apply to protected members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
+              <td>applyToPublic</td>
+              <td>Control if check should apply to public members.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.0</td>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Sets the pattern to match valid identifiers.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^[A-Z][a-zA-Z0-9]*$&quot;</code></td>
+              <td>3.0</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    ANNOTATION_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>3.0</td>
@@ -111,11 +108,12 @@
         </source>
         <p id="Example1-code">Code Example:</p>
         <source>
-public interface FirstName {} // OK
-protected class SecondName {} // OK
-enum Third_Name {} // violation, name 'Third_Name' must match pattern '^[A-Z][a-zA-Z0-9]*$'
-private class FourthName_ {} // violation, name 'FourthName_'
-                            // must match pattern '^[A-Z][a-zA-Z0-9]*$'
+class Example1 {
+  public interface FirstName {}
+  protected class SecondName {}
+  enum Third_Name {} // violation
+  private class FourthName_ {} // violation
+}
         </source>
         <p id="Example2-config">
           An example of how to configure the check for names that begin with a lower case letter,
@@ -135,11 +133,12 @@ private class FourthName_ {} // violation, name 'FourthName_'
         </source>
         <p id="Example2-code">Code Example:</p>
         <source>
-public interface firstName {} // OK
-public class SecondName {} // violation, name 'SecondName'
-                          // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-protected class ThirdName {} // OK
-private class FourthName {} // OK
+class Example2 {   // violation
+  public interface firstName {}
+  public class SecondName {} // violation
+  protected class ThirdName {}
+  private class FourthName {}
+}
         </source>
         <p id="Example3-config">
           The following configuration element ensures that
@@ -160,9 +159,10 @@ private class FourthName {} // OK
         </source>
         <p id="Example3-code">Code Example:</p>
         <source>
-public interface I_firstName {} // OK
-interface SecondName {} // violation, name 'SecondName'
-                       // must match pattern '^I_[a-zA-Z0-9]*$'
+class Example3 {
+  public interface I_firstName {}
+  interface SecondName {} // violation
+}
         </source>
 
       </subsection>
diff --git a/src/xdocs/checks/naming/typename.xml.template b/src/xdocs/checks/naming/typename.xml.template
index 4a5bafa5d1d..00dc495c428 100644
--- a/src/xdocs/checks/naming/typename.xml.template
+++ b/src/xdocs/checks/naming/typename.xml.template
@@ -16,84 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specifies valid identifiers.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^[A-Z][a-zA-Z0-9]*$"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>applyToPublic</td>
-              <td>Controls whether to apply the check to public member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToProtected</td>
-              <td>Controls whether to apply the check to protected member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToPackage</td>
-              <td>
-                Controls whether to apply the check to package-private member.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>applyToPrivate</td>
-              <td>Controls whether to apply the check to private member.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
-                  ANNOTATION_DEF</a>
-                ,<a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -104,13 +30,13 @@
 
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -120,13 +46,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -136,13 +62,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Code Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/naming/typename/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
 
diff --git a/src/xdocs/checks/regexp/regexp.xml b/src/xdocs/checks/regexp/regexp.xml
index d6d09a60231..2b3849a8b2e 100644
--- a/src/xdocs/checks/regexp/regexp.xml
+++ b/src/xdocs/checks/regexp/regexp.xml
@@ -66,34 +66,9 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify the pattern to match against.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;^$&quot;</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify message which is used to notify about violations,
-                if empty then the default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>illegalPattern</td>
-              <td>Control whether the pattern is required or illegal.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
             <tr>
               <td>duplicateLimit</td>
-              <td>Control whether to check for duplicates of a required pattern,
-                any negative value means no checking for duplicates, any positive
-                value is used as the maximum number of allowed duplicates, if the
-                limit is exceeded violations will be logged.</td>
+              <td>Control whether to check for duplicates of a required pattern, any negative value means no checking for duplicates, any positive value is used as the maximum number of allowed duplicates, if the limit is exceeded violations will be logged.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>0</code></td>
               <td>4.0</td>
@@ -105,6 +80,13 @@
               <td><code>100</code></td>
               <td>4.0</td>
             </tr>
+            <tr>
+              <td>format</td>
+              <td>Specify the pattern to match against.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;^$&quot;</code></td>
+              <td>4.0</td>
+            </tr>
             <tr>
               <td>ignoreComments</td>
               <td>Control whether to ignore matches found within comments.</td>
@@ -112,6 +94,20 @@
               <td><code>false</code></td>
               <td>4.0</td>
             </tr>
+            <tr>
+              <td>illegalPattern</td>
+              <td>Control whether the pattern is required or illegal.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>4.0</td>
+            </tr>
+            <tr>
+              <td>message</td>
+              <td>Specify message which is used to notify about violations, if empty then the default (hard-coded) message is used.</td>
+              <td><a href="../../property_types.html#String">String</a></td>
+              <td><code>null</code></td>
+              <td>4.0</td>
+            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/checks/regexp/regexp.xml.template b/src/xdocs/checks/regexp/regexp.xml.template
index cfa5993fed7..ec41d7f2b09 100644
--- a/src/xdocs/checks/regexp/regexp.xml.template
+++ b/src/xdocs/checks/regexp/regexp.xml.template
@@ -58,61 +58,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify the pattern to match against.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^$"</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify message which is used to notify about violations,
-                if empty then the default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>illegalPattern</td>
-              <td>Control whether the pattern is required or illegal.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>duplicateLimit</td>
-              <td>Control whether to check for duplicates of a required pattern,
-                any negative value means no checking for duplicates, any positive
-                value is used as the maximum number of allowed duplicates, if the
-                limit is exceeded violations will be logged.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>errorLimit</td>
-              <td>Specify the maximum number of violations before the check will abort.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>100</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>ignoreComments</td>
-              <td>Control whether to ignore matches found within comments.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/regexp/regexpmultiline.xml b/src/xdocs/checks/regexp/regexpmultiline.xml
index ed490b25f75..24cbe3e3178 100644
--- a/src/xdocs/checks/regexp/regexpmultiline.xml
+++ b/src/xdocs/checks/regexp/regexpmultiline.xml
@@ -30,6 +30,13 @@
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>fileExtensions</td>
+              <td>Specify the file extensions of the files to process.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>all files</code></td>
+              <td>5.0</td>
+            </tr>
             <tr>
               <td>format</td>
               <td>Specify the format of the regular expression to match.</td>
@@ -37,14 +44,6 @@
               <td><code>&quot;$.&quot;</code></td>
               <td>5.0</td>
             </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify the message which is used to notify about violations,
-              if empty then default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>5.0</td>
-            </tr>
             <tr>
               <td>ignoreCase</td>
               <td>Control whether to ignore case when searching.</td>
@@ -53,11 +52,11 @@
               <td>5.0</td>
             </tr>
             <tr>
-              <td>minimum</td>
-              <td>Specify the minimum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>5.0</td>
+              <td>matchAcrossLines</td>
+              <td>Control whether to match expressions across multiple lines.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>8.25</td>
             </tr>
             <tr>
               <td>maximum</td>
@@ -67,17 +66,17 @@
               <td>5.0</td>
             </tr>
             <tr>
-              <td>matchAcrossLines</td>
-              <td>Control whether to match expressions across multiple lines.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.25</td>
+              <td>message</td>
+              <td>Specify the message which is used to notify about violations, if empty then default (hard-coded) message is used.</td>
+              <td><a href="../../property_types.html#String">String</a></td>
+              <td><code>null</code></td>
+              <td>5.0</td>
             </tr>
             <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
+              <td>minimum</td>
+              <td>Specify the minimum number of matches required in each file.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>0</code></td>
               <td>5.0</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/regexp/regexpmultiline.xml.template b/src/xdocs/checks/regexp/regexpmultiline.xml.template
index d335451f90a..d232334b3e7 100644
--- a/src/xdocs/checks/regexp/regexpmultiline.xml.template
+++ b/src/xdocs/checks/regexp/regexpmultiline.xml.template
@@ -22,65 +22,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify the format of the regular expression to match.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"$."</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify the message which is used to notify about violations,
-              if empty then default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>ignoreCase</td>
-              <td>Control whether to ignore case when searching.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>minimum</td>
-              <td>Specify the minimum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>maximum</td>
-              <td>Specify the maximum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>matchAcrossLines</td>
-              <td>Control whether to match expressions across multiple lines.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.25</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/regexp/regexponfilename.xml b/src/xdocs/checks/regexp/regexponfilename.xml
index 6e68683ab47..d3093eb261a 100644
--- a/src/xdocs/checks/regexp/regexponfilename.xml
+++ b/src/xdocs/checks/regexp/regexponfilename.xml
@@ -60,10 +60,10 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>folderPattern</td>
-              <td>Specify the regular expression to match the folder path against.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
+              <td>fileExtensions</td>
+              <td>Specify the file extensions of the files to process.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>all files</code></td>
               <td>6.15</td>
             </tr>
             <tr>
@@ -74,11 +74,10 @@
               <td>6.15</td>
             </tr>
             <tr>
-              <td>match</td>
-              <td>Control whether to look for a match or mismatch on the file name, if the
-              fileNamePattern is supplied, otherwise it is applied on the folderPattern.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
+              <td>folderPattern</td>
+              <td>Specify the regular expression to match the folder path against.</td>
+              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
+              <td><code>null</code></td>
               <td>6.15</td>
             </tr>
             <tr>
@@ -89,11 +88,10 @@
               <td>6.15</td>
             </tr>
             <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process. If this is specified, then
-              only files that match these types are examined with the other patterns.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
+              <td>match</td>
+              <td>Control whether to look for a match or mismatch on the file name, if the fileNamePattern is supplied, otherwise it is applied on the folderPattern.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
               <td>6.15</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/regexp/regexponfilename.xml.template b/src/xdocs/checks/regexp/regexponfilename.xml.template
index 1b15a9f3b5c..a75da1bea2b 100644
--- a/src/xdocs/checks/regexp/regexponfilename.xml.template
+++ b/src/xdocs/checks/regexp/regexponfilename.xml.template
@@ -51,52 +51,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>folderPattern</td>
-              <td>Specify the regular expression to match the folder path against.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>6.15</td>
-            </tr>
-            <tr>
-              <td>fileNamePattern</td>
-              <td>Specify the regular expression to match the file name against.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>6.15</td>
-            </tr>
-            <tr>
-              <td>match</td>
-              <td>Control whether to look for a match or mismatch on the file name, if the
-              fileNamePattern is supplied, otherwise it is applied on the folderPattern.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.15</td>
-            </tr>
-            <tr>
-              <td>ignoreFileNameExtensions</td>
-              <td>Control whether to ignore the file extension for the file name match.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.15</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process. If this is specified, then
-              only files that match these types are examined with the other patterns.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>6.15</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/regexp/regexpsingleline.xml b/src/xdocs/checks/regexp/regexpsingleline.xml
index 03befbefa6c..1bebe47d5f8 100644
--- a/src/xdocs/checks/regexp/regexpsingleline.xml
+++ b/src/xdocs/checks/regexp/regexpsingleline.xml
@@ -30,6 +30,13 @@
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>fileExtensions</td>
+              <td>Specify the file extensions of the files to process.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>all files</code></td>
+              <td>5.0</td>
+            </tr>
             <tr>
               <td>format</td>
               <td>Specify the format of the regular expression to match.</td>
@@ -37,14 +44,6 @@
               <td><code>&quot;$.&quot;</code></td>
               <td>5.0</td>
             </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify the message which is used to notify about violations,
-              if empty then default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>5.0</td>
-            </tr>
             <tr>
               <td>ignoreCase</td>
               <td>Control whether to ignore case when searching.</td>
@@ -53,24 +52,24 @@
               <td>5.0</td>
             </tr>
             <tr>
-              <td>minimum</td>
-              <td>Specify the minimum number of matches required in each file.</td>
+              <td>maximum</td>
+              <td>Specify the maximum number of matches required in each file.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>0</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>maximum</td>
-              <td>Specify the maximum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
+              <td>message</td>
+              <td>Specify the message which is used to notify about violations, if empty then default (hard-coded) message is used.</td>
+              <td><a href="../../property_types.html#String">String</a></td>
+              <td><code>null</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
+              <td>minimum</td>
+              <td>Specify the minimum number of matches required in each file.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>0</code></td>
               <td>5.0</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/regexp/regexpsingleline.xml.template b/src/xdocs/checks/regexp/regexpsingleline.xml.template
index 19f678c5a89..0f3632d0d29 100644
--- a/src/xdocs/checks/regexp/regexpsingleline.xml.template
+++ b/src/xdocs/checks/regexp/regexpsingleline.xml.template
@@ -22,58 +22,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify the format of the regular expression to match.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"$."</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify the message which is used to notify about violations,
-              if empty then default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>ignoreCase</td>
-              <td>Control whether to ignore case when searching.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>minimum</td>
-              <td>Specify the minimum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>maximum</td>
-              <td>Specify the maximum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/regexp/regexpsinglelinejava.xml b/src/xdocs/checks/regexp/regexpsinglelinejava.xml
index 90219a1c6f3..01163838fae 100644
--- a/src/xdocs/checks/regexp/regexpsinglelinejava.xml
+++ b/src/xdocs/checks/regexp/regexpsinglelinejava.xml
@@ -37,14 +37,6 @@
               <td><code>&quot;$.&quot;</code></td>
               <td>5.0</td>
             </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify the message which is used to notify about violations,
-              if empty then default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>6.0</td>
-            </tr>
             <tr>
               <td>ignoreCase</td>
               <td>Control whether to ignore case when searching.</td>
@@ -53,10 +45,10 @@
               <td>5.0</td>
             </tr>
             <tr>
-              <td>minimum</td>
-              <td>Specify the minimum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
+              <td>ignoreComments</td>
+              <td>Control whether to ignore text in comments when searching.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
               <td>5.0</td>
             </tr>
             <tr>
@@ -67,10 +59,17 @@
               <td>5.0</td>
             </tr>
             <tr>
-              <td>ignoreComments</td>
-              <td>Control whether to ignore text in comments when searching.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
+              <td>message</td>
+              <td>Specify the message which is used to notify about violations, if empty then default (hard-coded) message is used.</td>
+              <td><a href="../../property_types.html#String">String</a></td>
+              <td><code>null</code></td>
+              <td>6.0</td>
+            </tr>
+            <tr>
+              <td>minimum</td>
+              <td>Specify the minimum number of matches required in each file.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>0</code></td>
               <td>5.0</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/regexp/regexpsinglelinejava.xml.template b/src/xdocs/checks/regexp/regexpsinglelinejava.xml.template
index 4624e5c599a..8de117a292a 100644
--- a/src/xdocs/checks/regexp/regexpsinglelinejava.xml.template
+++ b/src/xdocs/checks/regexp/regexpsinglelinejava.xml.template
@@ -22,58 +22,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>format</td>
-              <td>Specify the format of the regular expression to match.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"$."</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Specify the message which is used to notify about violations,
-              if empty then default (hard-coded) message is used.</td>
-              <td><a href="../../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>6.0</td>
-            </tr>
-            <tr>
-              <td>ignoreCase</td>
-              <td>Control whether to ignore case when searching.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>minimum</td>
-              <td>Specify the minimum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>maximum</td>
-              <td>Specify the maximum number of matches required in each file.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>0</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>ignoreComments</td>
-              <td>Control whether to ignore text in comments when searching.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpSinglelineJavaCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/sizes/anoninnerlength.xml.template b/src/xdocs/checks/sizes/anoninnerlength.xml.template
index 5de4fd3a449..9fdbe9beed6 100644
--- a/src/xdocs/checks/sizes/anoninnerlength.xml.template
+++ b/src/xdocs/checks/sizes/anoninnerlength.xml.template
@@ -24,22 +24,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum number of lines allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>20</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/sizes/executablestatementcount.xml b/src/xdocs/checks/sizes/executablestatementcount.xml
index 0be8eef8c21..e659fa07076 100644
--- a/src/xdocs/checks/sizes/executablestatementcount.xml
+++ b/src/xdocs/checks/sizes/executablestatementcount.xml
@@ -32,36 +32,35 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
+                    INSTANCE_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
+                    STATIC_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                COMPACT_CTOR_DEF</a>
+                    COMPACT_CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                .
+                    LAMBDA</a>
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
+                    INSTANCE_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
+                    STATIC_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                COMPACT_CTOR_DEF</a>
+                    COMPACT_CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                .
+                    LAMBDA</a>
+                  .
               </td>
               <td>3.2</td>
             </tr>
diff --git a/src/xdocs/checks/sizes/executablestatementcount.xml.template b/src/xdocs/checks/sizes/executablestatementcount.xml.template
index 93bf4aa6e0b..2f5716f5c01 100644
--- a/src/xdocs/checks/sizes/executablestatementcount.xml.template
+++ b/src/xdocs/checks/sizes/executablestatementcount.xml.template
@@ -14,58 +14,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum threshold allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>30</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                COMPACT_CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                  INSTANCE_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
-                  STATIC_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                COMPACT_CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                .
-              </td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/sizes/filelength.xml b/src/xdocs/checks/sizes/filelength.xml
index c5ba5f7dca9..01a8c4f8b1a 100644
--- a/src/xdocs/checks/sizes/filelength.xml
+++ b/src/xdocs/checks/sizes/filelength.xml
@@ -30,6 +30,13 @@
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>fileExtensions</td>
+              <td>Specify the file extensions of the files to process.</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>all files</code></td>
+              <td>5.0</td>
+            </tr>
             <tr>
               <td>max</td>
               <td>Specify the maximum number of lines allowed.</td>
@@ -37,36 +44,67 @@
               <td><code>2000</code></td>
               <td>3.2</td>
             </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>5.0</td>
-            </tr>
           </table>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
         <p id="Example1-config">
-          To configure the check:
+         To configure the check to accept files with up to 2000 lines:
         </p>
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;FileLength&quot;/&gt;
 &lt;/module&gt;
+        </source>
+        <p id="Example1-code">Example:</p>
+        <source>
+public class Example1 {
+  public void myTest() {
+    // small class less than 2000 lines
+    String test = &quot;Some content&quot;;
+  }
+}
         </source>
         <p id="Example2-config">
-          To configure the check to accept files with up to 1500 lines:
+          To configure the check to accept files with up to 5 lines:
+        </p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;FileLength&quot;&gt;
+    &lt;property name=&quot;max&quot; value=&quot;5&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example2-code">Example:</p>
+        <source>
+public class Example2 {
+  public void myTest() {
+    // small class with more than 5 lines
+    String test = &quot;Some content&quot;; // there is violation
+  }
+}
+        </source>
+        <p id="Example3-config">
+          To configure the check to accept files with up to 5 lines and with txt extension only:
         </p>
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;FileLength&quot;&gt;
-    &lt;property name=&quot;max&quot; value=&quot;1500&quot;/&gt;
+    &lt;property name=&quot;max&quot; value=&quot;5&quot;/&gt;
+    &lt;property name=&quot;fileExtensions&quot; value=&quot;txt&quot;/&gt;
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example3-code">Example:</p>
+        <source>
+public class Example3 {
+  public void myTest() {
+    // small class with more than 5 lines
+    String test = &quot;Some content&quot;; // no violation as only txt files are validated
+  }
+}
+        </source>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/sizes/filelength.xml.template b/src/xdocs/checks/sizes/filelength.xml.template
index b94634501c7..7a579b81430 100644
--- a/src/xdocs/checks/sizes/filelength.xml.template
+++ b/src/xdocs/checks/sizes/filelength.xml.template
@@ -22,49 +22,56 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum number of lines allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>2000</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify the file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/FileLengthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
         <p id="Example1-config">
-          To configure the check:
+         To configure the check to accept files with up to 2000 lines:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example1.java"/>
+          <param name="type" value="code"/>
+        </macro>
         <p id="Example2-config">
-          To configure the check to accept files with up to 1500 lines:
+          To configure the check to accept files with up to 5 lines:
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.java"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
+          To configure the check to accept files with up to 5 lines and with txt extension only:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/filelength/Example3.java"/>
+          <param name="type" value="code"/>
+        </macro>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/sizes/lambdabodylength.xml.template b/src/xdocs/checks/sizes/lambdabodylength.xml.template
index 473b87c0c25..6e37133f81d 100644
--- a/src/xdocs/checks/sizes/lambdabodylength.xml.template
+++ b/src/xdocs/checks/sizes/lambdabodylength.xml.template
@@ -23,22 +23,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum number of lines allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>10</code></td>
-              <td>8.37</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LambdaBodyLengthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/sizes/linelength.xml b/src/xdocs/checks/sizes/linelength.xml
index c43401e7ca0..27c5c45d246 100644
--- a/src/xdocs/checks/sizes/linelength.xml
+++ b/src/xdocs/checks/sizes/linelength.xml
@@ -33,7 +33,7 @@
             </tr>
             <tr>
               <td>fileExtensions</td>
-              <td>Specify file extensions that are accepted.</td>
+              <td>Specify the file extensions of the files to process.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>all files</code></td>
               <td>8.24</td>
diff --git a/src/xdocs/checks/sizes/linelength.xml.template b/src/xdocs/checks/sizes/linelength.xml.template
index 0185358cb19..e57df39446b 100644
--- a/src/xdocs/checks/sizes/linelength.xml.template
+++ b/src/xdocs/checks/sizes/linelength.xml.template
@@ -23,36 +23,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify file extensions that are accepted.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>8.24</td>
-            </tr>
-            <tr>
-              <td>ignorePattern</td>
-              <td>Specify pattern for lines to ignore.</td>
-              <td><a href="../../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"^(package|import) .*"</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum line length allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>80</code></td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/sizes/methodcount.xml b/src/xdocs/checks/sizes/methodcount.xml
index 6a6229f3630..0a6a43ffb9e 100644
--- a/src/xdocs/checks/sizes/methodcount.xml
+++ b/src/xdocs/checks/sizes/methodcount.xml
@@ -64,8 +64,8 @@ public class ExampleClass {
               <th>since</th>
             </tr>
             <tr>
-              <td>maxTotal</td>
-              <td>Specify the maximum number of methods allowed at all scope levels.</td>
+              <td>maxPackage</td>
+              <td>Specify the maximum number of <code>package</code> methods allowed.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>100</code></td>
               <td>5.3</td>
@@ -78,62 +78,58 @@ public class ExampleClass {
               <td>5.3</td>
             </tr>
             <tr>
-              <td>maxPackage</td>
-              <td>Specify the maximum number of <code>package</code> methods allowed.</td>
+              <td>maxProtected</td>
+              <td>Specify the maximum number of <code>protected</code> methods allowed.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>100</code></td>
               <td>5.3</td>
             </tr>
             <tr>
-              <td>maxProtected</td>
-              <td>Specify the maximum number of <code>protected</code> methods allowed.</td>
+              <td>maxPublic</td>
+              <td>Specify the maximum number of <code>public</code> methods allowed.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>100</code></td>
               <td>5.3</td>
             </tr>
             <tr>
-              <td>maxPublic</td>
-              <td>Specify the maximum number of <code>public</code> methods allowed.</td>
+              <td>maxTotal</td>
+              <td>Specify the maximum number of methods allowed at all scope levels.</td>
               <td><a href="../../property_types.html#int">int</a></td>
               <td><code>100</code></td>
               <td>5.3</td>
             </tr>
-
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  ANNOTATION_DEF</a>
+                    INTERFACE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
+                    RECORD_DEF</a>
+                  .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  ANNOTATION_DEF</a>
+                    INTERFACE_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_DEF">
+                    ANNOTATION_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
+                    RECORD_DEF</a>
+                  .
               </td>
               <td>5.3</td>
             </tr>
diff --git a/src/xdocs/checks/sizes/methodcount.xml.template b/src/xdocs/checks/sizes/methodcount.xml.template
index 69080dcb415..e93dd84c3a3 100644
--- a/src/xdocs/checks/sizes/methodcount.xml.template
+++ b/src/xdocs/checks/sizes/methodcount.xml.template
@@ -55,89 +55,10 @@ public class ExampleClass {
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>maxTotal</td>
-              <td>Specify the maximum number of methods allowed at all scope levels.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>100</code></td>
-              <td>5.3</td>
-            </tr>
-            <tr>
-              <td>maxPrivate</td>
-              <td>Specify the maximum number of <code>private</code> methods allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>100</code></td>
-              <td>5.3</td>
-            </tr>
-            <tr>
-              <td>maxPackage</td>
-              <td>Specify the maximum number of <code>package</code> methods allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>100</code></td>
-              <td>5.3</td>
-            </tr>
-            <tr>
-              <td>maxProtected</td>
-              <td>Specify the maximum number of <code>protected</code> methods allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>100</code></td>
-              <td>5.3</td>
-            </tr>
-            <tr>
-              <td>maxPublic</td>
-              <td>Specify the maximum number of <code>public</code> methods allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>100</code></td>
-              <td>5.3</td>
-            </tr>
-
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  ANNOTATION_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                .
-              </td>
-              <td>5.3</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/sizes/methodlength.xml b/src/xdocs/checks/sizes/methodlength.xml
index c5d89d00fcc..33d7f84f5a2 100644
--- a/src/xdocs/checks/sizes/methodlength.xml
+++ b/src/xdocs/checks/sizes/methodlength.xml
@@ -30,6 +30,13 @@
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>countEmpty</td>
+              <td>Control whether to count empty lines and comments.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>3.2</td>
+            </tr>
             <tr>
               <td>max</td>
               <td>Specify the maximum number of lines allowed.</td>
@@ -37,38 +44,26 @@
               <td><code>150</code></td>
               <td>3.0</td>
             </tr>
-            <tr>
-              <td>countEmpty</td>
-              <td>
-                Control whether to count empty lines and comments.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.2</td>
-            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                .
+                    COMPACT_CTOR_DEF</a>
+                  .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    METHOD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                 COMPACT_CTOR_DEF</a>
-                .
+                    COMPACT_CTOR_DEF</a>
+                  .
               </td>
               <td>3.0</td>
             </tr>
@@ -78,40 +73,63 @@
 
       <subsection name="Examples" id="Examples">
         <p id="Example1-config">
-          To configure the check:
+          To configure the check so that it accepts at most 4
+          lines:
         </p>
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
-    &lt;module name=&quot;MethodLength&quot;/&gt;
+    &lt;module name=&quot;MethodLength&quot;&gt;
+      &lt;property name=&quot;max&quot; value=&quot;4&quot;/&gt;
+    &lt;/module&gt;
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
         <p id="Example1-code">Example:</p>
         <source>
-public class MyClass {
-  public MyClass() {  // constructor (line 1)
-      /* line 2
-          ...
-         line 150 */
-  } // line 151, violation, as it is over 150
-
-  public void firstExample() { // line 1
-
-      // line 3
-      System.out.println(&quot;line 4&quot;);
-      /* line 5
-         line 6 */
-  } // line 7, OK, as it is less than 150
-
-  public void secondExample() { // line 1
-      // line 2
-      System.out.println(&quot;line 3&quot;);
-
-      /* line 5
-          ...
-         line 150 */
-  } // line 151, violation, as it is over 150
+public class Example1 {
+
+  // violation below, 'Method Example1 length is 5 lines (max allowed is 4)'
+  public Example1() {
+    int var1 = 2;
+    int var2 = 4;
+    int sum = var1 + var2;
+  }
+
+  // ok, as it is less than 4 lines
+  public Example1(int a)  {
+    int var1 = 2;
+    int sum = var1 + a;
+  }
+
+  // violation below, 'Method firstMethod length is 6 lines (max allowed is 4)'
+  public void firstMethod() {
+    int index = 0;
+    if (index &lt; 5) {
+      index++;
+    }
+  }
+
+  public void secondMethod() {
+    // comments are counted by default
+    System.out.println(&quot;line 3&quot;);
+  }
+
+  // violation below, 'Method thirdMethod length is 5 lines (max allowed is 4)'
+  public void thirdMethod() {
+
+    // empty line above is counted by default,just like this comment
+    System.out.println(&quot;line 4&quot;);
+  }
+
+  record MyBadRecord() {
+    // violation below, 'Method MyBadRecord length is 5 lines (max allowed is 4)'
+    public MyBadRecord {
+
+      System.out.println(&quot;line3&quot;);
+      System.out.println(&quot;line4&quot;);
+    }
+  }
 }
         </source>
         <p id="Example2-config">
@@ -130,30 +148,49 @@ public class MyClass {
         </source>
         <p id="Example2-code">Example:</p>
         <source>
-public class MyTest {
-  public MyTest()  {          // constructor (line 1)
-      int var1 = 2;           // line 2
-      int var2 = 4;           // line 3
-      int sum = var1 + var2;  // line 4
-  } // line 5, OK, constructor is not mentioned in the tokens
-
-  public void firstMethod() { // line 1
-      // comment (line 2)
-      System.out.println(&quot;line 3&quot;);
-  } // line 4, OK, as it allows at most 4 lines
-
-  public void secondMethod() { // line 1
-      int index = 0;   // line 2
-      if (index &lt; 5) { // line 3
-          index++;     // line 4
-      }                // line 5
-  } // line 6, violation, as it is over 4 lines
-
-  public void thirdMethod() { // line 1
-
-      // comment (line 3)
-      System.out.println(&quot;line 4&quot;);
-  } // line 5, violation, as it is over 4 lines
+public class Example2 {
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example2()  {
+    int var1 = 2;
+    int var2 = 4;
+    int sum = var1 + var2;
+  }
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example2(int a)  {
+    int var1 = 2;
+    int sum = var1 + a;
+  }
+
+  // violation below, 'Method firstMethod length is 6 lines (max allowed is 4)'
+  public void firstMethod() {
+    int index = 0;
+    if (index &lt; 5) {
+      index++;
+    }
+  }
+
+  public void secondMethod() {
+    // comments are counted by default
+    System.out.println(&quot;line 3&quot;);
+  }
+
+  // violation below, 'Method thirdMethod length is 5 lines (max allowed is 4)'
+  public void thirdMethod() {
+
+    // empty line above is counted by default,just like this comment
+    System.out.println(&quot;line 4&quot;);
+  }
+
+  record MyBadRecord() {
+    // ok, COMPACT_CTOR_DEF is not in configured tokens
+    public MyBadRecord {
+
+      System.out.println(&quot;line3&quot;);
+      System.out.println(&quot;line4&quot;);
+    }
+  }
 }
         </source>
         <p id="Example3-config">
@@ -173,30 +210,48 @@ public class MyTest {
         </source>
         <p id="Example3-code">Example:</p>
         <source>
-public class MyTest {
-  public MyTest()  {          // constructor (line 1)
-      int var1 = 2;           // line 2
-      int var2 = 4;           // line 3
-      int sum = var1 + var2;  // line 4
-  } // line 5, OK, constructor is not mentioned in the tokens
-
-  public void firstMethod() { // line 1
-      // comment - not counted as line
-      System.out.println(&quot;line 2&quot;);
-  } // line 3, OK, as it allows at most 4 lines
-
-  public void secondMethod() { // line 1
-      int index = 0;   // line 2
-      if (index &lt; 5) { // line 3
-          index++;     // line 4
-      }                // line 5
-  } // line 6, violation, as it is over 4 lines
-
-  public void thirdMethod() { // line 1
-
-      // comment - not counted as line
-      System.out.println(&quot;line 2&quot;);
-  } // line 3, OK, as it allows at most 4 lines
+public class Example3 {
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example3()  {
+    int var1 = 2;
+    int var2 = 4;
+    int sum = var1 + var2;
+  }
+
+  // ok, CTOR_DEF is not in configured tokens
+  public Example3(int a)  {
+    int var1 = 2;
+    int sum = var1 + a;
+  }
+
+  // violation below, 'Method firstMethod length is 6 lines (max allowed is 4)'
+  public void firstMethod() {
+    int index = 0;
+    if (index &lt; 5) {
+      index++;
+    }
+  }
+
+  public void secondMethod() {
+    // countEmpty property is false,so this line doesn't count
+    System.out.println(&quot;line 3&quot;);
+  }
+
+  public void thirdMethod() {
+
+    // countEmpty property is false,so this line and the line above don't count
+    System.out.println(&quot;line 4&quot;);
+  }
+
+  record MyBadRecord() {
+    // ok, COMPACT_CTOR_DEF is not in configured tokens
+    public MyBadRecord {
+
+      System.out.println(&quot;line3&quot;);
+      System.out.println(&quot;line4&quot;);
+    }
+  }
 }
         </source>
       </subsection>
diff --git a/src/xdocs/checks/sizes/methodlength.xml.template b/src/xdocs/checks/sizes/methodlength.xml.template
index 00bb0301cd1..7d9808ec8d2 100644
--- a/src/xdocs/checks/sizes/methodlength.xml.template
+++ b/src/xdocs/checks/sizes/methodlength.xml.template
@@ -22,73 +22,27 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum number of lines allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>150</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>countEmpty</td>
-              <td>
-                Control whether to count empty lines and comments.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                 COMPACT_CTOR_DEF</a>
-                .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
       <subsection name="Examples" id="Examples">
         <p id="Example1-config">
-          To configure the check:
+          To configure the check so that it accepts at most 4
+          lines:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example1-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example1.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example2-config">
@@ -97,13 +51,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example2-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example2.java"/>
           <param name="type" value="code"/>
         </macro>
         <p id="Example3-config">
@@ -112,13 +66,13 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
         <p id="Example3-code">Example:</p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.txt"/>
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/sizes/methodlength/Example3.java"/>
           <param name="type" value="code"/>
         </macro>
       </subsection>
diff --git a/src/xdocs/checks/sizes/outertypenumber.xml.template b/src/xdocs/checks/sizes/outertypenumber.xml.template
index 4dc9286a4c7..88e13709b8c 100644
--- a/src/xdocs/checks/sizes/outertypenumber.xml.template
+++ b/src/xdocs/checks/sizes/outertypenumber.xml.template
@@ -22,22 +22,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum number of outer types allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>1</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/sizes/parameternumber.xml b/src/xdocs/checks/sizes/parameternumber.xml
index cae38a2e4c0..24c06ddce49 100644
--- a/src/xdocs/checks/sizes/parameternumber.xml
+++ b/src/xdocs/checks/sizes/parameternumber.xml
@@ -25,40 +25,42 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>max</td>
-              <td>Specify the maximum number of parameters allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>7</code></td>
-              <td>3.0</td>
+              <td>ignoreAnnotatedBy</td>
+              <td>Ignore methods and constructors annotated with the specified annotation(s).</td>
+              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>{}</code></td>
+              <td>10.15.0</td>
             </tr>
             <tr>
               <td>ignoreOverriddenMethods</td>
-              <td>
-                Ignore number of parameters for methods with <code>@Override</code> annotation.
-              </td>
+              <td>Ignore number of parameters for methods with <code>@Override</code> annotation.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>6.2</td>
             </tr>
+            <tr>
+              <td>max</td>
+              <td>Specify the maximum number of parameters allowed.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>7</code></td>
+              <td>3.0</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                .
+                    CTOR_DEF</a>
+                  .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                .
+                    CTOR_DEF</a>
+                  .
               </td>
               <td>3.0</td>
             </tr>
@@ -77,7 +79,34 @@
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example1-code">Example:</p>
+        <source>
+class Example1 extends ExternalService1 {
+
+  @JsonCreator
+  // violation below, 'More than 7 parameters (found 8)'
+  Example1(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // violation below, 'More than 7 parameters (found 8)'
+  Example1(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
 
+  @Override
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService1 {
+
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+        </source>
         <p id="Example2-config">
           To configure the check to allow 10 parameters for a method:
         </p>
@@ -90,6 +119,34 @@
     &lt;/module&gt;
   &lt;/module&gt;
 &lt;/module&gt;
+        </source>
+        <p id="Example2-code">Example:</p>
+        <source>
+class Example2 extends ExternalService2 {
+
+  @JsonCreator
+  // ok below, constructor is not in tokens to check
+  Example2(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // ok below, constructor is not in tokens to check
+  Example2(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
+
+  @Override
+  // ok below, less than 10 parameters (found 8)
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService2 {
+
+  // ok below, less than 10 parameters (found 8)
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
         </source>
         <p>
           To configure the check to ignore number of parameters for methods with
@@ -109,16 +166,79 @@
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p id="Example3-code">
-          Java code example:
+        <p id="Example3-code">Example:</p>
+        <source>
+class Example3 extends ExternalService3 {
+
+  @JsonCreator
+  // violation below, 'More than 7 parameters (found 8)'
+  Example3(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // violation below, 'More than 7 parameters (found 8)'
+  Example3(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
+
+  @Override
+  // ok below, overridden method is ignored
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService3 {
+
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+        </source>
+        <p id="Example4-config">
+          To configure the check to ignore methods and constructors annotated with
+          <code>JsonCreator</code> annotation:
         </p>
         <source>
-@Override
-public void needsLotsOfParameters(int a,
-    int b, int c, int d, int e, int f, int g, int h) {
-    ...
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;ParameterNumber&quot;&gt;
+      &lt;property name=&quot;ignoreAnnotatedBy&quot; value=&quot;JsonCreator&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example4-code">Example:</p>
+        <source>
+class Example4 extends ExternalService4 {
+
+  @JsonCreator
+  // ok below, constructor annotated with JsonCreator annotation is ignored
+  Example4(int a, int b, int c, int d,
+           int e, int f, int g, int h) {}
+
+  // violation below, 'More than 7 parameters (found 8)'
+  Example4(String a, String b, String c, String d,
+           String e, String f, String g, String h) {}
+
+  @Override
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
+}
+
+class ExternalService4 {
+
+  // violation below, 'More than 7 parameters (found 8)'
+  public void processData(String a, String b, String c, String d,
+                          String e, String f, String g, String h) {}
+
 }
         </source>
+        <p>
+          Note: Annotation names specified in the <code>ignoreAnnotatedBy</code> property
+          must be an exact match for the annotation name on the method or constructor.
+        </p>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/sizes/parameternumber.xml.template b/src/xdocs/checks/sizes/parameternumber.xml.template
index b1a95e14428..33c1a683ed4 100644
--- a/src/xdocs/checks/sizes/parameternumber.xml.template
+++ b/src/xdocs/checks/sizes/parameternumber.xml.template
@@ -16,53 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>Specify the maximum number of parameters allowed.</td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>7</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>ignoreOverriddenMethods</td>
-              <td>
-                Ignore number of parameters for methods with <code>@Override</code> annotation.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.2</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
@@ -72,18 +29,29 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.java"/>
           <param name="type" value="config"/>
         </macro>
-
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example1.java"/>
+          <param name="type" value="code"/>
+        </macro>
         <p id="Example2-config">
           To configure the check to allow 10 parameters for a method:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.java"/>
           <param name="type" value="config"/>
         </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example2.java"/>
+          <param name="type" value="code"/>
+        </macro>
         <p>
           To configure the check to ignore number of parameters for methods with
           <code>@Override</code> or <code>@java.lang.Override annotation</code>.
@@ -95,17 +63,34 @@
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.java"/>
           <param name="type" value="config"/>
         </macro>
-        <p id="Example3-code">
-          Java code example:
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.java"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
+          To configure the check to ignore methods and constructors annotated with
+          <code>JsonCreator</code> annotation:
         </p>
         <macro name="example">
           <param name="path"
-                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example3.txt"/>
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example4.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/checks/sizes/parameternumber/Example4.java"/>
           <param name="type" value="code"/>
         </macro>
+        <p>
+          Note: Annotation names specified in the <code>ignoreAnnotatedBy</code> property
+          must be an exact match for the annotation name on the method or constructor.
+        </p>
       </subsection>
 
       <subsection name="Example of Usage" id="Example_of_Usage">
diff --git a/src/xdocs/checks/sizes/recordcomponentnumber.xml b/src/xdocs/checks/sizes/recordcomponentnumber.xml
index 2cbf12bf9e9..1defee3ade5 100644
--- a/src/xdocs/checks/sizes/recordcomponentnumber.xml
+++ b/src/xdocs/checks/sizes/recordcomponentnumber.xml
@@ -29,27 +29,17 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>max</td>
-              <td>
-                Specify the maximum number of components allowed in the header
-                of a record definition.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>8</code></td>
+              <td>accessModifiers</td>
+              <td>Access modifiers of record definitions where the number of record components should be checked.</td>
+              <td><a href="../../property_types.html#AccessModifierOption.5B.5D">AccessModifierOption[]</a></td>
+              <td><code>public, protected, package, private</code></td>
               <td>8.36</td>
             </tr>
             <tr>
-              <td>accessModifiers</td>
-              <td>
-                Access modifiers of record definitions where the number of record
-                components should be checked.
-              </td>
-              <td>
-                <a href="../../property_types.html#AccessModifierOption.5B.5D">
-                  AccessModifierOption[]
-                </a>
-              </td>
-              <td><code>public, protected, package, private</code></td>
+              <td>max</td>
+              <td>Specify the maximum number of components allowed in the header of a record definition.</td>
+              <td><a href="../../property_types.html#int">int</a></td>
+              <td><code>8</code></td>
               <td>8.36</td>
             </tr>
           </table>
diff --git a/src/xdocs/checks/sizes/recordcomponentnumber.xml.template b/src/xdocs/checks/sizes/recordcomponentnumber.xml.template
index 4705386e8fa..0417a0208b6 100644
--- a/src/xdocs/checks/sizes/recordcomponentnumber.xml.template
+++ b/src/xdocs/checks/sizes/recordcomponentnumber.xml.template
@@ -20,39 +20,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>max</td>
-              <td>
-                Specify the maximum number of components allowed in the header
-                of a record definition.
-              </td>
-              <td><a href="../../property_types.html#int">int</a></td>
-              <td><code>8</code></td>
-              <td>8.36</td>
-            </tr>
-            <tr>
-              <td>accessModifiers</td>
-              <td>
-                Access modifiers of record definitions where the number of record
-                components should be checked.
-              </td>
-              <td>
-                <a href="../../property_types.html#AccessModifierOption.5B.5D">
-                  AccessModifierOption[]
-                </a>
-              </td>
-              <td><code>public, protected, package, private</code></td>
-              <td>8.36</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/RecordComponentNumberCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/emptyforinitializerpad.xml.template b/src/xdocs/checks/whitespace/emptyforinitializerpad.xml.template
index a4fbdf459c7..83ecb3cc77e 100644
--- a/src/xdocs/checks/whitespace/emptyforinitializerpad.xml.template
+++ b/src/xdocs/checks/whitespace/emptyforinitializerpad.xml.template
@@ -24,22 +24,10 @@ for (
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify policy on how to pad an empty for iterator.</td>
-              <td><a href="../../property_types.html#PadOption">PadOption</a></td>
-              <td><code>nospace</code></td>
-              <td>3.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/emptyforiteratorpad.xml.template b/src/xdocs/checks/whitespace/emptyforiteratorpad.xml.template
index c715007219f..dce67e573bf 100644
--- a/src/xdocs/checks/whitespace/emptyforiteratorpad.xml.template
+++ b/src/xdocs/checks/whitespace/emptyforiteratorpad.xml.template
@@ -24,22 +24,10 @@ for (Iterator foo = very.long.line.iterator();
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify policy on how to pad an empty for iterator.</td>
-              <td><a href="../../property_types.html#PadOption">PadOption</a></td>
-              <td><code>nospace</code></td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/emptylineseparator.xml b/src/xdocs/checks/whitespace/emptylineseparator.xml
index d71ebe68ca9..152edfde762 100644
--- a/src/xdocs/checks/whitespace/emptylineseparator.xml
+++ b/src/xdocs/checks/whitespace/emptylineseparator.xml
@@ -37,13 +37,6 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>allowNoEmptyLineBetweenFields</td>
-              <td>Allow no empty line between fields.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
             <tr>
               <td>allowMultipleEmptyLines</td>
               <td>Allow multiple empty lines between class members.</td>
@@ -58,12 +51,19 @@
               <td><code>true</code></td>
               <td>6.18</td>
             </tr>
+            <tr>
+              <td>allowNoEmptyLineBetweenFields</td>
+              <td>Allow no empty line between fields.</td>
+              <td><a href="../../property_types.html#boolean">boolean</a></td>
+              <td><code>false</code></td>
+              <td>5.8</td>
+            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
+                    PACKAGE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPORT">
                     IMPORT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
@@ -74,7 +74,7 @@
                     INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
                     ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
                     STATIC_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
                     INSTANCE_INIT</a>
@@ -88,7 +88,7 @@
                     RECORD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
                     COMPACT_CTOR_DEF</a>
-                    .
+                  .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
@@ -103,7 +103,7 @@
                     INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
                     ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_INIT">
                     STATIC_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
                     INSTANCE_INIT</a>
diff --git a/src/xdocs/checks/whitespace/emptylineseparator.xml.template b/src/xdocs/checks/whitespace/emptylineseparator.xml.template
index fb03e1ae2ce..86b8ccf6f8e 100644
--- a/src/xdocs/checks/whitespace/emptylineseparator.xml.template
+++ b/src/xdocs/checks/whitespace/emptylineseparator.xml.template
@@ -29,99 +29,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowNoEmptyLineBetweenFields</td>
-              <td>Allow no empty line between fields.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>allowMultipleEmptyLines</td>
-              <td>Allow multiple empty lines between class members.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.3</td>
-            </tr>
-            <tr>
-              <td>allowMultipleEmptyLinesInsideClassMembers</td>
-              <td>Allow multiple empty lines inside class members.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>6.18</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPORT">
-                    IMPORT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                    STATIC_IMPORT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    STATIC_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                    INSTANCE_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                    .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                    PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPORT">
-                    IMPORT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                    STATIC_IMPORT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                    CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                    INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                    ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    STATIC_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">
-                    INSTANCE_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                    METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                    CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#VARIABLE_DEF">
-                    VARIABLE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                    RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                    COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/filetabcharacter.xml b/src/xdocs/checks/whitespace/filetabcharacter.xml
index 491c41cab51..709b05a4811 100644
--- a/src/xdocs/checks/whitespace/filetabcharacter.xml
+++ b/src/xdocs/checks/whitespace/filetabcharacter.xml
@@ -43,16 +43,14 @@
             </tr>
             <tr>
               <td>eachLine</td>
-              <td>
-                Control whether to report on each line containing a tab, or just the first instance.
-              </td>
+              <td>Control whether to report on each line containing a tab, or just the first instance.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>5.0</td>
             </tr>
             <tr>
               <td>fileExtensions</td>
-              <td>Specify file type extension of files to process.</td>
+              <td>Specify the file extensions of the files to process.</td>
               <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
               <td><code>all files</code></td>
               <td>5.0</td>
diff --git a/src/xdocs/checks/whitespace/filetabcharacter.xml.template b/src/xdocs/checks/whitespace/filetabcharacter.xml.template
index aaf31833670..63a5cf49d7d 100644
--- a/src/xdocs/checks/whitespace/filetabcharacter.xml.template
+++ b/src/xdocs/checks/whitespace/filetabcharacter.xml.template
@@ -33,31 +33,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>eachLine</td>
-              <td>
-                Control whether to report on each line containing a tab, or just the first instance.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>Specify file type extension of files to process.</td>
-              <td><a href="../../property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/genericwhitespace.xml b/src/xdocs/checks/whitespace/genericwhitespace.xml
index 98ddf2887bb..b440e9227de 100644
--- a/src/xdocs/checks/whitespace/genericwhitespace.xml
+++ b/src/xdocs/checks/whitespace/genericwhitespace.xml
@@ -30,7 +30,7 @@
         <ul>
           <li> should not be preceded with whitespace in all cases.</li>
           <li> should be followed with whitespace in almost all cases, except diamond operators
-               and when preceding method name or constructor.</li>
+            and when preceding a method name, constructor, or record header.</li>
         </ul>
       </subsection>
 
@@ -65,6 +65,8 @@ List&lt;T&gt; list = ImmutableList.Builder&lt;T&gt;::new;
 sort(list, Comparable::&lt;String&gt;compareTo);
 // Constructor call
 MyClass obj = new &lt;String&gt;MyClass();
+// Record header
+record License&lt;T&gt;() {}
         </source>
         <p id="Example2-code">
           Examples with incorrect spacing:
@@ -77,6 +79,8 @@ public&lt;T&gt; void foo() {} // violation, &quot;&lt;&quot; not preceded with w
 List a = new ArrayList&lt;&gt; (); // violation, &quot;&gt;&quot; followed by whitespace
 Map&lt;Integer, String&gt;m; // violation, &quot;&gt;&quot; not followed by whitespace
 Pair&lt;Integer, Integer &gt; p; // violation, &quot;&gt;&quot; preceded with whitespace
+
+record License&lt;T&gt; () {} // violation, &quot;&gt;&quot; followed by whitespace
         </source>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/genericwhitespace.xml.template b/src/xdocs/checks/whitespace/genericwhitespace.xml.template
index 88c936616c2..7d47674db4b 100644
--- a/src/xdocs/checks/whitespace/genericwhitespace.xml.template
+++ b/src/xdocs/checks/whitespace/genericwhitespace.xml.template
@@ -30,7 +30,7 @@
         <ul>
           <li> should not be preceded with whitespace in all cases.</li>
           <li> should be followed with whitespace in almost all cases, except diamond operators
-               and when preceding method name or constructor.</li>
+            and when preceding a method name, constructor, or record header.</li>
         </ul>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/methodparampad.xml b/src/xdocs/checks/whitespace/methodparampad.xml
index f6f4b298761..61bb54371cb 100644
--- a/src/xdocs/checks/whitespace/methodparampad.xml
+++ b/src/xdocs/checks/whitespace/methodparampad.xml
@@ -34,9 +34,7 @@
             </tr>
             <tr>
               <td>allowLineBreaks</td>
-              <td>
-                Allow a line break between the identifier and left parenthesis.
-              </td>
+              <td>Allow a line break between the identifier and left parenthesis.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>3.4</td>
@@ -44,50 +42,45 @@
             <tr>
               <td>option</td>
               <td>Specify policy on how to pad method parameter.</td>
-              <td>
-                <a href="../../property_types.html#PadOption">PadOption</a>
-              </td>
+              <td><a href="../../property_types.html#PadOption">PadOption</a></td>
               <td><code>nospace</code></td>
               <td>3.4</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
+                    LITERAL_NEW</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
+                    METHOD_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
+                    SUPER_CTOR_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
+                    LITERAL_NEW</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
+                    METHOD_CALL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
+                    METHOD_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
+                    SUPER_CTOR_CALL</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
+                    ENUM_CONSTANT_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>3.4</td>
diff --git a/src/xdocs/checks/whitespace/methodparampad.xml.template b/src/xdocs/checks/whitespace/methodparampad.xml.template
index b5c8300fb33..756c8112dce 100644
--- a/src/xdocs/checks/whitespace/methodparampad.xml.template
+++ b/src/xdocs/checks/whitespace/methodparampad.xml.template
@@ -24,75 +24,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowLineBreaks</td>
-              <td>
-                Allow a line break between the identifier and left parenthesis.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify policy on how to pad method parameter.</td>
-              <td>
-                <a href="../../property_types.html#PadOption">PadOption</a>
-              </td>
-              <td><code>nospace</code></td>
-              <td>3.4</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-              <td>3.4</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/nolinewrap.xml b/src/xdocs/checks/whitespace/nolinewrap.xml
index 1a6fe61dea6..afb0f3eb910 100644
--- a/src/xdocs/checks/whitespace/nolinewrap.xml
+++ b/src/xdocs/checks/whitespace/nolinewrap.xml
@@ -31,35 +31,35 @@
               <td>tokens to check</td>
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPORT">
-                  IMPORT</a>
+                    IMPORT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                  STATIC_IMPORT</a>
+                    STATIC_IMPORT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
+                    PACKAGE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
+                    CLASS_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
+                    ENUM_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
+                    INTERFACE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    RECORD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
+                    COMPACT_CTOR_DEF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                PACKAGE_DEF</a>
+                    PACKAGE_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPORT">
-                IMPORT</a>
+                    IMPORT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                STATIC_IMPORT</a>
-                .
+                    STATIC_IMPORT</a>
+                  .
               </td>
               <td>5.8</td>
             </tr>
diff --git a/src/xdocs/checks/whitespace/nolinewrap.xml.template b/src/xdocs/checks/whitespace/nolinewrap.xml.template
index bf8b29b969b..091e976857f 100644
--- a/src/xdocs/checks/whitespace/nolinewrap.xml.template
+++ b/src/xdocs/checks/whitespace/nolinewrap.xml.template
@@ -18,52 +18,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPORT">
-                  IMPORT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                  STATIC_IMPORT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                  PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CLASS_DEF">
-                  CLASS_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_DEF">
-                  ENUM_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INTERFACE_DEF">
-                  INTERFACE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMPACT_CTOR_DEF">
-                  COMPACT_CTOR_DEF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PACKAGE_DEF">
-                PACKAGE_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#IMPORT">
-                IMPORT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                STATIC_IMPORT</a>
-                .
-              </td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/nowhitespaceafter.xml b/src/xdocs/checks/whitespace/nowhitespaceafter.xml
index e8d72c6a139..5afce3ef624 100644
--- a/src/xdocs/checks/whitespace/nowhitespaceafter.xml
+++ b/src/xdocs/checks/whitespace/nowhitespaceafter.xml
@@ -60,9 +60,7 @@
             </tr>
             <tr>
               <td>allowLineBreaks</td>
-              <td>
-                Control whether whitespace is allowed if the token is at a linebreak.
-              </td>
+              <td>Control whether whitespace is allowed if the token is at a linebreak.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>3.0</td>
@@ -70,63 +68,60 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
+                    ARRAY_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#AT">
-                  AT</a>
+                    AT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                  INC</a>
+                    INC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                  DEC</a>
+                    DEC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                  UNARY_MINUS</a>
+                    UNARY_MINUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                  UNARY_PLUS</a>
+                    UNARY_PLUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                  BNOT</a>
+                    BNOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                  LNOT</a>
+                    LNOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
+                    DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                  TYPECAST</a>
+                    TYPECAST</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_DECLARATOR">
-                  ARRAY_DECLARATOR</a>
+                    ARRAY_DECLARATOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INDEX_OP">
-                  INDEX_OP</a>
+                    INDEX_OP</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
+                    METHOD_REF</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
+                    ARRAY_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#AT">
-                  AT</a>
+                    AT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                  INC</a>
+                    INC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                  DEC</a>
+                    DEC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                  UNARY_MINUS</a>
+                    UNARY_MINUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                  UNARY_PLUS</a>
+                    UNARY_PLUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                  BNOT</a>
+                    BNOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                  LNOT</a>
+                    LNOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
+                    DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_DECLARATOR">
-                  ARRAY_DECLARATOR</a>
+                    ARRAY_DECLARATOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INDEX_OP">
-                  INDEX_OP</a>
+                    INDEX_OP</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/whitespace/nowhitespaceafter.xml.template b/src/xdocs/checks/whitespace/nowhitespaceafter.xml.template
index 6424d7e07d5..a786ac0ca87 100644
--- a/src/xdocs/checks/whitespace/nowhitespaceafter.xml.template
+++ b/src/xdocs/checks/whitespace/nowhitespaceafter.xml.template
@@ -50,88 +50,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowLineBreaks</td>
-              <td>
-                Control whether whitespace is allowed if the token is at a linebreak.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#AT">
-                  AT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                  INC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                  DEC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                  UNARY_MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                  UNARY_PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                  BNOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                  LNOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                  TYPECAST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_DECLARATOR">
-                  ARRAY_DECLARATOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INDEX_OP">
-                  INDEX_OP</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#AT">
-                  AT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INC">
-                  INC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DEC">
-                  DEC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_MINUS">
-                  UNARY_MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#UNARY_PLUS">
-                  UNARY_PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BNOT">
-                  BNOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LNOT">
-                  LNOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_DECLARATOR">
-                  ARRAY_DECLARATOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INDEX_OP">
-                  INDEX_OP</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/nowhitespacebefore.xml b/src/xdocs/checks/whitespace/nowhitespacebefore.xml
index dad033e8ad2..beaf1303b2e 100644
--- a/src/xdocs/checks/whitespace/nowhitespacebefore.xml
+++ b/src/xdocs/checks/whitespace/nowhitespacebefore.xml
@@ -31,9 +31,7 @@
             </tr>
             <tr>
               <td>allowLineBreaks</td>
-              <td>
-                Control whether whitespace is allowed if the token is at a linebreak.
-              </td>
+              <td>Control whether whitespace is allowed if the token is at a linebreak.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>3.0</td>
@@ -41,43 +39,42 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
+                    COMMA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
+                    SEMI</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                  POST_INC</a>
+                    POST_INC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                  POST_DEC</a>
+                    POST_DEC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
+                    DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_START">
-                  GENERIC_START</a>
+                    GENERIC_START</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_END">
-                  GENERIC_END</a>
+                    GENERIC_END</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
+                    ELLIPSIS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LABELED_STAT">
-                  LABELED_STAT</a>
+                    LABELED_STAT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
+                    METHOD_REF</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
+                    COMMA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
+                    SEMI</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                  POST_INC</a>
+                    POST_INC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                  POST_DEC</a>
+                    POST_DEC</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
+                    ELLIPSIS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LABELED_STAT">
-                  LABELED_STAT</a>
+                    LABELED_STAT</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/whitespace/nowhitespacebefore.xml.template b/src/xdocs/checks/whitespace/nowhitespacebefore.xml.template
index 73985a65260..5e58ea74074 100644
--- a/src/xdocs/checks/whitespace/nowhitespacebefore.xml.template
+++ b/src/xdocs/checks/whitespace/nowhitespacebefore.xml.template
@@ -21,68 +21,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowLineBreaks</td>
-              <td>
-                Control whether whitespace is allowed if the token is at a linebreak.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                  POST_INC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                  POST_DEC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_START">
-                  GENERIC_START</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_END">
-                  GENERIC_END</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LABELED_STAT">
-                  LABELED_STAT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_INC">
-                  POST_INC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#POST_DEC">
-                  POST_DEC</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LABELED_STAT">
-                  LABELED_STAT</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml b/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml
index 21d52cce865..d2d64bf554b 100644
--- a/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml
+++ b/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml
@@ -73,12 +73,12 @@ class Example1 {
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
+      <subsection name="Violation Messages" id="Violation_Messages">
         <ul>
           <li>
             <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fwhitespace%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22ws.preceded%22">
-              ws.preceded</a>
+              ws.preceded
+            </a>
           </li>
         </ul>
         <p>
diff --git a/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml.template b/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml.template
index 5d6fc12de36..2ebf0f6029a 100644
--- a/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml.template
+++ b/src/xdocs/checks/whitespace/nowhitespacebeforecasedefaultcolon.xml.template
@@ -44,14 +44,10 @@
         </ul>
       </subsection>
 
-      <subsection name="Violation Messages"
-        id="Violation_Messages">
-        <ul>
-          <li>
-            <a href="https://github.com/search?q=path%3Asrc%2Fmain%2Fresources%2Fcom%2Fpuppycrawl%2Ftools%2Fcheckstyle%2Fchecks%2Fwhitespace%20path%3A**%2Fmessages*.properties+repo%3Acheckstyle%2Fcheckstyle+%22ws.preceded%22">
-              ws.preceded</a>
-          </li>
-        </ul>
+      <subsection name="Violation Messages" id="Violation_Messages">
+        <macro name="violation-messages">
+          <param name="checkName" value="NoWhitespaceBeforeCaseDefaultColon"/>
+        </macro>
         <p>
           All messages can be customized if the default message doesn't suit you.
           Please <a href="../../config.html#Custom_messages">see the documentation</a>
diff --git a/src/xdocs/checks/whitespace/operatorwrap.xml b/src/xdocs/checks/whitespace/operatorwrap.xml
index 4176103cd7c..89c3c33417d 100644
--- a/src/xdocs/checks/whitespace/operatorwrap.xml
+++ b/src/xdocs/checks/whitespace/operatorwrap.xml
@@ -27,140 +27,135 @@
             <tr>
               <td>option</td>
               <td>Specify policy on how to wrap lines.</td>
-              <td>
-                <a href="../../property_types.html#WrapOption">WrapOption</a>
-              </td>
+              <td><a href="../../property_types.html#WrapOption">WrapOption</a></td>
               <td><code>nl</code></td>
               <td>3.0</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
+                    COLON</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
+                    EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
+                    NOT_EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
+                    DIV</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
+                    PLUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
+                    MINUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
+                    STAR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
+                    MOD</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
+                    SR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
+                    BSR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
+                    GE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
+                    GT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
+                    SL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
+                    LE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
+                    LT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
+                    BXOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
+                    BOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
+                    BAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
+                    LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                  LITERAL_INSTANCEOF</a>
+                    LITERAL_INSTANCEOF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
+                    TYPE_EXTENSION_AND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
+                    ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
+                    DIV_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
+                    PLUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
+                    MINUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
+                    STAR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
+                    MOD_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
+                    SR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
+                    BSR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
+                    SL_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
+                    BXOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
+                    BOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
+                    BAND_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
+                    METHOD_REF</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
+                    COLON</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
+                    EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
+                    NOT_EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
+                    DIV</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
+                    PLUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
+                    MINUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
+                    STAR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
+                    MOD</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
+                    SR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
+                    BSR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
+                    GE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
+                    GT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
+                    SL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
+                    LE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
+                    LT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
+                    BXOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
+                    BOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
+                    BAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
+                    LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
+                    TYPE_EXTENSION_AND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                  LITERAL_INSTANCEOF</a>
+                    LITERAL_INSTANCEOF</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/whitespace/operatorwrap.xml.template b/src/xdocs/checks/whitespace/operatorwrap.xml.template
index d8456840bdb..1093991a3f1 100644
--- a/src/xdocs/checks/whitespace/operatorwrap.xml.template
+++ b/src/xdocs/checks/whitespace/operatorwrap.xml.template
@@ -16,156 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify policy on how to wrap lines.</td>
-              <td>
-                <a href="../../property_types.html#WrapOption">WrapOption</a>
-              </td>
-              <td><code>nl</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                  LITERAL_INSTANCEOF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_INSTANCEOF">
-                  LITERAL_INSTANCEOF</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/parenpad.xml b/src/xdocs/checks/whitespace/parenpad.xml
index 64ab83ee637..a379ac3b8b8 100644
--- a/src/xdocs/checks/whitespace/parenpad.xml
+++ b/src/xdocs/checks/whitespace/parenpad.xml
@@ -47,101 +47,98 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION">
-                  ANNOTATION</a>
+                    ANNOTATION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_CALL">
-                  CTOR_CALL</a>
+                    CTOR_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
+                    DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
+                    EXPR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
+                    LITERAL_NEW</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
+                    METHOD_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE_SPECIFICATION">
-                  RESOURCE_SPECIFICATION</a>
+                    RESOURCE_SPECIFICATION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
+                    SUPER_CTOR_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
+                    LAMBDA</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION">
-                  ANNOTATION</a>
+                    ANNOTATION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
+                    ANNOTATION_FIELD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_CALL">
-                  CTOR_CALL</a>
+                    CTOR_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
+                    CTOR_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
+                    DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
+                    ENUM_CONSTANT_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
+                    EXPR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
+                    LITERAL_NEW</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
+                    METHOD_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
+                    METHOD_DEF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE_SPECIFICATION">
-                  RESOURCE_SPECIFICATION</a>
+                    RESOURCE_SPECIFICATION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
+                    SUPER_CTOR_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
+                    LAMBDA</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
+                    RECORD_DEF</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/whitespace/parenpad.xml.template b/src/xdocs/checks/whitespace/parenpad.xml.template
index d83a5451700..ee338622b73 100644
--- a/src/xdocs/checks/whitespace/parenpad.xml.template
+++ b/src/xdocs/checks/whitespace/parenpad.xml.template
@@ -29,124 +29,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify policy on how to pad parentheses.</td>
-              <td><a href="../../property_types.html#PadOption">PadOption</a></td>
-              <td><code>nospace</code></td>
-              <td>3.0</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION">
-                  ANNOTATION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_CALL">
-                  CTOR_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE_SPECIFICATION">
-                  RESOURCE_SPECIFICATION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                  RECORD_DEF</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION">
-                  ANNOTATION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ANNOTATION_FIELD_DEF">
-                  ANNOTATION_FIELD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_CALL">
-                  CTOR_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
-                  CTOR_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ENUM_CONSTANT_DEF">
-                  ENUM_CONSTANT_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EXPR">
-                  EXPR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
-                  LITERAL_NEW</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
-                  METHOD_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_DEF">
-                  METHOD_DEF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RESOURCE_SPECIFICATION">
-                  RESOURCE_SPECIFICATION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">
-                  SUPER_CTOR_CALL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RECORD_DEF">
-                RECORD_DEF</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/separatorwrap.xml b/src/xdocs/checks/whitespace/separatorwrap.xml
index 07b34dea322..4fa8540945d 100644
--- a/src/xdocs/checks/whitespace/separatorwrap.xml
+++ b/src/xdocs/checks/whitespace/separatorwrap.xml
@@ -27,46 +27,41 @@
             <tr>
               <td>option</td>
               <td>Specify policy on how to wrap lines.</td>
-              <td>
-                <a href="../../property_types.html#WrapOption">WrapOption</a>
-              </td>
+              <td><a href="../../property_types.html#WrapOption">WrapOption</a></td>
               <td><code>eol</code></td>
               <td>5.8</td>
             </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
+                    DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
+                    COMMA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
+                    SEMI</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
+                    ELLIPSIS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#AT">
-                  AT</a>
+                    AT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LPAREN">
-                  LPAREN</a>
+                    LPAREN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RPAREN">
-                  RPAREN</a>
+                    RPAREN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_DECLARATOR">
-                  ARRAY_DECLARATOR</a>
+                    ARRAY_DECLARATOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RBRACK">
-                  RBRACK</a>
+                    RBRACK</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
+                    METHOD_REF</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
+                    DOT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
+                    COMMA</a>
                   .
               </td>
               <td>5.8</td>
diff --git a/src/xdocs/checks/whitespace/separatorwrap.xml.template b/src/xdocs/checks/whitespace/separatorwrap.xml.template
index b91cb3064f0..6cd4d9e525d 100644
--- a/src/xdocs/checks/whitespace/separatorwrap.xml.template
+++ b/src/xdocs/checks/whitespace/separatorwrap.xml.template
@@ -16,62 +16,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify policy on how to wrap lines.</td>
-              <td>
-                <a href="../../property_types.html#WrapOption">WrapOption</a>
-              </td>
-              <td><code>eol</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#AT">
-                  AT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LPAREN">
-                  LPAREN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RPAREN">
-                  RPAREN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_DECLARATOR">
-                  ARRAY_DECLARATOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RBRACK">
-                  RBRACK</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_REF">
-                  METHOD_REF</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DOT">
-                  DOT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
-                  .
-              </td>
-              <td>5.8</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/singlespaceseparator.xml.template b/src/xdocs/checks/whitespace/singlespaceseparator.xml.template
index 067a1f02cd3..8a5bbe1f289 100644
--- a/src/xdocs/checks/whitespace/singlespaceseparator.xml.template
+++ b/src/xdocs/checks/whitespace/singlespaceseparator.xml.template
@@ -41,22 +41,10 @@ public long toMicros(long d) { return d / (C1 / C0); }
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>validateComments</td>
-              <td>Control whether to validate whitespaces surrounding comments.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.19</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/typecastparenpad.xml.template b/src/xdocs/checks/whitespace/typecastparenpad.xml.template
index 43686e139ca..ccd9bf52f20 100644
--- a/src/xdocs/checks/whitespace/typecastparenpad.xml.template
+++ b/src/xdocs/checks/whitespace/typecastparenpad.xml.template
@@ -18,22 +18,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>option</td>
-              <td>Specify policy on how to pad parentheses.</td>
-              <td><a href="../../property_types.html#PadOption">PadOption</a></td>
-              <td><code>nospace</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java"/>
+         </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/whitespaceafter.xml b/src/xdocs/checks/whitespace/whitespaceafter.xml
index 371c051406a..8487962adfc 100644
--- a/src/xdocs/checks/whitespace/whitespaceafter.xml
+++ b/src/xdocs/checks/whitespace/whitespaceafter.xml
@@ -30,89 +30,86 @@
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
+                    COMMA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
+                    SEMI</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                  TYPECAST</a>
+                    TYPECAST</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
+                    LITERAL_RETURN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_YIELD">
-                  LITERAL_YIELD</a>
+                    LITERAL_YIELD</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  DO_WHILE</a>
+                    LITERAL_CATCH</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DO_WHILE">
+                    DO_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
+                    ELLIPSIS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
+                    LITERAL_TRY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                   .
               </td>
-
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
+                    COMMA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
+                    SEMI</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                  TYPECAST</a>
+                    TYPECAST</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
+                    LITERAL_RETURN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_YIELD">
-                  LITERAL_YIELD</a>
+                    LITERAL_YIELD</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  DO_WHILE</a>
+                    LITERAL_CATCH</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DO_WHILE">
+                    DO_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
+                    ELLIPSIS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
+                    LITERAL_TRY</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
+                    LITERAL_CASE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/whitespace/whitespaceafter.xml.template b/src/xdocs/checks/whitespace/whitespaceafter.xml.template
index 72f70df7760..84c619d4e4a 100644
--- a/src/xdocs/checks/whitespace/whitespaceafter.xml.template
+++ b/src/xdocs/checks/whitespace/whitespaceafter.xml.template
@@ -19,105 +19,10 @@
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                  TYPECAST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_YIELD">
-                  LITERAL_YIELD</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  DO_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                  .
-              </td>
-
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COMMA">
-                  COMMA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SEMI">
-                  SEMI</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPECAST">
-                  TYPECAST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_YIELD">
-                  LITERAL_YIELD</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  DO_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                  , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
-                  LITERAL_CASE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/checks/whitespace/whitespacearound.xml b/src/xdocs/checks/whitespace/whitespacearound.xml
index b949aa5cf40..3bd79a1a461 100644
--- a/src/xdocs/checks/whitespace/whitespacearound.xml
+++ b/src/xdocs/checks/whitespace/whitespacearound.xml
@@ -57,6 +57,10 @@ try {
           catch block (left curly bracket) is not separated from the end of the catch
           block (right curly bracket).
         </p>
+        <p>
+          Note: <a href="https://openjdk.org/jeps/361">
+          Switch expressions</a> are ignored by this check.
+        </p>
       </subsection>
 
       <subsection name="Properties" id="Properties">
@@ -70,25 +74,25 @@ try {
               <th>since</th>
             </tr>
             <tr>
-              <td>allowEmptyConstructors</td>
-              <td>Allow empty constructor bodies.</td>
+              <td>allowEmptyCatches</td>
+              <td>Allow empty catch bodies.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
-              <td>4.0</td>
+              <td>7.6</td>
             </tr>
             <tr>
-              <td>allowEmptyMethods</td>
-              <td>Allow empty method bodies.</td>
+              <td>allowEmptyConstructors</td>
+              <td>Allow empty constructor bodies.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>4.0</td>
             </tr>
             <tr>
-              <td>allowEmptyTypes</td>
-              <td>Allow empty class, interface and enum bodies.</td>
+              <td>allowEmptyLambdas</td>
+              <td>Allow empty lambda bodies.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
-              <td>5.8</td>
+              <td>6.14</td>
             </tr>
             <tr>
               <td>allowEmptyLoops</td>
@@ -98,25 +102,23 @@ try {
               <td>5.8</td>
             </tr>
             <tr>
-              <td>allowEmptyLambdas</td>
-              <td>Allow empty lambda bodies.</td>
+              <td>allowEmptyMethods</td>
+              <td>Allow empty method bodies.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
-              <td>6.14</td>
+              <td>4.0</td>
             </tr>
             <tr>
-              <td>allowEmptyCatches</td>
-              <td>Allow empty catch bodies.</td>
+              <td>allowEmptyTypes</td>
+              <td>Allow empty class, interface and enum bodies.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
-              <td>7.6</td>
+              <td>5.8</td>
             </tr>
             <tr>
               <td>ignoreEnhancedForColon</td>
-              <td>Ignore whitespace around colon in
-                <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
-                enhanced for</a> loop.
-              </td>
+              <td>Ignore whitespace around colon in <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
+ enhanced for</a> loop.</td>
               <td><a href="../../property_types.html#boolean">boolean</a></td>
               <td><code>true</code></td>
               <td>5.5</td>
@@ -124,226 +126,224 @@ try {
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
-
-              <td>
-                subset of tokens
+              <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
+                    ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
+                    ARRAY_INIT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
+                    BAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
+                    BAND_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
+                    BOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
+                    BOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
+                    BSR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
+                    BSR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
+                    BXOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
+                    BXOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
+                    COLON</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
+                    DIV</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
+                    DIV_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DO_WHILE">
-                  DO_WHILE</a>
+                    DO_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
+                    EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
+                    GE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
+                    GT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
+                    LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LCURLY">
-                  LCURLY</a>
+                    LCURLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
+                    LE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
+                    LITERAL_RETURN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
+                    LITERAL_TRY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
+                    LT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
+                    MINUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
+                    MINUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
+                    MOD</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
+                    MOD_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
+                    NOT_EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
+                    PLUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
+                    PLUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RCURLY">
-                  RCURLY</a>
+                    RCURLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
+                    SL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SLIST">
-                  SLIST</a>
+                    SLIST</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
+                    SL_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
+                    SR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
+                    SR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
+                    STAR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
+                    STAR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ASSERT">
-                  LITERAL_ASSERT</a>
+                    LITERAL_ASSERT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
+                    TYPE_EXTENSION_AND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#WILDCARD_TYPE">
-                  WILDCARD_TYPE</a>
+                    WILDCARD_TYPE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_START">
-                  GENERIC_START</a>
+                    GENERIC_START</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_END">
-                  GENERIC_END</a>
+                    GENERIC_END</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
+                    ELLIPSIS</a>
                   .
               </td>
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
+                    ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
+                    BAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
+                    BAND_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
+                    BOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
+                    BOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
+                    BSR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
+                    BSR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
+                    BXOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
+                    BXOR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
+                    COLON</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
+                    DIV</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
+                    DIV_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DO_WHILE">
-                  DO_WHILE</a>
+                    DO_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
+                    EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
+                    GE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
+                    GT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
+                    LAMBDA</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
+                    LAND</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LCURLY">
-                  LCURLY</a>
+                    LCURLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
+                    LE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
+                    LITERAL_CATCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
+                    LITERAL_DO</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
+                    LITERAL_ELSE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
+                    LITERAL_FINALLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
+                    LITERAL_FOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
+                    LITERAL_IF</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
+                    LITERAL_RETURN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
+                    LITERAL_SWITCH</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
+                    LITERAL_SYNCHRONIZED</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
+                    LITERAL_TRY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
+                    LITERAL_WHILE</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
+                    LOR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
+                    LT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
+                    MINUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
+                    MINUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
+                    MOD</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
+                    MOD_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
+                    NOT_EQUAL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
+                    PLUS</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
+                    PLUS_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
+                    QUESTION</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RCURLY">
-                  RCURLY</a>
+                    RCURLY</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
+                    SL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SLIST">
-                  SLIST</a>
+                    SLIST</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
+                    SL_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
+                    SR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
+                    SR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
+                    STAR</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
+                    STAR_ASSIGN</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ASSERT">
-                  LITERAL_ASSERT</a>
+                    LITERAL_ASSERT</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
+                    TYPE_EXTENSION_AND</a>
                   .
               </td>
               <td>3.0</td>
diff --git a/src/xdocs/checks/whitespace/whitespacearound.xml.template b/src/xdocs/checks/whitespace/whitespacearound.xml.template
index 8be453a3151..3d8aebcc313 100644
--- a/src/xdocs/checks/whitespace/whitespacearound.xml.template
+++ b/src/xdocs/checks/whitespace/whitespacearound.xml.template
@@ -57,298 +57,18 @@ try {
           catch block (left curly bracket) is not separated from the end of the catch
           block (right curly bracket).
         </p>
+        <p>
+          Note: <a href="https://openjdk.org/jeps/361">
+          Switch expressions</a> are ignored by this check.
+        </p>
       </subsection>
 
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>allowEmptyConstructors</td>
-              <td>Allow empty constructor bodies.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>allowEmptyMethods</td>
-              <td>Allow empty method bodies.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>4.0</td>
-            </tr>
-            <tr>
-              <td>allowEmptyTypes</td>
-              <td>Allow empty class, interface and enum bodies.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>allowEmptyLoops</td>
-              <td>Allow empty loop bodies.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>5.8</td>
-            </tr>
-            <tr>
-              <td>allowEmptyLambdas</td>
-              <td>Allow empty lambda bodies.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.14</td>
-            </tr>
-            <tr>
-              <td>allowEmptyCatches</td>
-              <td>Allow empty catch bodies.</td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>7.6</td>
-            </tr>
-            <tr>
-              <td>ignoreEnhancedForColon</td>
-              <td>Ignore whitespace around colon in
-                <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-14.14.2">
-                enhanced for</a> loop.
-              </td>
-              <td><a href="../../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.5</td>
-            </tr>
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ARRAY_INIT">
-                  ARRAY_INIT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DO_WHILE">
-                  DO_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LCURLY">
-                  LCURLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RCURLY">
-                  RCURLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SLIST">
-                  SLIST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ASSERT">
-                  LITERAL_ASSERT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#WILDCARD_TYPE">
-                  WILDCARD_TYPE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_START">
-                  GENERIC_START</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GENERIC_END">
-                  GENERIC_END</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ELLIPSIS">
-                  ELLIPSIS</a>
-                  .
-              </td>
-              <td>
-                <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#ASSIGN">
-                  ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND">
-                  BAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BAND_ASSIGN">
-                  BAND_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR">
-                  BOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BOR_ASSIGN">
-                  BOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR">
-                  BSR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BSR_ASSIGN">
-                  BSR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR">
-                  BXOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#BXOR_ASSIGN">
-                  BXOR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#COLON">
-                  COLON</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV">
-                  DIV</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DIV_ASSIGN">
-                  DIV_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#DO_WHILE">
-                  DO_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#EQUAL">
-                  EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GE">
-                  GE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#GT">
-                  GT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
-                  LAMBDA</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAND">
-                  LAND</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LCURLY">
-                  LCURLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LE">
-                  LE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CATCH">
-                  LITERAL_CATCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_DO">
-                  LITERAL_DO</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">
-                  LITERAL_ELSE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FINALLY">
-                  LITERAL_FINALLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_FOR">
-                  LITERAL_FOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_IF">
-                  LITERAL_IF</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_RETURN">
-                  LITERAL_RETURN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SWITCH">
-                  LITERAL_SWITCH</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
-                  LITERAL_SYNCHRONIZED</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
-                  LITERAL_TRY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_WHILE">
-                  LITERAL_WHILE</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LOR">
-                  LOR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LT">
-                  LT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS">
-                  MINUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MINUS_ASSIGN">
-                  MINUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD">
-                  MOD</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#MOD_ASSIGN">
-                  MOD_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#NOT_EQUAL">
-                  NOT_EQUAL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS">
-                  PLUS</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#PLUS_ASSIGN">
-                  PLUS_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#QUESTION">
-                  QUESTION</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#RCURLY">
-                  RCURLY</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL">
-                  SL</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SLIST">
-                  SLIST</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SL_ASSIGN">
-                  SL_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR">
-                  SR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SR_ASSIGN">
-                  SR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR">
-                  STAR</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STAR_ASSIGN">
-                  STAR_ASSIGN</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ASSERT">
-                  LITERAL_ASSERT</a>
-                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#TYPE_EXTENSION_AND">
-                  TYPE_EXTENSION_AND</a>
-                  .
-              </td>
-              <td>3.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java"/>
+          </macro>
         </div>
       </subsection>
 
diff --git a/src/xdocs/cmdline.xml.vm b/src/xdocs/cmdline.xml.vm
index 4545fee259c..51840243b39 100644
--- a/src/xdocs/cmdline.xml.vm
+++ b/src/xdocs/cmdline.xml.vm
@@ -20,7 +20,7 @@
       <p>
         This document describes how to run Checkstyle using the command line
         tool. The latest version of Checkstyle can be downloaded as described at
-        <a href="https://checkstyle.org/#Download">Download section</a>.
+        <a href="./index.html#Download">Download section</a>.
         This command line tool is included in the Checkstyle distribution.
       </p>
     </section>
@@ -79,7 +79,7 @@ java -D&lt;property&gt;=&lt;value&gt;  \
           Argument is the line and column number (separated by a <code>:</code> ) in the file
           that the suppression should be generated for. The option cannot be used
           with other options and requires exactly one file to run on to be specified.
-          ATTENTION: generated result will have few queries, joined by pipe(<code>|</code>).
+          Note that the generated result will have few queries, joined by pipe(<code>|</code>).
           Together they will match all AST nodes on specified line
           and column. You need to choose only one and recheck that it works. Usage of all of them is
           also ok, but might result in undesirable matching and suppress other issues.
@@ -96,26 +96,25 @@ java -D&lt;property&gt;=&lt;value&gt;  \
           <code>-s</code> option. Default value is 8.
         </li>
         <li>
-          <code>-t, --tree</code> - Prints Abstract Syntax Tree(AST) of the checked file. The option
-          cannot be used other options and requires exactly one file to run on to be specified.
+          <code>-t, --tree</code> - This option is used to display the Abstract Syntax Tree (AST)
+          <b>without any comments</b> of the specified file. It can only be used on a single file
+          and cannot be combined with other options.
         </li>
         <li>
-          <code>-T, --treeWithComments</code> - Prints Abstract Syntax Tree(AST) with comment nodes
-          of the checked file. The option cannot be used with other options and requires exactly
-          one file to run on to be specified.
+          <code>-T, --treeWithComments</code> - This option is used to display the Abstract Syntax
+          Tree (AST) <b>with comment nodes excluding Javadoc</b> of the specified file. It can only
+          be used on a single file and cannot be combined with other options.
         </li>
         <li>
-          <code>-J, --treeWithJavadoc</code> - Prints Abstract Syntax Tree(AST) with Javadoc nodes
-          and comment nodes of the checked file. Attention that line number and columns will not be
-          the same as it is a file due to the fact that each javadoc comment is parsed separately
-          from java file. The option cannot be used with other options and requires exactly one
-          file to run on to be specified.
+          <code>-J, --treeWithJavadoc</code> - This option is used to display the Abstract Syntax
+          Tree (AST) <b>with Javadoc nodes</b> of the specified file. It can only be used on a
+          single file and cannot be combined with other options.
         </li>
         <li>
-          <code>-j, --javadocTree</code> - Prints Parse Tree of the Javadoc comment.
-          The file have to contain <b>only Javadoc comment content</b> without including '/**' and
-          '*/' at the beginning and at the end respectively. The option
-          cannot be used other options and requires exactly one file to run on to be specified.
+          <code>-j, --javadocTree</code> - This option is used to print the Parse Tree of the
+          Javadoc comment. The file has to contain <b>only Javadoc comment content</b>
+          excluding '/**' and '*/' at the beginning and at the end respectively. It can only be
+          used on a single file and cannot be combined with other options.
         </li>
         <li>
           <code>-d, --debug</code> - Prints all debug logging of CheckStyle utility.
diff --git a/src/xdocs/config.xml b/src/xdocs/config.xml
index c77985187eb..1aeb721ca16 100644
--- a/src/xdocs/config.xml
+++ b/src/xdocs/config.xml
@@ -244,6 +244,11 @@
 &lt;/module&gt;
       </source>
 
+      <p>
+        ATTENTION: default value is applied to module property value if at least one expansion
+        property is not defined.
+      </p>
+
       <p>
         This feature is a great help when setting up a centralized
         configuration file (e.g. one file for the whole company) to
@@ -305,22 +310,44 @@
             </tr>
             <tr>
               <td>basedir</td>
-              <td>base directory name; stripped off in messages about files</td>
+              <td>Base directory name; stripped off in messages about files</td>
               <td><a href="property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>3.0</td>
             </tr>
             <tr>
               <td>cacheFile</td>
-              <td>caches information about files that have checked OK; used
+              <td>Caches information about files that have checked OK; used
                   to avoid repeated checks of the same files</td>
               <td><a href="property_types.html#File">File</a></td>
               <td><code>null</code> (no cache file)</td>
               <td>6.16</td>
             </tr>
+            <tr>
+              <td>charset</td>
+              <td>Name of the file charset</td>
+              <td><a href="property_types.html#String">String</a></td>
+              <td><code>UTF-8</code></td>
+              <td>5.0</td>
+            </tr>
+            <tr>
+              <td>fileExtensions</td>
+              <td>File extensions that are accepted</td>
+              <td><a href="property_types.html#String.5B.5D">String[]</a></td>
+              <td><code>all files</code></td>
+              <td>6.3</td>
+            </tr>
+            <tr>
+              <td>haltOnException</td>
+              <td>Whether to stop execution of Checkstyle if a single file produces any kind of
+                exception during verification</td>
+              <td><a href="property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>7.4</td>
+            </tr>
             <tr>
               <td>localeCountry</td>
-              <td>locale country for messages</td>
+              <td>Locale country for messages</td>
               <td><a href="property_types.html#String">String</a> (either
               the empty string or an uppercase ISO 3166 2-letter code)</td>
               <td>default locale country for the Java Virtual Machine</td>
@@ -328,45 +355,23 @@
             </tr>
             <tr>
               <td>localeLanguage</td>
-              <td>locale language for messages</td>
+              <td>Locale language for messages</td>
               <td><a href="property_types.html#String">String</a> (either
               the empty string or a lowercase ISO 639 code)</td>
               <td>default locale language for the Java Virtual Machine</td>
               <td>3.0</td>
             </tr>
-            <tr>
-              <td>charset</td>
-              <td>name of the file charset</td>
-              <td><a href="property_types.html#String">String</a></td>
-              <td><code>UTF-8</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>fileExtensions</td>
-              <td>file extensions that are accepted</td>
-              <td><a href="property_types.html#String.5B.5D">String[]</a></td>
-              <td><code>all files</code></td>
-              <td>6.3</td>
-            </tr>
             <tr>
               <td>severity</td>
-              <td>the default severity level of all violations</td>
+              <td>The default severity level of all violations</td>
               <td><a href="property_types.html#SeverityLevel">SeverityLevel</a></td>
               <td><code>error</code></td>
               <td>3.1</td>
             </tr>
-            <tr>
-              <td>haltOnException</td>
-              <td>whether to stop execution of Checkstyle if a single file produces any kind of
-              exception during verification</td>
-              <td><a href="property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>7.4</td>
-            </tr>
             <tr>
               <td>tabWidth</td>
-              <td>number of expanded spaces for a tab character (<code>'\t'</code>); used in
-              messages and Checks that print violations on files with tabs</td>
+              <td>Number of expanded spaces for a tab character (<code>'\t'</code>); used in
+                messages and Checks that print violations on files with tabs</td>
               <td><a href="property_types.html#int">int</a></td>
               <td><code>8</code></td>
               <td>8.19</td>
@@ -526,7 +531,7 @@
             </tr>
             <tr>
               <td>fileExtensions</td>
-              <td>file type extension to identify Java files. Setting this
+              <td>File type extension to identify Java files. Setting this
               property is typically only required if your Java source code
               is preprocessed before compilation and the original files do
               not have the extension <code>.java</code></td>
diff --git a/src/xdocs/contributing.xml b/src/xdocs/contributing.xml
index d4666042b71..8e9c4c8edc7 100644
--- a/src/xdocs/contributing.xml
+++ b/src/xdocs/contributing.xml
@@ -189,20 +189,5 @@
       </p>
     </section>
 
-    <section name="Bounty">
-
-      <p>
-        Some (mostly important) issues are marked with the label
-        <a href="https://github.com/checkstyle/checkstyle/labels/has%20bounty">has bounty</a>.
-        By solving such problem, you will not only help the community,
-        but also get free beer (in monetary terms to your PayPal account).
-      </p>
-
-      <p>
-        All you need to do is link your <a href="https://github.com/">github</a>
-        account and <a href="https://paypal.com/">paypal</a> account through
-        the <a href="https://www.bountysource.com/">bountysource</a> website.
-      </p>
-    </section>
   </body>
 </document>
diff --git a/src/xdocs/filefilters/beforeexecutionexclusionfilefilter.xml.template b/src/xdocs/filefilters/beforeexecutionexclusionfilefilter.xml.template
index 87951cb942e..d174e8e0dc6 100644
--- a/src/xdocs/filefilters/beforeexecutionexclusionfilefilter.xml.template
+++ b/src/xdocs/filefilters/beforeexecutionexclusionfilefilter.xml.template
@@ -31,22 +31,10 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>fileNamePattern</td>
-              <td>Define regular expression to match the file name against.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>7.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filefilters/BeforeExecutionExclusionFileFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
diff --git a/src/xdocs/filters/severitymatchfilter.xml b/src/xdocs/filters/severitymatchfilter.xml
index 013aa6252e6..16773d85496 100644
--- a/src/xdocs/filters/severitymatchfilter.xml
+++ b/src/xdocs/filters/severitymatchfilter.xml
@@ -30,6 +30,13 @@
               <th>default value</th>
               <th>since</th>
             </tr>
+            <tr>
+              <td>acceptOnMatch</td>
+              <td>Control whether the filter accepts an audit event if and only if there is a match between the event's severity level and property severity. If acceptOnMatch is <code>false</code>, then the filter accepts an audit event if and only if there is not a match between the event's severity level and property severity.</td>
+              <td><a href="../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>3.2</td>
+            </tr>
             <tr>
               <td>severity</td>
               <td>Specify the severity level of this filter.</td>
@@ -37,33 +44,21 @@
               <td><code>error</code></td>
               <td>3.2</td>
             </tr>
-            <tr>
-              <td>acceptOnMatch</td>
-              <td>
-                 Control whether the filter accepts an audit event if and only if there is
-                 a match between the event's severity level and property
-                 severity. If acceptOnMatch
-                 is <code>false</code>, then the filter
-                 accepts an audit event if and only if there is not a match
-                 between the event's severity level and property severity.
-              </td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.2</td>
-            </tr>
           </table>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           For example, the following configuration fragment directs the
           Checker to not report audit events with severity
           level <code>info</code>:
         </p>
         <source>
-&lt;module name=&quot;SeverityMatchFilter&quot;&gt;
-  &lt;property name=&quot;severity&quot; value=&quot;info&quot;/&gt;
-  &lt;property name=&quot;acceptOnMatch&quot; value=&quot;false&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SeverityMatchFilter&quot;&gt;
+    &lt;property name=&quot;severity&quot; value=&quot;info&quot;/&gt;
+    &lt;property name=&quot;acceptOnMatch&quot; value=&quot;false&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
       </subsection>
diff --git a/src/xdocs/filters/severitymatchfilter.xml.template b/src/xdocs/filters/severitymatchfilter.xml.template
index 9036fea0376..fafaeb74d27 100644
--- a/src/xdocs/filters/severitymatchfilter.xml.template
+++ b/src/xdocs/filters/severitymatchfilter.xml.template
@@ -22,50 +22,23 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>severity</td>
-              <td>Specify the severity level of this filter.</td>
-              <td><a href="../property_types.html#SeverityLevel">SeverityLevel</a></td>
-              <td><code>error</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>acceptOnMatch</td>
-              <td>
-                 Control whether the filter accepts an audit event if and only if there is
-                 a match between the event's severity level and property
-                 severity. If acceptOnMatch
-                 is <code>false</code>, then the filter
-                 accepts an audit event if and only if there is not a match
-                 between the event's severity level and property severity.
-              </td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.2</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           For example, the following configuration fragment directs the
           Checker to not report audit events with severity
           level <code>info</code>:
         </p>
-        <source>
-&lt;module name="SeverityMatchFilter"&gt;
-  &lt;property name="severity" value="info"/&gt;
-  &lt;property name="acceptOnMatch" value="false"/&gt;
-&lt;/module&gt;
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/severitymatchfilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppressioncommentfilter.xml b/src/xdocs/filters/suppressioncommentfilter.xml
index 635b21ed01c..b73469ded1d 100644
--- a/src/xdocs/filters/suppressioncommentfilter.xml
+++ b/src/xdocs/filters/suppressioncommentfilter.xml
@@ -56,17 +56,17 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>offCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to begin suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;CHECKSTYLE:OFF&quot;</code></td>
+              <td>checkC</td>
+              <td>Control whether to check C style comments (<code>&#47;* ... *&#47;</code>).</td>
+              <td><a href="../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
               <td>3.5</td>
             </tr>
             <tr>
-              <td>onCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to end suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;CHECKSTYLE:ON&quot;</code></td>
+              <td>checkCPP</td>
+              <td>Control whether to check C++ style comments (<code>//</code>).</td>
+              <td><a href="../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
               <td>3.5</td>
             </tr>
             <tr>
@@ -77,49 +77,54 @@
               <td>3.5</td>
             </tr>
             <tr>
-              <td>messageFormat</td>
-              <td>Specify message pattern to suppress.</td>
+              <td>idFormat</td>
+              <td>Specify check ID pattern to suppress.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
-              <td>3.5</td>
+              <td>8.24</td>
             </tr>
             <tr>
-              <td>idFormat</td>
-              <td>Specify check ID pattern to suppress.</td>
+              <td>messageFormat</td>
+              <td>Specify message pattern to suppress.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
-              <td>8.24</td>
+              <td>3.5</td>
             </tr>
             <tr>
-              <td>checkCPP</td>
-              <td>Control whether to check C++ style comments (<code>//</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
+              <td>offCommentFormat</td>
+              <td>Specify comment pattern to trigger filter to begin suppression.</td>
+              <td><a href="../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;CHECKSTYLE:OFF&quot;</code></td>
               <td>3.5</td>
             </tr>
             <tr>
-              <td>checkC</td>
-              <td>Control whether to check C style comments (<code>/* ... */</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
+              <td>onCommentFormat</td>
+              <td>Specify comment pattern to trigger filter to end suppression.</td>
+              <td><a href="../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;CHECKSTYLE:ON&quot;</code></td>
               <td>3.5</td>
             </tr>
           </table>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure a filter to suppress audit events (MemberNameCheck,
           ConstantNameCheck and IllegalCatchCheck have been taken here for reference)
           between a comment containing <code>CHECKSTYLE:OFF</code> and a comment containing
           <code>CHECKSTYLE:ON</code>:
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;/&gt;
-&lt;module name=&quot;MemberName&quot;/&gt;
-&lt;module name=&quot;ConstantName&quot;/&gt;
-&lt;module name=&quot;IllegalCatch&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;/&gt;
+    &lt;module name=&quot;MemberName&quot;/&gt;
+    &lt;module name=&quot;ConstantName&quot;/&gt;
+    &lt;module name=&quot;IllegalCatch&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
+        <p id="Example1-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
@@ -151,21 +156,26 @@ class InputSuppressionCommentFilter
   }
 }
         </source>
-        <p>
+        <p id="Example2-config">
           To configure a filter so that <code>// stop constant
           check</code> and <code>// resume constant check</code> marks
           legitimate constant names:
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
-  &lt;property name=&quot;offCommentFormat&quot; value=&quot;stop constant check&quot;/&gt;
-  &lt;property name=&quot;onCommentFormat&quot; value=&quot;resume constant check&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;ConstantNameCheck&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
+      &lt;property name=&quot;offCommentFormat&quot; value=&quot;stop constant check&quot;/&gt;
+      &lt;property name=&quot;onCommentFormat&quot; value=&quot;resume constant check&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;ConstantNameCheck&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;MemberName&quot;/&gt;
+    &lt;module name=&quot;ConstantName&quot;/&gt;
+    &lt;module name=&quot;IllegalCatch&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-&lt;module name=&quot;MemberName&quot;/&gt;
-&lt;module name=&quot;ConstantName&quot;/&gt;
-&lt;module name=&quot;IllegalCatch&quot;/&gt;
         </source>
+        <p id="Example2-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
@@ -197,23 +207,28 @@ class InputSuppressionCommentFilter
   }
 }
         </source>
-        <p>
+        <p id="Example3-config">
           To configure a filter so that <code>UNUSED OFF:<i>var</i></code>
           and <code>UNUSED ON: <i>var</i></code> marks a
           variable or parameter known not to be used by the code by
           matching the variable name in the message through a specified message in messageFormat:
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
-  &lt;property name=&quot;offCommentFormat&quot; value=&quot;ILLEGAL OFF\: (\w+)&quot;/&gt;
-  &lt;property name=&quot;onCommentFormat&quot; value=&quot;ILLEGAL ON\: (\w+)&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;IllegalCatch&quot;/&gt;
-  &lt;property name=&quot;messageFormat&quot; value=&quot;^Catching '$1' is not allowed.$&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
+      &lt;property name=&quot;offCommentFormat&quot; value=&quot;ILLEGAL OFF\: (\w+)&quot;/&gt;
+      &lt;property name=&quot;onCommentFormat&quot; value=&quot;ILLEGAL ON\: (\w+)&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;IllegalCatch&quot;/&gt;
+      &lt;property name=&quot;messageFormat&quot; value=&quot;^Catching '$1' is not allowed.$&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;MemberName&quot;/&gt;
+    &lt;module name=&quot;ConstantName&quot;/&gt;
+    &lt;module name=&quot;IllegalCatch&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-&lt;module name=&quot;MemberName&quot;/&gt;
-&lt;module name=&quot;ConstantName&quot;/&gt;
-&lt;module name=&quot;IllegalCatch&quot;/&gt;
         </source>
+        <p id="Example3-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
@@ -246,21 +261,26 @@ class InputSuppressionCommentFilter
   }
 }
         </source>
-        <p>
+        <p id="Example4-config">
           To configure a filter so that name of suppressed check mentioned
           in comment <code>CSOFF: <i>regexp</i></code>
           and <code>CSON: <i>regexp</i></code> mark a matching check:
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
-  &lt;property name=&quot;offCommentFormat&quot; value=&quot;CSOFF\: ([\w\|]+)&quot;/&gt;
-  &lt;property name=&quot;onCommentFormat&quot; value=&quot;CSON\: ([\w\|]+)&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
+      &lt;property name=&quot;offCommentFormat&quot; value=&quot;CSOFF\: ([\w\|]+)&quot;/&gt;
+      &lt;property name=&quot;onCommentFormat&quot; value=&quot;CSON\: ([\w\|]+)&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;MemberName&quot;/&gt;
+    &lt;module name=&quot;ConstantName&quot;/&gt;
+    &lt;module name=&quot;IllegalCatch&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-&lt;module name=&quot;MemberName&quot;/&gt;
-&lt;module name=&quot;ConstantName&quot;/&gt;
-&lt;module name=&quot;IllegalCatch&quot;/&gt;
         </source>
+        <p id="Example4-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
@@ -292,21 +312,26 @@ class InputSuppressionCommentFilter
   }
 }
         </source>
-        <p>
+        <p id="Example5-config">
           To configure a filter to suppress all audit events between a comment
           containing <code>CHECKSTYLE_OFF: ALMOST_ALL</code> and a comment containing
           <code>CHECKSTYLE_OFF: ALMOST_ALL</code> except for the <em>ConstantName</em> check:
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
-  &lt;property name=&quot;offCommentFormat&quot; value=&quot;CHECKSTYLE_OFF: ALMOST_ALL&quot;/&gt;
-  &lt;property name=&quot;onCommentFormat&quot; value=&quot;CHECKSTYLE_ON: ALMOST_ALL&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;^((?!(ConstantName)).)*$&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
+      &lt;property name=&quot;offCommentFormat&quot; value=&quot;CHECKSTYLE_OFF: ALMOST_ALL&quot;/&gt;
+      &lt;property name=&quot;onCommentFormat&quot; value=&quot;CHECKSTYLE_ON: ALMOST_ALL&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;^((?!(ConstantName)).)*$&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;MemberName&quot;/&gt;
+    &lt;module name=&quot;ConstantName&quot;/&gt;
+    &lt;module name=&quot;IllegalCatch&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-&lt;module name=&quot;MemberName&quot;/&gt;
-&lt;module name=&quot;ConstantName&quot;/&gt;
-&lt;module name=&quot;IllegalCatch&quot;/&gt;
         </source>
+        <p id="Example5-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
@@ -339,7 +364,7 @@ class InputSuppressionCommentFilter
   }
 }
         </source>
-        <p>
+        <p id="Example6-config">
           It is possible to specify an ID of checks, so that it can be leveraged by the
           SuppressionCommentFilter to skip validations. The following examples show how to skip
           validations near code that is surrounded with <code>// CSOFF &lt;ID&gt;</code>
@@ -349,21 +374,26 @@ class InputSuppressionCommentFilter
           case is written below:
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
-  &lt;property name=&quot;offCommentFormat&quot; value=&quot;CSOFF (\w+)&quot;/&gt;
-  &lt;property name=&quot;onCommentFormat&quot; value=&quot;CSON (\w+)&quot;/&gt;
-  &lt;property name=&quot;idFormat&quot; value=&quot;$1&quot;/&gt;
-&lt;/module&gt;
-&lt;module name=&quot;MemberName&quot;&gt;
-&lt;property name=&quot;id&quot; value=&quot;MemberID&quot;/&gt;
-&lt;/module&gt;
-&lt;module name=&quot;ConstantName&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;ConstantID&quot;/&gt;
-&lt;/module&gt;
-&lt;module name=&quot;IllegalCatch&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;IllegalID&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
+      &lt;property name=&quot;offCommentFormat&quot; value=&quot;CSOFF (\w+)&quot;/&gt;
+      &lt;property name=&quot;onCommentFormat&quot; value=&quot;CSON (\w+)&quot;/&gt;
+      &lt;property name=&quot;idFormat&quot; value=&quot;$1&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;MemberName&quot;&gt;
+    &lt;property name=&quot;id&quot; value=&quot;MemberID&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;ConstantName&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;ConstantID&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;IllegalCatch&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;IllegalID&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example6-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
@@ -395,19 +425,24 @@ class InputSuppressionCommentFilter
   }
 }
         </source>
-        <p>
+        <p id="Example7-config">
           Example of how to configure the check to suppress checks by name defined in comment.
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
-  &lt;property name=&quot;offCommentFormat&quot; value=&quot;csoff (\w+)&quot;/&gt;
-  &lt;property name=&quot;onCommentFormat&quot; value=&quot;cson (\w+)&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
+      &lt;property name=&quot;offCommentFormat&quot; value=&quot;csoff (\w+)&quot;/&gt;
+      &lt;property name=&quot;onCommentFormat&quot; value=&quot;cson (\w+)&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;MemberName&quot;/&gt;
+    &lt;module name=&quot;ConstantName&quot;/&gt;
+    &lt;module name=&quot;IllegalCatch&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-&lt;module name=&quot;MemberName&quot;/&gt;
-&lt;module name=&quot;ConstantName&quot;/&gt;
-&lt;module name=&quot;IllegalCatch&quot;/&gt;
         </source>
+        <p id="Example7-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
@@ -440,18 +475,23 @@ class InputSuppressionCommentFilter
 
 }
         </source>
-        <p>
+        <p id="Example8-config">
           Example depicting use of checkC and checkCPP style comments
         </p>
         <source>
-&lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
-  &lt;property name=&quot;checkC&quot; value=&quot;true&quot;/&gt;
-  &lt;property name=&quot;checkCPP&quot; value=&quot;false&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionCommentFilter&quot;&gt;
+      &lt;property name=&quot;checkC&quot; value=&quot;true&quot;/&gt;
+      &lt;property name=&quot;checkCPP&quot; value=&quot;false&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;MemberName&quot;/&gt;
+    &lt;module name=&quot;ConstantName&quot;/&gt;
+    &lt;module name=&quot;IllegalCatch&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-&lt;module name=&quot;MemberName&quot;/&gt;
-&lt;module name=&quot;ConstantName&quot;/&gt;
-&lt;module name=&quot;IllegalCatch&quot;/&gt;
         </source>
+        <p id="Example8-code">Example:</p>
         <source>
 class InputSuppressionCommentFilter
 {
diff --git a/src/xdocs/filters/suppressioncommentfilter.xml.template b/src/xdocs/filters/suppressioncommentfilter.xml.template
index b0f37d78c06..cbb438ab66e 100644
--- a/src/xdocs/filters/suppressioncommentfilter.xml.template
+++ b/src/xdocs/filters/suppressioncommentfilter.xml.template
@@ -47,299 +47,96 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>offCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to begin suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"CHECKSTYLE:OFF"</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>onCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to end suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"CHECKSTYLE:ON"</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>checkFormat</td>
-              <td>Specify check pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>messageFormat</td>
-              <td>Specify message pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>idFormat</td>
-              <td>Specify check ID pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.24</td>
-            </tr>
-            <tr>
-              <td>checkCPP</td>
-              <td>Control whether to check C++ style comments (<code>//</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.5</td>
-            </tr>
-            <tr>
-              <td>checkC</td>
-              <td>Control whether to check C style comments (<code>/* ... */</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>3.5</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure a filter to suppress audit events (MemberNameCheck,
           ConstantNameCheck and IllegalCatchCheck have been taken here for reference)
           between a comment containing <code>CHECKSTYLE:OFF</code> and a comment containing
           <code>CHECKSTYLE:ON</code>:
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"/&gt;
-&lt;module name="MemberName"/&gt;
-&lt;module name="ConstantName"/&gt;
-&lt;module name="IllegalCatch"/&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //CHECKSTYLE:OFF
-  int VAR2; // suppressed violation
-  //CHECKSTYLE:ON
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  //CHECKSTYLE:OFF
-  public static final int var4; // suppressed violation
-  //CHECKSTYLE:ON
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-
-    //CHECKSTYLE:OFF
-
-    try {}
-    catch(Exception ex) {} // suppressed violation
-    catch(Error err) {} // suppressed violation
-
-    //CHECKSTYLE:ON
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example1.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure a filter so that <code>// stop constant
           check</code> and <code>// resume constant check</code> marks
           legitimate constant names:
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"&gt;
-  &lt;property name="offCommentFormat" value="stop constant check"/&gt;
-  &lt;property name="onCommentFormat" value="resume constant check"/&gt;
-  &lt;property name="checkFormat" value="ConstantNameCheck"/&gt;
-&lt;/module&gt;
-&lt;module name="MemberName"/&gt;
-&lt;module name="ConstantName"/&gt;
-&lt;module name="IllegalCatch"/&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //stop constant check
-  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
-  //resume constant check
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  //stop constant check
-  public static final int var4; // suppressed violation
-  //resume constant check
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-
-    //stop constant check
-
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-    catch(Error err) {} // violation , Catching 'Error' is not allowed
-
-    //resume constant check
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example2.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example2.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To configure a filter so that <code>UNUSED OFF:<i>var</i></code>
           and <code>UNUSED ON: <i>var</i></code> marks a
           variable or parameter known not to be used by the code by
           matching the variable name in the message through a specified message in messageFormat:
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"&gt;
-  &lt;property name="offCommentFormat" value="ILLEGAL OFF\: (\w+)"/&gt;
-  &lt;property name="onCommentFormat" value="ILLEGAL ON\: (\w+)"/&gt;
-  &lt;property name="checkFormat" value="IllegalCatch"/&gt;
-  &lt;property name="messageFormat" value="^Catching '$1' is not allowed.$"/&gt;
-&lt;/module&gt;
-&lt;module name="MemberName"/&gt;
-&lt;module name="ConstantName"/&gt;
-&lt;module name="IllegalCatch"/&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //ILLEGAL OFF: Exception
-  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
-  //ILLEGAL ON: Exception
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  //ILLEGAL OFF: Exception
-  public static final int var4;
-  // violation above ,  Name 'var4' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-  //ILLEGAL ON: Exception
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-
-    //ILLEGAL OFF: Exception
-
-    try {}
-    catch(Exception ex) {} // suppressed violation
-    catch(Error err) {} // violation , Catching 'Error' is not allowed
-
-    //ILLEGAL ON: Exception
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example3.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example3.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           To configure a filter so that name of suppressed check mentioned
           in comment <code>CSOFF: <i>regexp</i></code>
           and <code>CSON: <i>regexp</i></code> mark a matching check:
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"&gt;
-  &lt;property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/&gt;
-  &lt;property name="onCommentFormat" value="CSON\: ([\w\|]+)"/&gt;
-  &lt;property name="checkFormat" value="$1"/&gt;
-&lt;/module&gt;
-&lt;module name="MemberName"/&gt;
-&lt;module name="ConstantName"/&gt;
-&lt;module name="IllegalCatch"/&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //CSOFF: MemberName
-  int VAR2; // suppressed violation
-  //CSON: MemberName
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  //CSOFF: ConstantName
-  public static final int var4; // suppressed violation
-  //CSON: ConstantName
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-
-    //CSOFF: IllegalCatch
-
-    try {}
-    catch(Exception ex) {} // suppressed violation
-    catch(Error err) {} // suppressed violation
-
-    //CSON: IllegalCatch
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example4.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example4.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example5-config">
           To configure a filter to suppress all audit events between a comment
           containing <code>CHECKSTYLE_OFF: ALMOST_ALL</code> and a comment containing
           <code>CHECKSTYLE_OFF: ALMOST_ALL</code> except for the <em>ConstantName</em> check:
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"&gt;
-  &lt;property name="offCommentFormat" value="CHECKSTYLE_OFF: ALMOST_ALL"/&gt;
-  &lt;property name="onCommentFormat" value="CHECKSTYLE_ON: ALMOST_ALL"/&gt;
-  &lt;property name="checkFormat" value="^((?!(ConstantName)).)*$"/&gt;
-&lt;/module&gt;
-&lt;module name="MemberName"/&gt;
-&lt;module name="ConstantName"/&gt;
-&lt;module name="IllegalCatch"/&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //CHECKSTYLE_OFF: ALMOST_ALL
-  int VAR2; // suppressed violation
-  //CHECKSTYLE_ON: ALMOST_ALL
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  //CHECKSTYLE_OFF: ALMOST_ALL
-  public static final int var4;
-  // violation above ,  Name 'var4' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-  //CHECKSTYLE_ON: ALMOST_ALL
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-
-    //CHECKSTYLE_OFF: ALMOST_ALL
-
-    try {}
-    catch(Exception ex) {} // suppressed violation
-    catch(Error err) {} // suppressed violation
-
-    //CHECKSTYLE_ON: ALMOST_ALL
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example5.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example5.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example6-config">
           It is possible to specify an ID of checks, so that it can be leveraged by the
           SuppressionCommentFilter to skip validations. The following examples show how to skip
           validations near code that is surrounded with <code>// CSOFF &lt;ID&gt;</code>
@@ -348,141 +145,45 @@ class InputSuppressionCommentFilter
           to the ID written in the offCommentFormat and onCommentFormat. Config for such a
           case is written below:
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"&gt;
-  &lt;property name="offCommentFormat" value="CSOFF (\w+)"/&gt;
-  &lt;property name="onCommentFormat" value="CSON (\w+)"/&gt;
-  &lt;property name="idFormat" value="$1"/&gt;
-&lt;/module&gt;
-&lt;module name="MemberName"&gt;
-&lt;property name="id" value="MemberID"/&gt;
-&lt;/module&gt;
-&lt;module name="ConstantName"&gt;
-  &lt;property name="id" value="ConstantID"/&gt;
-&lt;/module&gt;
-&lt;module name="IllegalCatch"&gt;
-  &lt;property name="id" value="IllegalID"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //CSOFF MemberID
-  int VAR2; // suppressed violation
-  //CSON: MemberID
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  //CSOFF ConstantID
-  public static final int var4; // suppressed violation
-  //CSON ConstantID
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-
-    //CSOFF IllegalID
-
-    try {}
-    catch(Exception ex) {} // suppressed violation
-    catch(Error err) {} // suppressed violation
-
-    //CSON IllegalID
-  }
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example6.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example6-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example6.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example7-config">
           Example of how to configure the check to suppress checks by name defined in comment.
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"&gt;
-  &lt;property name="offCommentFormat" value="csoff (\w+)"/&gt;
-  &lt;property name="onCommentFormat" value="cson (\w+)"/&gt;
-  &lt;property name="checkFormat" value="$1"/&gt;
-&lt;/module&gt;
-&lt;module name="MemberName"/&gt;
-&lt;module name="ConstantName"/&gt;
-&lt;module name="IllegalCatch"/&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //csoff MemberName
-  int VAR2; // suppressed violation
-  //cson MemberName
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  //csoff ConstantName
-  //csoff IllegalCatch
-
-  public static final int var4; // suppressed violation
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // suppressed violation
-
-    try {}
-    catch(Exception ex) {} // suppressed violation
-    catch(Error err) {} // suppressed violation
-  }
-
-  //cson ConstantName
-  //cson IllegalCatch
-
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example7.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example7-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example7.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example8-config">
           Example depicting use of checkC and checkCPP style comments
         </p>
-        <source>
-&lt;module name="SuppressionCommentFilter"&gt;
-  &lt;property name="checkC" value="true"/&gt;
-  &lt;property name="checkCPP" value="false"/&gt;
-&lt;/module&gt;
-&lt;module name="MemberName"/&gt;
-&lt;module name="ConstantName"/&gt;
-&lt;module name="IllegalCatch"/&gt;
-        </source>
-        <source>
-class InputSuppressionCommentFilter
-{
-  int VAR1; // violation , Name 'VAR1' must match pattern '^[a-z][a-zA-Z0-9]*$'
-
-  //CHECKSTYLE:OFF
-  int VAR2; // violation , Name 'VAR2' must match pattern '^[a-z][a-zA-Z0-9]*$'
-  //CHECKSTYLE:ON
-
-  public static final int var3;
-  // violation above , Name 'var3' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
-
-  /*CHECKSTYLE:OFF*/
-  public static final int var4; // suppressed violation
-  /*CHECKSTYLE:ON*/
-
-  public void method1()
-  {
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-
-    //CHECKSTYLE:OFF
-
-    try {}
-    catch(Exception ex) {} // violation , Catching 'Exception' is not allowed
-    catch(Error err) {} // violation , Catching 'Error' is not allowed
-
-    //CHECKSTYLE:ON
-  }
-}
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example8.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example8-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressioncommentfilter/Example8.txt"/>
+          <param name="type" value="code"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppressionfilter.xml b/src/xdocs/filters/suppressionfilter.xml
index a8187a89045..aeb2377b83c 100644
--- a/src/xdocs/filters/suppressionfilter.xml
+++ b/src/xdocs/filters/suppressionfilter.xml
@@ -30,22 +30,14 @@
             </tr>
             <tr>
               <td>file</td>
-              <td>
-                Specify the location of the <em>suppressions XML document</em> file.
-              </td>
+              <td>Specify the location of the <em>suppressions XML document</em> file.</td>
               <td><a href="../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>3.2</td>
             </tr>
             <tr>
               <td>optional</td>
-              <td>
-                Control what to do when the file is not existing. If
-                <code>optional</code> is set to <code>false</code> the file must exist, or else
-                it ends with error. On the other hand if optional is
-                <code>true</code> and file is not found, the filter accept all
-                audit events.
-              </td>
+              <td>Control what to do when the file is not existing. If <code>optional</code> is set to <code>false</code> the file must exist, or else it ends with error. On the other hand if optional is <code>true</code> and file is not found, the filter accept all audit events.</td>
               <td><a href="../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>6.15</td>
diff --git a/src/xdocs/filters/suppressionfilter.xml.template b/src/xdocs/filters/suppressionfilter.xml.template
index c86cbde2022..ddc5ddfbd1f 100644
--- a/src/xdocs/filters/suppressionfilter.xml.template
+++ b/src/xdocs/filters/suppressionfilter.xml.template
@@ -20,37 +20,10 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>file</td>
-              <td>
-                Specify the location of the <em>suppressions XML document</em> file.
-              </td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>3.2</td>
-            </tr>
-            <tr>
-              <td>optional</td>
-              <td>
-                Control what to do when the file is not existing. If
-                <code>optional</code> is set to <code>false</code> the file must exist, or else
-                it ends with error. On the other hand if optional is
-                <code>true</code> and file is not found, the filter accept all
-                audit events.
-              </td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>6.15</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Notes" id="Notes">
diff --git a/src/xdocs/filters/suppressionsinglefilter.xml b/src/xdocs/filters/suppressionsinglefilter.xml
index fc4bf427e07..6de38974d6c 100644
--- a/src/xdocs/filters/suppressionsinglefilter.xml
+++ b/src/xdocs/filters/suppressionsinglefilter.xml
@@ -47,50 +47,44 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>files</td>
-              <td>Define the RegExp for matching against the file name associated
-                  with an audit event.</td>
+              <td>checks</td>
+              <td>Define the RegExp for matching against the name of the check associated with an audit event.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>8.23</td>
             </tr>
             <tr>
-              <td>checks</td>
-              <td>Define the RegExp for matching against the name of the check
-                  associated with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
+              <td>columns</td>
+              <td>Specify a comma-separated list of values, where each value is an integer or a range of integers denoted by integer-integer.</td>
+              <td><a href="../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>8.23</td>
             </tr>
             <tr>
-              <td>message</td>
-              <td>Define the RegExp for matching against the message of the check associated
-                  with an audit event.</td>
+              <td>files</td>
+              <td>Define the RegExp for matching against the file name associated with an audit event.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>8.23</td>
             </tr>
             <tr>
               <td>id</td>
-              <td>Specify a string matched against the ID of the check associated with an audit
-                  event.</td>
+              <td>Specify a string matched against the ID of the check associated with an audit event.</td>
               <td><a href="../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>8.23</td>
             </tr>
             <tr>
               <td>lines</td>
-              <td>Specify a comma-separated list of values, where each value is an integer or a
-                range of integers denoted by integer-integer.</td>
+              <td>Specify a comma-separated list of values, where each value is an integer or a range of integers denoted by integer-integer.</td>
               <td><a href="../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>8.23</td>
             </tr>
             <tr>
-              <td>columns</td>
-              <td>Specify a comma-separated list of values, where each value is an integer or a
-                range of integers denoted by integer-integer.</td>
-              <td><a href="../property_types.html#String">String</a></td>
+              <td>message</td>
+              <td>Define the RegExp for matching against the message of the check associated with an audit event.</td>
+              <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>8.23</td>
             </tr>
@@ -98,7 +92,7 @@
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           The following suppressions directs
           a <code>SuppressionSingleFilter</code> to
           reject <code>JavadocStyleCheck</code> violations for
@@ -110,100 +104,120 @@
           for all lines and files:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;JavadocStyleCheck&quot;/&gt;
-  &lt;property name=&quot;files&quot; value=&quot;AbstractComplexityCheck.java&quot;/&gt;
-  &lt;property name=&quot;lines&quot; value=&quot;82,108-122&quot;/&gt;
-&lt;/module&gt;
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;MagicNumberCheck&quot;/&gt;
-  &lt;property name=&quot;files&quot; value=&quot;JavadocStyleCheck.java&quot;/&gt;
-  &lt;property name=&quot;lines&quot; value=&quot;221&quot;/&gt;
-&lt;/module&gt;
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;message&quot; value=&quot;Missing a Javadoc comment&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;JavadocStyleCheck&quot;/&gt;
+    &lt;property name=&quot;files&quot; value=&quot;AbstractComplexityCheck.java&quot;/&gt;
+    &lt;property name=&quot;lines&quot; value=&quot;82,108-122&quot;/&gt;
+  &lt;/module&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;MagicNumberCheck&quot;/&gt;
+    &lt;property name=&quot;files&quot; value=&quot;JavadocStyleCheck.java&quot;/&gt;
+    &lt;property name=&quot;lines&quot; value=&quot;221&quot;/&gt;
+  &lt;/module&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;message&quot; value=&quot;Missing a Javadoc comment&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example2-config">
           Suppress check by <a href="https://checkstyle.org/config.html#Id">module id</a>
           when config have two instances on the same check:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;stringEqual&quot;/&gt;
-  &lt;property name=&quot;files&quot; value=&quot;SomeTestCode.java&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;id&quot; value=&quot;stringEqual&quot;/&gt;
+    &lt;property name=&quot;files&quot; value=&quot;SomeTestCode.java&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example3-config">
           Suppress all checks for hidden files and folders:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;[/\\]\..+&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;files&quot; value=&quot;[/\\]\..+&quot;/&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example4-config">
           Suppress all checks for Maven-generated code:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;[/\\]target[/\\]&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;files&quot; value=&quot;[/\\]target[/\\]&quot;/&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example5-config">
           Suppress all checks for archives, classes and other binary files:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;.+\.(?:jar|zip|war|class|tar|bin)$&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;files&quot; value=&quot;.+\.(?:jar|zip|war|class|tar|bin)$&quot;/&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example6-config">
           Suppress all checks for image files:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;.+\.(?:png|gif|jpg|jpeg)$&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;files&quot; value=&quot;.+\.(?:png|gif|jpg|jpeg)$&quot;/&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example7-config">
           Suppress all checks for non-java files:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot;
-    value=&quot;.+\.(?:txt|xml|csv|sh|thrift|html|sql|eot|ttf|woff|css|png)$&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;files&quot;
+      value=&quot;.+\.(?:txt|xml|csv|sh|thrift|html|sql|eot|ttf|woff|css|png)$&quot;/&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example8-config">
           Suppress all checks in generated sources:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;com[\\/]mycompany[\\/]app[\\/]gen[\\/]&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;files&quot; value=&quot;com[\\/]mycompany[\\/]app[\\/]gen[\\/]&quot;/&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example9-config">
           Suppress FileLength check on integration tests in certain folder:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;com[\\/]mycompany[\\/]app[\\/].*IT.java&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;FileLength&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;files&quot; value=&quot;com[\\/]mycompany[\\/]app[\\/].*IT.java&quot;/&gt;
+    &lt;property name=&quot;checks&quot; value=&quot;FileLength&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example10-config">
           Suppress naming violations on variable named 'log' in all files:
         </p>
         <source>
-&lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
-  &lt;property name=&quot;message&quot; value=&quot;Name 'log' must match pattern&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;SuppressionSingleFilter&quot;&gt;
+    &lt;property name=&quot;message&quot; value=&quot;Name 'log' must match pattern&quot;/&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
       </subsection>
diff --git a/src/xdocs/filters/suppressionsinglefilter.xml.template b/src/xdocs/filters/suppressionsinglefilter.xml.template
index 217e35c5f9b..73b1560c3d3 100644
--- a/src/xdocs/filters/suppressionsinglefilter.xml.template
+++ b/src/xdocs/filters/suppressionsinglefilter.xml.template
@@ -38,67 +38,14 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>files</td>
-              <td>Define the RegExp for matching against the file name associated
-                  with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.23</td>
-            </tr>
-            <tr>
-              <td>checks</td>
-              <td>Define the RegExp for matching against the name of the check
-                  associated with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.23</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Define the RegExp for matching against the message of the check associated
-                  with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.23</td>
-            </tr>
-            <tr>
-              <td>id</td>
-              <td>Specify a string matched against the ID of the check associated with an audit
-                  event.</td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>8.23</td>
-            </tr>
-            <tr>
-              <td>lines</td>
-              <td>Specify a comma-separated list of values, where each value is an integer or a
-                range of integers denoted by integer-integer.</td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>8.23</td>
-            </tr>
-            <tr>
-              <td>columns</td>
-              <td>Specify a comma-separated list of values, where each value is an integer or a
-                range of integers denoted by integer-integer.</td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>8.23</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionSingleFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           The following suppressions directs
           a <code>SuppressionSingleFilter</code> to
           reject <code>JavadocStyleCheck</code> violations for
@@ -109,103 +56,84 @@
           and <code>'Missing a Javadoc comment'</code> violations
           for all lines and files:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="checks" value="JavadocStyleCheck"/&gt;
-  &lt;property name="files" value="AbstractComplexityCheck.java"/&gt;
-  &lt;property name="lines" value="82,108-122"/&gt;
-&lt;/module&gt;
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="checks" value="MagicNumberCheck"/&gt;
-  &lt;property name="files" value="JavadocStyleCheck.java"/&gt;
-  &lt;property name="lines" value="221"/&gt;
-&lt;/module&gt;
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="message" value="Missing a Javadoc comment"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-config">
           Suppress check by <a href="https://checkstyle.org/config.html#Id">module id</a>
           when config have two instances on the same check:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="id" value="stringEqual"/&gt;
-  &lt;property name="files" value="SomeTestCode.java"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example2.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-config">
           Suppress all checks for hidden files and folders:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="files" value="[/\\]\..+"/&gt;
-  &lt;property name="checks" value=".*"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example3.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-config">
           Suppress all checks for Maven-generated code:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="files" value="[/\\]target[/\\]"/&gt;
-  &lt;property name="checks" value=".*"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example4.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-config">
           Suppress all checks for archives, classes and other binary files:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="files" value=".+\.(?:jar|zip|war|class|tar|bin)$"/&gt;
-  &lt;property name="checks" value=".*"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example5.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example6-config">
           Suppress all checks for image files:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="files" value=".+\.(?:png|gif|jpg|jpeg)$"/&gt;
-  &lt;property name="checks" value=".*"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example6.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example7-config">
           Suppress all checks for non-java files:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="files"
-    value=".+\.(?:txt|xml|csv|sh|thrift|html|sql|eot|ttf|woff|css|png)$"/&gt;
-  &lt;property name="checks" value=".*"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example7.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example8-config">
           Suppress all checks in generated sources:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="files" value="com[\\/]mycompany[\\/]app[\\/]gen[\\/]"/&gt;
-  &lt;property name="checks" value=".*"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example8.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example9-config">
           Suppress FileLength check on integration tests in certain folder:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="files" value="com[\\/]mycompany[\\/]app[\\/].*IT.java"/&gt;
-  &lt;property name="checks" value="FileLength"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example9.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example10-config">
           Suppress naming violations on variable named 'log' in all files:
         </p>
-        <source>
-&lt;module name="SuppressionSingleFilter"&gt;
-  &lt;property name="message" value="Name 'log' must match pattern"/&gt;
-&lt;/module&gt;
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionsinglefilter/Example10.txt"/>
+          <param name="type" value="config"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppressionxpathfilter.xml b/src/xdocs/filters/suppressionxpathfilter.xml
index 682364d1dcc..8457144b41f 100644
--- a/src/xdocs/filters/suppressionxpathfilter.xml
+++ b/src/xdocs/filters/suppressionxpathfilter.xml
@@ -107,22 +107,14 @@
             </tr>
             <tr>
               <td>file</td>
-              <td>
-                Specify the location of the <em>suppressions XML document</em> file.
-              </td>
+              <td>Specify the location of the <em>suppressions XML document</em> file.</td>
               <td><a href="../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>8.6</td>
             </tr>
             <tr>
               <td>optional</td>
-              <td>
-                Control what to do when the file is not existing. If
-                optional is set to false the file must exist, or else
-                it ends with error. On the other hand if optional is
-                true and file is not found, the filter accepts all
-                audit events.
-              </td>
+              <td>Control what to do when the file is not existing. If optional is set to false the file must exist, or else it ends with error. On the other hand if optional is true and file is not found, the filter accepts all audit events.</td>
               <td><a href="../property_types.html#boolean">boolean</a></td>
               <td><code>false</code></td>
               <td>8.6</td>
diff --git a/src/xdocs/filters/suppressionxpathfilter.xml.template b/src/xdocs/filters/suppressionxpathfilter.xml.template
index ec6ec08eac1..a76efb7b483 100644
--- a/src/xdocs/filters/suppressionxpathfilter.xml.template
+++ b/src/xdocs/filters/suppressionxpathfilter.xml.template
@@ -97,37 +97,10 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>file</td>
-              <td>
-                Specify the location of the <em>suppressions XML document</em> file.
-              </td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>8.6</td>
-            </tr>
-            <tr>
-              <td>optional</td>
-              <td>
-                Control what to do when the file is not existing. If
-                optional is set to false the file must exist, or else
-                it ends with error. On the other hand if optional is
-                true and file is not found, the filter accepts all
-                audit events.
-              </td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>false</code></td>
-              <td>8.6</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
diff --git a/src/xdocs/filters/suppressionxpathsinglefilter.xml b/src/xdocs/filters/suppressionxpathsinglefilter.xml
index 9f5859c935d..4682278f3f7 100644
--- a/src/xdocs/filters/suppressionxpathsinglefilter.xml
+++ b/src/xdocs/filters/suppressionxpathsinglefilter.xml
@@ -46,34 +46,30 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>files</td>
-              <td>Define a Regular Expression matched against the file name associated
-                  with an audit event.</td>
+              <td>checks</td>
+              <td>Define a Regular Expression matched against the name of the check associated with an audit event.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>8.18</td>
             </tr>
             <tr>
-              <td>checks</td>
-              <td>Define a Regular Expression matched against the name of the check
-                  associated with an audit event.</td>
+              <td>files</td>
+              <td>Define a Regular Expression matched against the file name associated with an audit event.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>8.18</td>
             </tr>
             <tr>
-              <td>message</td>
-              <td>Define a Regular Expression matched against the message of the check associated
-                  with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
+              <td>id</td>
+              <td>Define a string matched against the ID of the check associated with an audit event.</td>
+              <td><a href="../property_types.html#String">String</a></td>
               <td><code>null</code></td>
               <td>8.18</td>
             </tr>
             <tr>
-              <td>id</td>
-              <td>Define a string matched against the ID of the check associated with an audit
-                  event.</td>
-              <td><a href="../property_types.html#String">String</a></td>
+              <td>message</td>
+              <td>Define a Regular Expression matched against the message of the check associated with an audit event.</td>
+              <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>null</code></td>
               <td>8.18</td>
             </tr>
@@ -88,25 +84,26 @@
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure to suppress the MethodName check
           for all methods with name MyMethod
           inside FileOne and FileTwo files:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;File(One|Two)\.java&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;(//CLASS_DEF[@text='FileOne']/OBJBLOCK/
-            METHOD_DEF[@text='MyMethod']/IDENT)|
-            (//CLASS_DEF[@text='FileTwo']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;files&quot; value=&quot;File(One|Two)\.java&quot;/&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;(//CLASS_DEF[@text='FileOne']/OBJBLOCK/
+                METHOD_DEF[@text='MyMethod']/IDENT)|
+                (//CLASS_DEF[@text='FileTwo']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example1-code">Code example:</p>
+        <source>
 public class FileOne {
   public void MyMethod() {} // OK
 }
@@ -119,48 +116,48 @@ public class FileThree {
   public void MyMethod() {} // violation, name 'MyMethod'
                             // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example2-config">
           To suppress MethodName check for method names matched pattern 'MyMethod[0-9]':
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
-  &lt;property name=&quot;message&quot; value=&quot;MyMethod[0-9]&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
+      &lt;property name=&quot;message&quot; value=&quot;MyMethod[0-9]&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example2-code">Code Example:</p>
+        <source>
 public class FileOne {
   public void MyMethod1() {} // OK
   public void MyMethod2() {} // OK
   public void MyMethodA() {} // violation, name 'MyMethodA' must
                              // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example3-config">
           To suppress checks being specified by id property:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;MethodName&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;MethodName1&quot;/&gt;
-  &lt;property name=&quot;format&quot; value=&quot;^[a-z](_?[a-zA-Z0-9]+)*$&quot;/&gt;
-&lt;module/&gt;
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;FileOne.java&quot;/&gt;
-  &lt;property name=&quot;id&quot; value=&quot;MethodName1&quot;/&gt;
-&lt;module/&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;MethodName&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;MethodName1&quot;/&gt;
+      &lt;property name=&quot;format&quot; value=&quot;^[a-z](_?[a-zA-Z0-9]+)*$&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;files&quot; value=&quot;FileOne.java&quot;/&gt;
+      &lt;property name=&quot;id&quot; value=&quot;MethodName1&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example3-code">Code example:</p>
+        <source>
 public class FileOne {
   public void MyMethod() {} // OK
 }
@@ -168,60 +165,60 @@ public class FileTwo {
   public void MyMethod() {} // violation,  name 'MyMethod' must
                             //match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example4-config">
           To suppress checks for all package definitions:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;PackageName&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;/PACKAGE_DEF[@text='File']/IDENT&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;PackageName&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;/PACKAGE_DEF[@text='File']/IDENT&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example4-code">Code example:</p>
+        <source>
 package File; // OK
 
 public class FileOne {}
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example5-config">
           To suppress RedundantModifier check for interface definitions:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;RedundantModifier&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;//INTERFACE_DEF//*&quot;/&gt;
-&lt;module/&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;RedundantModifier&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;//INTERFACE_DEF//*&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example5-code">Code Example:</p>
+        <source>
 public interface TestClass {
   public static final int CONSTANT1 = 1;  // OK
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example6-config">
           To suppress checks in the FileOne file by non-query:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;FileOne.java&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;MyMethod&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;files&quot; value=&quot;FileOne.java&quot;/&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;MyMethod&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example6-code">Code example:</p>
+        <source>
 public class FileOne {
   public void MyMethod() {} // OK
 }
@@ -230,25 +227,25 @@ public class FileTwo {
   public void MyMethod() {} // violation, name 'MyMethod'
                             // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example7-config">
           Suppress checks for elements which are either class definitions,
           either method definitions:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
-  &lt;property name=&quot;query&quot;
-            value=&quot;(//CLASS_DEF[@text='FileOne'])|
-            (//CLASS_DEF[@text='FileOne']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+      &lt;property name=&quot;query&quot;
+                value=&quot;(//CLASS_DEF[@text='FileOne'])|
+                (//CLASS_DEF[@text='FileOne']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example7-code">Code example:</p>
+        <source>
 abstract class FileOne { // OK
   public void MyMethod() {} // OK
 }
@@ -258,48 +255,48 @@ abstract class FileTwo { // violation of the AbstractClassName check,
   public void MyMethod() {} // violation, name 'MyMethod'
                             // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example8-config">
           Suppress checks for MyMethod1 or MyMethod2 methods:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='FileOne']/OBJBLOCK/
-            METHOD_DEF[@text='MyMethod1' or @text='MyMethod2']/IDENT&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;MethodName&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='FileOne']/OBJBLOCK/
+                METHOD_DEF[@text='MyMethod1' or @text='MyMethod2']/IDENT&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example8-code">Code example:</p>
+        <source>
 public class FileOne {
   public void MyMethod1() {} // OK
   public void MyMethod2() {} // OK
   public void MyMethod3() {} // violation, name 'MyMethod3' must
                              // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example9-config">
           Suppress checks for variable testVariable inside
           testMethod method inside TestClass class:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;LocalFinalVariableName&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='TestClass']/OBJBLOCK
-        /METHOD_DEF[@text='testMethod']/SLIST
-        /VARIABLE_DEF[@text='testVariable1']/IDENT&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;LocalFinalVariableName&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='TestClass']/OBJBLOCK
+            /METHOD_DEF[@text='testMethod']/SLIST
+            /VARIABLE_DEF[@text='testVariable1']/IDENT&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example9-code">Code Example:</p>
+        <source>
 public class TestClass {
   public void testMethod() {
     final int testVariable1 = 10; // OK
@@ -307,25 +304,25 @@ public class TestClass {
                                   // name 'testVariable2' must match pattern '^[A-Z][A-Z0-9]*$'
   }
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example10-config">
           In the following sample, violations for LeftCurly check
           will be suppressed for classes with name Main or for methods
           with name calculate.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;LeftCurly&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='TestClass']/OBJBLOCK
-        /METHOD_DEF[@text='testMethod1']/SLIST*&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;LeftCurly&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='TestClass']/OBJBLOCK
+            /METHOD_DEF[@text='testMethod1']/SLIST&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example10-code">Code Example:</p>
+        <source>
 public class TestClass {
   public void testMethod1()
   { // OK
@@ -335,24 +332,24 @@ public class TestClass {
   { // violation, '{' should be on the previous line
   }
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example11-config">
           The following example demonstrates how to suppress
           RequireThis violations for variable age inside changeAge method.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;RequireThis&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='InputTest']
-        //METHOD_DEF[@text='changeAge']//ASSIGN[@text='age']/IDENT&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;RequireThis&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;//CLASS_DEF[@text='InputTest']
+            //METHOD_DEF[@text='changeAge']//ASSIGN[@text='age']/IDENT&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example11-code">Code Example:</p>
+        <source>
 public class InputTest {
   private int age = 23;
 
@@ -360,9 +357,8 @@ public class InputTest {
     age = 24; // violation will be suppressed
   }
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example12-config">
           Suppress <code>IllegalThrows</code> violations only for methods with name
           <i>throwsMethod</i> and only for <code>RuntimeException</code> exceptions.
           Double colon is used for axis iterations. In the following example <code>ancestor</code>
@@ -370,18 +366,19 @@ public class InputTest {
           <code>METHOD_DEF</code> and name <i>throwsMethod</i>. Please read more about xpath axes at
           <a href="https://www.w3schools.com/xml/xpath_axes.asp">W3Schools Xpath Axes</a>.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;IllegalThrows&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;//LITERAL_THROWS/IDENT[
-      ..[@text='RuntimeException'] and ./ancestor::METHOD_DEF[@text='throwsMethod']]&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;IllegalThrows&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;//LITERAL_THROWS/IDENT[
+          ..[@text='RuntimeException'] and ./ancestor::METHOD_DEF[@text='throwsMethod']]&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example12-code">Code Example:</p>
+        <source>
 public class InputTest {
   public void throwsMethod() throws RuntimeException { // violation will be suppressed
   }
@@ -389,27 +386,27 @@ public class InputTest {
   public void sampleMethod() throws RuntimeException { // will throw violation here
   }
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example13-config">
           The following sample demonstrates how to suppress all violations for method itself and
           all descendants. <code>descendant-or-self</code> axis iterates through current node and
           all children nodes at any level. Keyword <code>node()</code> selects node elements.
           Please read more about xpath syntax at
           <a href="https://www.w3schools.com/xml/xpath_syntax.asp">W3Schools Xpath Syntax</a>.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
-  &lt;property name=&quot;query&quot; value=&quot;//METHOD_DEF[@text='TestMethod1']
-        /descendant-or-self::node()&quot;/&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;.*&quot;/&gt;
+      &lt;property name=&quot;query&quot; value=&quot;//METHOD_DEF[@text='TestMethod1']
+            /descendant-or-self::node()&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
+        </source>
+        <p id="Example13-code">Code Example:</p>
+        <source>
 public class TestClass {
   public void TestMethod1() { // OK
     final int num = 10; // OK
@@ -421,30 +418,31 @@ public class TestClass {
                         // name 'num' must match pattern '^[A-Z][A-Z0-9]*$'
   }
 }
-          </pre>
-        </div>
-        <p>
+        </source>
+        <p id="Example14-config">
           The following example is an example of what checks would be suppressed
           while building Spring projects with checkstyle plugin.
           Please find more information at:
           <a href="https://github.com/spring-io/spring-javaformat">spring-javaformat</a>
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;[\\/]src[\\/]test[\\/]java[\\/]&quot;/&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;Javadoc*&quot;/&gt;
-&lt;/module&gt;
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;.*Tests\.java&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;Javadoc*&quot;&gt;
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;files&quot; value=&quot;[\\/]src[\\/]test[\\/]java[\\/]&quot;/&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;Javadoc*&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;files&quot; value=&quot;.*Tests\.java&quot;/&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;Javadoc*&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
+      &lt;property name=&quot;files&quot; value=&quot;generated-sources&quot;/&gt;
+      &lt;property name=&quot;checks&quot; value=&quot;[a-zA-Z0-9]*&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
-&lt;module name=&quot;SuppressionXpathSingleFilter&quot;&gt;
-  &lt;property name=&quot;files&quot; value=&quot;generated-sources&quot;&gt;
-  &lt;property name=&quot;checks&quot; value=&quot;[a-zA-Z0-9]*&quot;&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
+        </source>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppressionxpathsinglefilter.xml.template b/src/xdocs/filters/suppressionxpathsinglefilter.xml.template
index 8bb9625578e..516a752960c 100644
--- a/src/xdocs/filters/suppressionxpathsinglefilter.xml.template
+++ b/src/xdocs/filters/suppressionxpathsinglefilter.xml.template
@@ -37,332 +37,175 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>files</td>
-              <td>Define a Regular Expression matched against the file name associated
-                  with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.18</td>
-            </tr>
-            <tr>
-              <td>checks</td>
-              <td>Define a Regular Expression matched against the name of the check
-                  associated with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.18</td>
-            </tr>
-            <tr>
-              <td>message</td>
-              <td>Define a Regular Expression matched against the message of the check associated
-                  with an audit event.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.18</td>
-            </tr>
-            <tr>
-              <td>id</td>
-              <td>Define a string matched against the ID of the check associated with an audit
-                  event.</td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>8.18</td>
-            </tr>
-            <tr>
-              <td>query</td>
-              <td>Define a string xpath query.</td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>null</code></td>
-              <td>8.18</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathSingleFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure to suppress the MethodName check
           for all methods with name MyMethod
           inside FileOne and FileTwo files:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="files" value="File(One|Two)\.java"/&gt;
-  &lt;property name="checks" value="MethodName"/&gt;
-  &lt;property name="query" value="(//CLASS_DEF[@text='FileOne']/OBJBLOCK/
-            METHOD_DEF[@text='MyMethod']/IDENT)|
-            (//CLASS_DEF[@text='FileTwo']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
-public class FileOne {
-  public void MyMethod() {} // OK
-}
-
-public class FileTwo {
-  public void MyMethod() {} // OK
-}
-
-public class FileThree {
-  public void MyMethod() {} // violation, name 'MyMethod'
-                            // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Code example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example1.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To suppress MethodName check for method names matched pattern 'MyMethod[0-9]':
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="MethodName"/&gt;
-  &lt;property name="message" value="MyMethod[0-9]"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
-public class FileOne {
-  public void MyMethod1() {} // OK
-  public void MyMethod2() {} // OK
-  public void MyMethodA() {} // violation, name 'MyMethodA' must
-                             // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example2.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example2.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To suppress checks being specified by id property:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="MethodName"&gt;
-  &lt;property name="id" value="MethodName1"/&gt;
-  &lt;property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/&gt;
-&lt;module/&gt;
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="files" value="FileOne.java"/&gt;
-  &lt;property name="id" value="MethodName1"/&gt;
-&lt;module/&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
-public class FileOne {
-  public void MyMethod() {} // OK
-}
-public class FileTwo {
-  public void MyMethod() {} // violation,  name 'MyMethod' must
-                            //match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example3.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Code example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example3.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           To suppress checks for all package definitions:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="PackageName"/&gt;
-  &lt;property name="query" value="/PACKAGE_DEF[@text='File']/IDENT"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
-package File; // OK
-
-public class FileOne {}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example4.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Code example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example4.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example5-config">
           To suppress RedundantModifier check for interface definitions:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="RedundantModifier"/&gt;
-  &lt;property name="query" value="//INTERFACE_DEF//*"/&gt;
-&lt;module/&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
-public interface TestClass {
-  public static final int CONSTANT1 = 1;  // OK
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example5.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example5.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example6-config">
           To suppress checks in the FileOne file by non-query:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="files" value="FileOne.java"/&gt;
-  &lt;property name="checks" value="MyMethod"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
-public class FileOne {
-  public void MyMethod() {} // OK
-}
-
-public class FileTwo {
-  public void MyMethod() {} // violation, name 'MyMethod'
-                            // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example6.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example6-code">Code example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example6.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example7-config">
           Suppress checks for elements which are either class definitions,
           either method definitions:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value=".*"/&gt;
-  &lt;property name="query"
-            value="(//CLASS_DEF[@text='FileOne'])|
-            (//CLASS_DEF[@text='FileOne']/OBJBLOCK/METHOD_DEF[@text='MyMethod']/IDENT)"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
-abstract class FileOne { // OK
-  public void MyMethod() {} // OK
-}
-
-abstract class FileTwo { // violation of the AbstractClassName check,
-                         // it should match the pattern "^Abstract.+$"
-  public void MyMethod() {} // violation, name 'MyMethod'
-                            // must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example7.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example7-code">Code example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example7.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example8-config">
           Suppress checks for MyMethod1 or MyMethod2 methods:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="MethodName"/&gt;
-  &lt;property name="query" value="//CLASS_DEF[@text='FileOne']/OBJBLOCK/
-            METHOD_DEF[@text='MyMethod1' or @text='MyMethod2']/IDENT"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code example:</p>
-        <div class="wrapper">
-          <pre>
-public class FileOne {
-  public void MyMethod1() {} // OK
-  public void MyMethod2() {} // OK
-  public void MyMethod3() {} // violation, name 'MyMethod3' must
-                             // match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example8.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example8-code">Code example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example8.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example9-config">
           Suppress checks for variable testVariable inside
           testMethod method inside TestClass class:
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="LocalFinalVariableName"/&gt;
-  &lt;property name="query" value="//CLASS_DEF[@text='TestClass']/OBJBLOCK
-        /METHOD_DEF[@text='testMethod']/SLIST
-        /VARIABLE_DEF[@text='testVariable1']/IDENT"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
-public class TestClass {
-  public void testMethod() {
-    final int testVariable1 = 10; // OK
-    final int testVariable2 = 10; // violation of the LocalFinalVariableName check,
-                                  // name 'testVariable2' must match pattern '^[A-Z][A-Z0-9]*$'
-  }
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example9.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example9-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example9.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example10-config">
           In the following sample, violations for LeftCurly check
           will be suppressed for classes with name Main or for methods
           with name calculate.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="LeftCurly"/&gt;
-  &lt;property name="query" value="//CLASS_DEF[@text='TestClass']/OBJBLOCK
-        /METHOD_DEF[@text='testMethod1']/SLIST*"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
-public class TestClass {
-  public void testMethod1()
-  { // OK
-  }
-
-  public void testMethod2()
-  { // violation, '{' should be on the previous line
-  }
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example10.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example10-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example10.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example11-config">
           The following example demonstrates how to suppress
           RequireThis violations for variable age inside changeAge method.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="RequireThis"/&gt;
-  &lt;property name="query" value="//CLASS_DEF[@text='InputTest']
-        //METHOD_DEF[@text='changeAge']//ASSIGN[@text='age']/IDENT"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
-public class InputTest {
-  private int age = 23;
-
-  public void changeAge() {
-    age = 24; // violation will be suppressed
-  }
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example11.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example11-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example11.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example12-config">
           Suppress <code>IllegalThrows</code> violations only for methods with name
           <i>throwsMethod</i> and only for <code>RuntimeException</code> exceptions.
           Double colon is used for axis iterations. In the following example <code>ancestor</code>
@@ -370,81 +213,46 @@ public class InputTest {
           <code>METHOD_DEF</code> and name <i>throwsMethod</i>. Please read more about xpath axes at
           <a href="https://www.w3schools.com/xml/xpath_axes.asp">W3Schools Xpath Axes</a>.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value="IllegalThrows"/&gt;
-  &lt;property name="query" value="//LITERAL_THROWS/IDENT[
-      ..[@text='RuntimeException'] and ./ancestor::METHOD_DEF[@text='throwsMethod']]"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
-public class InputTest {
-  public void throwsMethod() throws RuntimeException { // violation will be suppressed
-  }
-
-  public void sampleMethod() throws RuntimeException { // will throw violation here
-  }
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example12.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example12-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example12.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example13-config">
           The following sample demonstrates how to suppress all violations for method itself and
           all descendants. <code>descendant-or-self</code> axis iterates through current node and
           all children nodes at any level. Keyword <code>node()</code> selects node elements.
           Please read more about xpath syntax at
           <a href="https://www.w3schools.com/xml/xpath_syntax.asp">W3Schools Xpath Syntax</a>.
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="checks" value=".*"/&gt;
-  &lt;property name="query" value="//METHOD_DEF[@text='TestMethod1']
-        /descendant-or-self::node()"/&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
-        <p>Code Example:</p>
-        <div class="wrapper">
-          <pre>
-public class TestClass {
-  public void TestMethod1() { // OK
-    final int num = 10; // OK
-  }
-
-  public void TestMethod2() { // violation of the MethodName check,
-                              // name 'TestMethod2' must match pattern '^[a-z](_?[a-zA-Z0-9]+)*$'
-    final int num = 10; // violation of the LocalFinalVariableName check,
-                        // name 'num' must match pattern '^[A-Z][A-Z0-9]*$'
-  }
-}
-          </pre>
-        </div>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example13.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example13-code">Code Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example13.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example14-config">
           The following example is an example of what checks would be suppressed
           while building Spring projects with checkstyle plugin.
           Please find more information at:
           <a href="https://github.com/spring-io/spring-javaformat">spring-javaformat</a>
         </p>
-        <div class="wrapper">
-          <pre>
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="files" value="[\\/]src[\\/]test[\\/]java[\\/]"/&gt;
-  &lt;property name="checks" value="Javadoc*"/&gt;
-&lt;/module&gt;
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="files" value=".*Tests\.java"&gt;
-  &lt;property name="checks" value="Javadoc*"&gt;
-&lt;/module&gt;
-&lt;module name="SuppressionXpathSingleFilter"&gt;
-  &lt;property name="files" value="generated-sources"&gt;
-  &lt;property name="checks" value="[a-zA-Z0-9]*"&gt;
-&lt;/module&gt;
-          </pre>
-        </div>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppressionxpathsinglefilter/Example14.txt"/>
+          <param name="type" value="config"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppresswarningsfilter.xml b/src/xdocs/filters/suppresswarningsfilter.xml
index 1886ac7ee4f..9642eb9ebe3 100644
--- a/src/xdocs/filters/suppresswarningsfilter.xml
+++ b/src/xdocs/filters/suppresswarningsfilter.xml
@@ -56,6 +56,16 @@
         <source>
 &lt;module name=&quot;SuppressWarningsFilter&quot; /&gt;
         </source>
+        <p id="Example1-config">Full configuration:</p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWarningsHolder&quot; /&gt;
+  &lt;/module&gt;
+  &lt;module name=&quot;SuppressWarningsFilter&quot; /&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example1-code">Example:</p>
         <source>
 @SuppressWarnings({&quot;memberName&quot;})
 private int J; // should NOT fail MemberNameCheck
@@ -98,6 +108,22 @@ private int [] ARRAY; // should NOT fail MemberNameCheck and NoWhitespaceAfterCh
         <source>
 &lt;module name=&quot;SuppressWarningsFilter&quot; /&gt;
         </source>
+        <p id="Example2-config">Full configuration:</p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWarningsHolder&quot; /&gt;
+    &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;systemout&quot;/&gt;
+      &lt;property name=&quot;format&quot; value=&quot;^.*System\.(out|err).*$&quot;/&gt;
+      &lt;property name=&quot;message&quot;
+        value=&quot;Don't use System.out/err, use SLF4J instead.&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+  &lt;module name=&quot;SuppressWarningsFilter&quot; /&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example2-code">Example:</p>
         <source>
 @SuppressWarnings(&quot;checkstyle:systemout&quot;)
 public static void foo() {
diff --git a/src/xdocs/filters/suppresswarningsfilter.xml.template b/src/xdocs/filters/suppresswarningsfilter.xml.template
index a7df735b581..6c2d40a389e 100644
--- a/src/xdocs/filters/suppresswarningsfilter.xml.template
+++ b/src/xdocs/filters/suppresswarningsfilter.xml.template
@@ -56,6 +56,13 @@
         <source>
 &lt;module name="SuppressWarningsFilter" /&gt;
         </source>
+        <p id="Example1-config">Full configuration:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
         <source>
 @SuppressWarnings({"memberName"})
 private int J; // should NOT fail MemberNameCheck
@@ -98,12 +105,18 @@ private int [] ARRAY; // should NOT fail MemberNameCheck and NoWhitespaceAfterCh
         <source>
 &lt;module name="SuppressWarningsFilter" /&gt;
         </source>
-        <source>
-@SuppressWarnings("checkstyle:systemout")
-public static void foo() {
-  System.out.println("Debug info."); // should NOT fail RegexpSinglelineJava
-}
-        </source>
+        <p id="Example2-config">Full configuration:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example2.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswarningsfilter/Example2.txt"/>
+          <param name="type" value="code"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppresswithnearbycommentfilter.xml b/src/xdocs/filters/suppresswithnearbycommentfilter.xml
index 0e557b67267..23b9b54251c 100644
--- a/src/xdocs/filters/suppresswithnearbycommentfilter.xml
+++ b/src/xdocs/filters/suppresswithnearbycommentfilter.xml
@@ -47,10 +47,17 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>commentFormat</td>
-              <td>Specify comment pattern to trigger filter to begin suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;SUPPRESS CHECKSTYLE (\w+)&quot;</code></td>
+              <td>checkC</td>
+              <td>Control whether to check C style comments (<code>&#47;* ... *&#47;</code>).</td>
+              <td><a href="../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
+              <td>5.0</td>
+            </tr>
+            <tr>
+              <td>checkCPP</td>
+              <td>Control whether to check C++ style comments (<code>//</code>).</td>
+              <td><a href="../property_types.html#boolean">boolean</a></td>
+              <td><code>true</code></td>
               <td>5.0</td>
             </tr>
             <tr>
@@ -61,10 +68,10 @@
               <td>5.0</td>
             </tr>
             <tr>
-              <td>messageFormat</td>
-              <td>Define message pattern to suppress.</td>
+              <td>commentFormat</td>
+              <td>Specify comment pattern to trigger filter to begin suppression.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
+              <td><code>&quot;SUPPRESS CHECKSTYLE (\w+)&quot;</code></td>
               <td>5.0</td>
             </tr>
             <tr>
@@ -76,68 +83,75 @@
             </tr>
             <tr>
               <td>influenceFormat</td>
-              <td>Specify negative/zero/positive value that defines the number of
-                  lines preceding/at/following the suppression comment.</td>
+              <td>Specify negative/zero/positive value that defines the number of lines preceding/at/following the suppression comment.</td>
               <td><a href="../property_types.html#String">String</a></td>
               <td><code>&quot;0&quot;</code></td>
               <td>5.0</td>
             </tr>
             <tr>
-              <td>checkCPP</td>
-              <td>Control whether to check C++ style comments (<code>//</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>checkC</td>
-              <td>Control whether to check C style comments (<code>/* ... */</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
+              <td>messageFormat</td>
+              <td>Define message pattern to suppress.</td>
+              <td><a href="../property_types.html#Pattern">Pattern</a></td>
+              <td><code>null</code></td>
               <td>5.0</td>
             </tr>
           </table>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure a filter to suppress audit events for <i>check</i>
           on any line with a comment <code>SUPPRESS CHECKSTYLE <i>check</i></code>:
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
         </source>
+        <p id="Example1-code">Example:</p>
         <source>
 private int [] array; // SUPPRESS CHECKSTYLE
         </source>
-        <p>
+        <p id="Example2-config">
           To configure a filter to suppress all audit events on any line
           containing the comment <code>CHECKSTYLE IGNORE THIS LINE</code>:
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot; value=&quot;CHECKSTYLE IGNORE THIS LINE&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;.*&quot;/&gt;
-  &lt;property name=&quot;influenceFormat&quot; value=&quot;0&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot; value=&quot;CHECKSTYLE IGNORE THIS LINE&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;.*&quot;/&gt;
+      &lt;property name=&quot;influenceFormat&quot; value=&quot;0&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example2-code">Example:</p>
         <source>
 public static final int lowerCaseConstant; // CHECKSTYLE IGNORE THIS LINE
         </source>
-        <p>
+        <p id="Example3-config">
           To configure a filter so that
           <code>// OK to catch (Throwable|Exception|RuntimeException) here</code>
           permits the current and previous line to avoid generating an IllegalCatch
           audit event:
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot; value=&quot;OK to catch (\w+) here&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;IllegalCatchCheck&quot;/&gt;
-  &lt;property name=&quot;messageFormat&quot; value=&quot;$1&quot;/&gt;
-  &lt;property name=&quot;influenceFormat&quot; value=&quot;-1&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot; value=&quot;OK to catch (\w+) here&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;IllegalCatchCheck&quot;/&gt;
+      &lt;property name=&quot;messageFormat&quot; value=&quot;$1&quot;/&gt;
+      &lt;property name=&quot;influenceFormat&quot; value=&quot;-1&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example3-code">Example:</p>
         <source>
 . . .
 catch (RuntimeException re) {
@@ -146,20 +160,25 @@ catch (RuntimeException re) {
 catch (Throwable th) { ... }
 . . .
         </source>
-        <p>
+        <p id="Example4-config">
           To configure a filter so that
           <code>CHECKSTYLE IGNORE <i>check</i> FOR NEXT<i>var</i> LINES</code>
           avoids triggering any audits for the given check for
           the current line and the next <i>var</i> lines (for a total of <i>var</i>+1 lines):
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot;
-      value=&quot;CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
-  &lt;property name=&quot;influenceFormat&quot; value=&quot;$2&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot;
+          value=&quot;CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+      &lt;property name=&quot;influenceFormat&quot; value=&quot;$2&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example4-code">Example:</p>
         <source>
 static final int lowerCaseConstant; // CHECKSTYLE IGNORE ConstantNameCheck FOR NEXT 3 LINES
 static final int lowerCaseConstant1;
@@ -167,35 +186,45 @@ static final int lowerCaseConstant2;
 static final int lowerCaseConstant3;
 static final int lowerCaseConstant4; // will warn here
         </source>
-        <p>
+        <p id="Example5-config">
           To configure a filter to avoid any audits on code like:
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot;
-    value=&quot;ALLOW (\\w+) ON PREVIOUS LINE&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
-  &lt;property name=&quot;influenceFormat&quot; value=&quot;-1&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot;
+        value=&quot;ALLOW (\\w+) ON PREVIOUS LINE&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+      &lt;property name=&quot;influenceFormat&quot; value=&quot;-1&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example5-code">Example:</p>
         <source>
 private int D2;
 // ALLOW MemberName ON PREVIOUS LINE
 . . .
         </source>
 
-        <p>
+        <p id="Example6-config">
           To configure a filter to allow suppress one or more Checks
           (separated by &quot;|&quot;) and demand comment no less than 14 symbols:
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot;
-    value=&quot;@cs\.suppress \[(\w+(\|\w+)*)\] \w[-\.'`,:;\w ]{14,}&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
-  &lt;property name=&quot;influenceFormat&quot; value=&quot;1&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot;
+        value=&quot;@cs\.suppress \[(\w+(\|\w+)*)\] \w[-\.'`,:;\w ]{14,}&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+      &lt;property name=&quot;influenceFormat&quot; value=&quot;1&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example6-code">Example:</p>
         <source>
 public static final int [] array; // @cs.suppress [ConstantName|NoWhitespaceAfter] A comment here
         </source>
@@ -206,34 +235,36 @@ public static final int [] array; // @cs.suppress [ConstantName|NoWhitespaceAfte
           <code>// @cs-: &lt;ID/&gt; (reason)</code>, where ID is the ID of checks you want to
           suppress.
         </p>
-        <p>
-          Examples of Checkstyle checks configuration:
-        </p>
-        <source>
-&lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;ignore&quot;/&gt;
-  &lt;property name=&quot;format&quot; value=&quot;^.*@Ignore\s*$&quot;/&gt;
-  &lt;property name=&quot;message&quot; value=&quot;@Ignore should have a reason.&quot;/&gt;
-&lt;/module&gt;
-
-&lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;systemout&quot;/&gt;
-  &lt;property name=&quot;format&quot; value=&quot;^.*System\.(out|err).*$&quot;/&gt;
-  &lt;property name=&quot;message&quot; value=&quot;Don't use System.out/err, use SLF4J instead.&quot;/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example of SuppressWithNearbyCommentFilter configuration (idFormat which
+        <p id="Example7-config">
+          Example of Checkstyle checks and
+          SuppressWithNearbyCommentFilter configuration (idFormat which
           is set to '$1' points that ID of the checks is in the first group of
           commentFormat regular expressions):
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot; value=&quot;@cs-: (\w+) \(.*\)&quot;/&gt;
-  &lt;property name=&quot;idFormat&quot; value=&quot;$1&quot;/&gt;
-  &lt;property name=&quot;influenceFormat&quot; value=&quot;0&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot;
+        value=&quot;@cs\.suppress \[(\w+(\|\w+)*)\] \w[-\.'`,:;\w ]{14,}&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+      &lt;property name=&quot;influenceFormat&quot; value=&quot;1&quot;/&gt;
+    &lt;/module&gt;
+    &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;ignore&quot;/&gt;
+      &lt;property name=&quot;format&quot; value=&quot;^.*@Ignore\s*$&quot;/&gt;
+      &lt;property name=&quot;message&quot; value=&quot;@Ignore should have a reason.&quot;/&gt;
+    &lt;/module&gt;
+
+    &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;systemout&quot;/&gt;
+      &lt;property name=&quot;format&quot; value=&quot;^.*System\.(out|err).*$&quot;/&gt;
+      &lt;property name=&quot;message&quot; value=&quot;Don't use System.out/err, use SLF4J instead.&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example7-code">Example:</p>
         <source>
 @Ignore // @cs-: ignore (test has not been implemented yet)
 @Test
@@ -243,17 +274,22 @@ public static void foo() {
   System.out.println(&quot;Debug info.&quot;); // @cs-: systemout (should not fail RegexpSinglelineJava)
 }
         </source>
-        <p>
+        <p id="Example8-config">
           Example of how to configure the check to suppress more than one checks.
           The influence format is specified in the second regexp group.
         </p>
         <source>
-&lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
-  &lt;property name=&quot;commentFormat&quot; value=&quot;@cs-\: ([\w\|]+) influence (\d+)&quot;/&gt;
-  &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
-  &lt;property name=&quot;influenceFormat&quot; value=&quot;$2&quot;/&gt;
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;SuppressWithNearbyCommentFilter&quot;&gt;
+      &lt;property name=&quot;commentFormat&quot; value=&quot;@cs-\: ([\w\|]+) influence (\d+)&quot;/&gt;
+      &lt;property name=&quot;checkFormat&quot; value=&quot;$1&quot;/&gt;
+      &lt;property name=&quot;influenceFormat&quot; value=&quot;$2&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
 &lt;/module&gt;
         </source>
+        <p id="Example8-code">Example:</p>
         <source>
 // @cs-: ClassDataAbstractionCoupling influence 2
 // @cs-: MagicNumber influence 4
diff --git a/src/xdocs/filters/suppresswithnearbycommentfilter.xml.template b/src/xdocs/filters/suppresswithnearbycommentfilter.xml.template
index ab96dd225ff..f15cdcdf1ff 100644
--- a/src/xdocs/filters/suppresswithnearbycommentfilter.xml.template
+++ b/src/xdocs/filters/suppresswithnearbycommentfilter.xml.template
@@ -38,167 +38,107 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>commentFormat</td>
-              <td>Specify comment pattern to trigger filter to begin suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"SUPPRESS CHECKSTYLE (\w+)"</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>checkFormat</td>
-              <td>Specify check pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>messageFormat</td>
-              <td>Define message pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>idFormat</td>
-              <td>Specify check ID pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.24</td>
-            </tr>
-            <tr>
-              <td>influenceFormat</td>
-              <td>Specify negative/zero/positive value that defines the number of
-                  lines preceding/at/following the suppression comment.</td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>"0"</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>checkCPP</td>
-              <td>Control whether to check C++ style comments (<code>//</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-            <tr>
-              <td>checkC</td>
-              <td>Control whether to check C style comments (<code>/* ... */</code>).</td>
-              <td><a href="../property_types.html#boolean">boolean</a></td>
-              <td><code>true</code></td>
-              <td>5.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure a filter to suppress audit events for <i>check</i>
           on any line with a comment <code>SUPPRESS CHECKSTYLE <i>check</i></code>:
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"/&gt;
-        </source>
-        <source>
-private int [] array; // SUPPRESS CHECKSTYLE
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example1.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure a filter to suppress all audit events on any line
           containing the comment <code>CHECKSTYLE IGNORE THIS LINE</code>:
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"&gt;
-  &lt;property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/&gt;
-  &lt;property name="checkFormat" value=".*"/&gt;
-  &lt;property name="influenceFormat" value="0"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-public static final int lowerCaseConstant; // CHECKSTYLE IGNORE THIS LINE
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example2.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example2.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To configure a filter so that
           <code>// OK to catch (Throwable|Exception|RuntimeException) here</code>
           permits the current and previous line to avoid generating an IllegalCatch
           audit event:
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"&gt;
-  &lt;property name="commentFormat" value="OK to catch (\w+) here"/&gt;
-  &lt;property name="checkFormat" value="IllegalCatchCheck"/&gt;
-  &lt;property name="messageFormat" value="$1"/&gt;
-  &lt;property name="influenceFormat" value="-1"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-. . .
-catch (RuntimeException re) {
-// OK to catch RuntimeException here
-}
-catch (Throwable th) { ... }
-. . .
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example3.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example3.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           To configure a filter so that
           <code>CHECKSTYLE IGNORE <i>check</i> FOR NEXT<i>var</i> LINES</code>
           avoids triggering any audits for the given check for
           the current line and the next <i>var</i> lines (for a total of <i>var</i>+1 lines):
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"&gt;
-  &lt;property name="commentFormat"
-      value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/&gt;
-  &lt;property name="checkFormat" value="$1"/&gt;
-  &lt;property name="influenceFormat" value="$2"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-static final int lowerCaseConstant; // CHECKSTYLE IGNORE ConstantNameCheck FOR NEXT 3 LINES
-static final int lowerCaseConstant1;
-static final int lowerCaseConstant2;
-static final int lowerCaseConstant3;
-static final int lowerCaseConstant4; // will warn here
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example4.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example4.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example5-config">
           To configure a filter to avoid any audits on code like:
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"&gt;
-  &lt;property name="commentFormat"
-    value="ALLOW (\\w+) ON PREVIOUS LINE"/&gt;
-  &lt;property name="checkFormat" value="$1"/&gt;
-  &lt;property name="influenceFormat" value="-1"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-private int D2;
-// ALLOW MemberName ON PREVIOUS LINE
-. . .
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example5.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example5.txt"/>
+          <param name="type" value="code"/>
+        </macro>
 
-        <p>
+        <p id="Example6-config">
           To configure a filter to allow suppress one or more Checks
           (separated by "|") and demand comment no less than 14 symbols:
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"&gt;
-  &lt;property name="commentFormat"
-    value="@cs\.suppress \[(\w+(\|\w+)*)\] \w[-\.'`,:;\w ]{14,}"/&gt;
-  &lt;property name="checkFormat" value="$1"/&gt;
-  &lt;property name="influenceFormat" value="1"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-public static final int [] array; // @cs.suppress [ConstantName|NoWhitespaceAfter] A comment here
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example6.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example6-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example6.txt"/>
+          <param name="type" value="code"/>
+        </macro>
         <p>
           It is possible to specify an ID of checks, so that it can be leveraged by the
           SuppressWithNearbyCommentFilter to skip validations. The following examples
@@ -206,63 +146,38 @@ public static final int [] array; // @cs.suppress [ConstantName|NoWhitespaceAfte
           <code>// @cs-: &lt;ID/&gt; (reason)</code>, where ID is the ID of checks you want to
           suppress.
         </p>
-        <p>
-          Examples of Checkstyle checks configuration:
-        </p>
-        <source>
-&lt;module name="RegexpSinglelineJava"&gt;
-  &lt;property name="id" value="ignore"/&gt;
-  &lt;property name="format" value="^.*@Ignore\s*$"/&gt;
-  &lt;property name="message" value="@Ignore should have a reason."/&gt;
-&lt;/module&gt;
-
-&lt;module name="RegexpSinglelineJava"&gt;
-  &lt;property name="id" value="systemout"/&gt;
-  &lt;property name="format" value="^.*System\.(out|err).*$"/&gt;
-  &lt;property name="message" value="Don't use System.out/err, use SLF4J instead."/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-          Example of SuppressWithNearbyCommentFilter configuration (idFormat which
+        <p id="Example7-config">
+          Example of Checkstyle checks and
+          SuppressWithNearbyCommentFilter configuration (idFormat which
           is set to '$1' points that ID of the checks is in the first group of
           commentFormat regular expressions):
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"&gt;
-  &lt;property name="commentFormat" value="@cs-: (\w+) \(.*\)"/&gt;
-  &lt;property name="idFormat" value="$1"/&gt;
-  &lt;property name="influenceFormat" value="0"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-@Ignore // @cs-: ignore (test has not been implemented yet)
-@Test
-public void testMethod() { }
-
-public static void foo() {
-  System.out.println("Debug info."); // @cs-: systemout (should not fail RegexpSinglelineJava)
-}
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example7.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example7-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example7.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example8-config">
           Example of how to configure the check to suppress more than one checks.
           The influence format is specified in the second regexp group.
         </p>
-        <source>
-&lt;module name="SuppressWithNearbyCommentFilter"&gt;
-  &lt;property name="commentFormat" value="@cs-\: ([\w\|]+) influence (\d+)"/&gt;
-  &lt;property name="checkFormat" value="$1"/&gt;
-  &lt;property name="influenceFormat" value="$2"/&gt;
-&lt;/module&gt;
-        </source>
-        <source>
-// @cs-: ClassDataAbstractionCoupling influence 2
-// @cs-: MagicNumber influence 4
-@Service // no violations from ClassDataAbstractionCoupling here
-@Transactional
-public class UserService {
-  private int value = 10022; // no violations from MagicNumber here
-}
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example8.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example8-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbycommentfilter/Example8.txt"/>
+          <param name="type" value="code"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppresswithnearbytextfilter.xml b/src/xdocs/filters/suppresswithnearbytextfilter.xml
index 05dc9bb1204..5da95afdc3e 100644
--- a/src/xdocs/filters/suppresswithnearbytextfilter.xml
+++ b/src/xdocs/filters/suppresswithnearbytextfilter.xml
@@ -33,30 +33,13 @@
               <th>default value</th>
               <th>since</th>
             </tr>
-            <tr>
-              <td>nearbyTextPattern</td>
-              <td>Specify nearby text pattern to trigger filter to begin suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;SUPPRESS CHECKSTYLE (\w+)&quot;</code></td>
-              <td>10.10.0</td>
-            </tr>
             <tr>
               <td>checkPattern</td>
-              <td>Specify check name pattern to suppress. Property can
-                also be a RegExp group index at <code>nearbyTextPattern</code>
-                in format of <code>$x</code> and be picked from line
-                that matches <code>nearbyTextPattern</code>.</td>
+              <td>Specify check name pattern to suppress. Property can also be a RegExp group index at <code>nearbyTextPattern</code> in format of <code>$x</code> and be picked from line that matches <code>nearbyTextPattern</code>.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
               <td><code>&quot;.*&quot;</code></td>
               <td>10.10.0</td>
             </tr>
-            <tr>
-              <td>messagePattern</td>
-              <td>Specify check violation message pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>10.10.0</td>
-            </tr>
             <tr>
               <td>idPattern</td>
               <td>Specify check ID pattern to suppress.</td>
@@ -66,20 +49,30 @@
             </tr>
             <tr>
               <td>lineRange</td>
-              <td>Specify negative/zero/positive value that defines the number of lines
-                preceding/at/following the suppressing nearby text. Property can
-                also be a RegExp group index at <code>nearbyTextPattern</code>
-                in format of <code>$x</code> and be picked from line
-                that matches <code>nearbyTextPattern</code>.</td>
+              <td>Specify negative/zero/positive value that defines the number of lines preceding/at/following the suppressing nearby text. Property can also be a RegExp group index at <code>nearbyTextPattern</code> in format of <code>$x</code> and be picked from line that matches <code>nearbyTextPattern</code>.</td>
               <td><a href="../property_types.html#String">String</a></td>
               <td><code>&quot;0&quot;</code></td>
               <td>10.10.0</td>
             </tr>
+            <tr>
+              <td>messagePattern</td>
+              <td>Specify check violation message pattern to suppress.</td>
+              <td><a href="../property_types.html#Pattern">Pattern</a></td>
+              <td><code>null</code></td>
+              <td>10.10.0</td>
+            </tr>
+            <tr>
+              <td>nearbyTextPattern</td>
+              <td>Specify nearby text pattern to trigger filter to begin suppression.</td>
+              <td><a href="../property_types.html#Pattern">Pattern</a></td>
+              <td><code>&quot;SUPPRESS CHECKSTYLE (\w+)&quot;</code></td>
+              <td>10.10.0</td>
+            </tr>
           </table>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the filter to suppress audit events on the same line:
         </p>
         <source>
@@ -90,14 +83,14 @@
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example1-code">
           Example:
         </p>
         <source>
 int hoursInDay = 24; // SUPPRESS CHECKSTYLE because it is too obvious
 int daysInWeek = 7; // violation
         </source>
-        <p>
+        <p id="Example2-config">
           To configure the filter to suppress audit events on any line that contains
           <code>DO NOT CHECK THIS LINE</code>:
         </p>
@@ -111,14 +104,14 @@ int daysInWeek = 7; // violation
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example2-code">
           Example:
         </p>
         <source>
 int a = 42; // DO NOT CHECK THIS LINE
 int b = 43; // violation
         </source>
-        <p>
+        <p id="Example3-config">
            To configure the filter to suppress audit events whose check message contains
             the word <code>Line</code>. In this case, <code>LineLengthCheck</code>'s violation
             message contains it:
@@ -134,13 +127,13 @@ int b = 43; // violation
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example3-code">
           Example:
         </p>
         <source>
 export FOO=BAR # ok, because violation message is matching suppress pattern
         </source>
-        <p>
+        <p id="Example4-config">
           To configure the filter to suppress audit events only on a check whose id is
           <code>ignoreMe</code>:
         </p>
@@ -159,14 +152,14 @@ export FOO=BAR # ok, because violation message is matching suppress pattern
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example4-code">
           Example:
         </p>
         <source>
 int a = 42; // SUPPRESS CHECKSTYLE because i want to
 static final int LONG_VAR_NAME_TO_TAKE_MORE_THAN_55_CHARS = 22; // LineLength violation
         </source>
-        <p>
+        <p id="Example5-config">
           To configure the filter to suppress audit events for the current and next 2 lines:
         </p>
         <source>
@@ -177,7 +170,7 @@ static final int LONG_VAR_NAME_TO_TAKE_MORE_THAN_55_CHARS = 22; // LineLength vi
   &lt;module name=&quot;UniqueProperties&quot;/&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example5-code">
           Example:
         </p>
         <source>
@@ -186,7 +179,7 @@ key.one=42 # ok
 key.one=43 # ok
 key.one=44 # violation
         </source>
-        <p>
+        <p id="Example6-config">
           To configure the filter to suppress audit events for the current and previous line:
         </p>
         <source>
@@ -197,7 +190,7 @@ key.one=44 # violation
   &lt;module name=&quot;UniqueProperties&quot;/&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example6-code">
           Example:
         </p>
         <source>
@@ -206,7 +199,7 @@ key.one=42 # ok
 key.one=43 # SUPPRESS CHECKSTYLE because I want to
 key.one=44 # violation
         </source>
-        <p>
+        <p id="Example7-config">
           To configure the filter with a more compact <code>nearbyTextPattern</code>
           to accept variable <code>checkPattern</code>:
         </p>
@@ -222,14 +215,14 @@ key.one=44 # violation
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example7-code">
           Example:
         </p>
         <source>
 int a = 42; // -@cs[MagicNumber] We do not consider this number as magic for some reason.
 int b = 43; // violation
         </source>
-        <p>
+        <p id="Example8-config">
           To configure the filter to accept variable <code>checkPattern</code>
           and <code>lineRange</code>:
         </p>
@@ -246,7 +239,7 @@ int b = 43; // violation
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example8-code">
           Example:
         </p>
         <source>
@@ -256,7 +249,7 @@ int c = 44;
 int d = 45;
 int e = 46; // violation
         </source>
-        <p>
+        <p id="Example9-config">
           To configure the filter to suppress <code>LineLength</code>
           violations for lines containing a URL:
         </p>
@@ -272,7 +265,7 @@ int e = 46; // violation
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example9-code">
           Example:
         </p>
         <source>
diff --git a/src/xdocs/filters/suppresswithnearbytextfilter.xml.template b/src/xdocs/filters/suppresswithnearbytextfilter.xml.template
index 0ee2566abb3..0bd39f7487a 100644
--- a/src/xdocs/filters/suppresswithnearbytextfilter.xml.template
+++ b/src/xdocs/filters/suppresswithnearbytextfilter.xml.template
@@ -25,264 +25,164 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>nearbyTextPattern</td>
-              <td>Specify nearby text pattern to trigger filter to begin suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"SUPPRESS CHECKSTYLE (\w+)"</code></td>
-              <td>10.10.0</td>
-            </tr>
-            <tr>
-              <td>checkPattern</td>
-              <td>Specify check name pattern to suppress. Property can
-                also be a RegExp group index at <code>nearbyTextPattern</code>
-                in format of <code>$x</code> and be picked from line
-                that matches <code>nearbyTextPattern</code>.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>10.10.0</td>
-            </tr>
-            <tr>
-              <td>messagePattern</td>
-              <td>Specify check violation message pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>10.10.0</td>
-            </tr>
-            <tr>
-              <td>idPattern</td>
-              <td>Specify check ID pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>10.10.0</td>
-            </tr>
-            <tr>
-              <td>lineRange</td>
-              <td>Specify negative/zero/positive value that defines the number of lines
-                preceding/at/following the suppressing nearby text. Property can
-                also be a RegExp group index at <code>nearbyTextPattern</code>
-                in format of <code>$x</code> and be picked from line
-                that matches <code>nearbyTextPattern</code>.</td>
-              <td><a href="../property_types.html#String">String</a></td>
-              <td><code>"0"</code></td>
-              <td>10.10.0</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure the filter to suppress audit events on the same line:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"/&gt;
-  &lt;module name="TreeWalker"&gt;
-    &lt;module name="MagicNumber"/&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example1-code">
           Example:
         </p>
-        <source>
-int hoursInDay = 24; // SUPPRESS CHECKSTYLE because it is too obvious
-int daysInWeek = 7; // violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example1.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example2-config">
           To configure the filter to suppress audit events on any line that contains
           <code>DO NOT CHECK THIS LINE</code>:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="nearbyTextPattern" value="DO NOT CHECK THIS LINE"/&gt;
-  &lt;/module&gt;
-  &lt;module name="TreeWalker"&gt;
-    &lt;module name="MagicNumber"/&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example2.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">
           Example:
         </p>
-        <source>
-int a = 42; // DO NOT CHECK THIS LINE
-int b = 43; // violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example2.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
            To configure the filter to suppress audit events whose check message contains
             the word <code>Line</code>. In this case, <code>LineLengthCheck</code>'s violation
             message contains it:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="messagePattern" value=".*Line.*"/&gt;
-    &lt;property name="nearbyTextPattern" value=".*"/&gt;
-  &lt;/module&gt;
-  &lt;module name="LineLength"&gt;
-    &lt;property name="max" value="10"/&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example3.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">
           Example:
         </p>
-        <source>
-export FOO=BAR # ok, because violation message is matching suppress pattern
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example3.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           To configure the filter to suppress audit events only on a check whose id is
           <code>ignoreMe</code>:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="idPattern" value="ignoreMe"/&gt;
-  &lt;/module&gt;
-  &lt;module name="LineLength"&gt;
-    &lt;property name="max" value="55"/&gt;
-  &lt;/module&gt;
-  &lt;module name="TreeWalker"&gt;
-    &lt;module name="MagicNumber"&gt;
-      &lt;property name="id" value="ignoreMe"/&gt;
-    &lt;/module&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example4.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">
           Example:
         </p>
-        <source>
-int a = 42; // SUPPRESS CHECKSTYLE because i want to
-static final int LONG_VAR_NAME_TO_TAKE_MORE_THAN_55_CHARS = 22; // LineLength violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example4.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example5-config">
           To configure the filter to suppress audit events for the current and next 2 lines:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="lineRange" value="2"/&gt;
-  &lt;/module&gt;
-  &lt;module name="UniqueProperties"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example5.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">
           Example:
         </p>
-        <source>
-key.one=41 # SUPPRESS CHECKSTYLE because I want to
-key.one=42 # ok
-key.one=43 # ok
-key.one=44 # violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example5.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example6-config">
           To configure the filter to suppress audit events for the current and previous line:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="lineRange" value="-1"/&gt;
-  &lt;/module&gt;
-  &lt;module name="UniqueProperties"/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example6.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example6-code">
           Example:
         </p>
-        <source>
-key.one=41 # violation
-key.one=42 # ok
-key.one=43 # SUPPRESS CHECKSTYLE because I want to
-key.one=44 # violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example6.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example7-config">
           To configure the filter with a more compact <code>nearbyTextPattern</code>
           to accept variable <code>checkPattern</code>:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="nearbyTextPattern"
-      value="-@cs\[(\w+)\] (\w+)"/&gt;
-    &lt;property name="checkPattern" value="$1"/&gt;
-  &lt;/module&gt;
-  &lt;module name="TreeWalker"&gt;
-    &lt;module name="MagicNumber"/&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example7.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example7-code">
           Example:
         </p>
-        <source>
-int a = 42; // -@cs[MagicNumber] We do not consider this number as magic for some reason.
-int b = 43; // violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example7.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example8-config">
           To configure the filter to accept variable <code>checkPattern</code>
           and <code>lineRange</code>:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="nearbyTextPattern"
-      value="@cs-: (\w+) for ([+-]\d+) lines"/&gt;
-    &lt;property name="checkPattern" value="$1"/&gt;
-    &lt;property name="lineRange" value="$2"/&gt;
-  &lt;/module&gt;
-  &lt;module name="TreeWalker"&gt;
-    &lt;module name="MagicNumber"/&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example8.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example8-code">
           Example:
         </p>
-        <source>
-int a = 42; // @cs-: MagicNumber for +3 lines
-int b = 43;
-int c = 44;
-int d = 45;
-int e = 46; // violation
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example8.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example9-config">
           To configure the filter to suppress <code>LineLength</code>
           violations for lines containing a URL:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithNearbyTextFilter"&gt;
-    &lt;property name="checkPattern" value="LineLength"/&gt;
-    &lt;property name="nearbyTextPattern"
-      value="&amp;lt;a href=&amp;quot;[^&amp;quot;]+&amp;quot;&amp;gt;"/&gt;
-  &lt;/module&gt;
-  &lt;module name="LineLength"&gt;
-    &lt;property name="max" value="90"/&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example9.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example9-code">
           Example:
         </p>
-        <source>
-/**
-* Flag description.
-*
-* Disabled until &lt;a href="www.github.com/owner/repo/issue/9#comment"&gt; // ok
-*/
-public static final boolean SOME_FLAG = false;
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithnearbytextfilter/Example9.txt"/>
+          <param name="type" value="code"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppresswithplaintextcommentfilter.xml b/src/xdocs/filters/suppresswithplaintextcommentfilter.xml
index d309042a7ce..7f459018fde 100644
--- a/src/xdocs/filters/suppresswithplaintextcommentfilter.xml
+++ b/src/xdocs/filters/suppresswithplaintextcommentfilter.xml
@@ -48,39 +48,39 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>offCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to begin suppression.</td>
+              <td>checkFormat</td>
+              <td>Specify check pattern to suppress.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;// CHECKSTYLE:OFF&quot;</code></td>
+              <td><code>&quot;.*&quot;</code></td>
               <td>8.6</td>
             </tr>
             <tr>
-              <td>onCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to end suppression.</td>
+              <td>idFormat</td>
+              <td>Specify check ID pattern to suppress.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;// CHECKSTYLE:ON&quot;</code></td>
-              <td>8.6</td>
+              <td><code>null</code></td>
+              <td>8.24</td>
             </tr>
             <tr>
-              <td>checkFormat</td>
-              <td>Specify check pattern to suppress.</td>
+              <td>messageFormat</td>
+              <td>Specify message pattern to suppress.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>&quot;.*&quot;</code></td>
+              <td><code>null</code></td>
               <td>8.6</td>
             </tr>
             <tr>
-              <td>messageFormat</td>
-              <td>Specify message pattern to suppress.</td>
+              <td>offCommentFormat</td>
+              <td>Specify comment pattern to trigger filter to begin suppression.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
+              <td><code>&quot;// CHECKSTYLE:OFF&quot;</code></td>
               <td>8.6</td>
             </tr>
             <tr>
-              <td>idFormat</td>
-              <td>Specify check ID pattern to suppress.</td>
+              <td>onCommentFormat</td>
+              <td>Specify comment pattern to trigger filter to end suppression.</td>
               <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.24</td>
+              <td><code>&quot;// CHECKSTYLE:ON&quot;</code></td>
+              <td>8.6</td>
             </tr>
           </table>
         </div>
@@ -98,19 +98,17 @@
         </p>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure a filter to suppress audit events between a comment
           containing <code>CHECKSTYLE:OFF</code> and a comment containing
           <code>CHECKSTYLE:ON</code>:
         </p>
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
-  ...
   &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;/&gt;
-  ...
 &lt;/module&gt;
         </source>
-        <p>
+        <p id="Example2-config">
             To configure a filter to suppress audit events between a comment
             containing line <code>BEGIN GENERATED CONTENT</code> and a comment
             containing line <code>END GENERATED CONTENT</code>
@@ -127,6 +125,7 @@
 
 &lt;/module&gt;
         </source>
+        <p id="Example2-code">Example:</p>
         <source>
 //BEGIN GENERATED CONTENT
 my.property=value1 // No violation events will be reported
@@ -134,7 +133,7 @@ my.property=value2 // No violation events will be reported
 //END GENERATED CONTENT
 . . .
         </source>
-        <p>
+        <p id="Example3-config">
           To configure a filter so that <code>-- stop tab
           check</code> and <code>-- resume tab check</code> marks allowed tab positions
           (Checker is configured to check only sql files):
@@ -151,13 +150,14 @@ my.property=value2 // No violation events will be reported
 
 &lt;/module&gt;
         </source>
+        <p id="Example3-code">Example:</p>
         <source>
 -- stop tab check
   SELECT * FROM users // won't warn here if there is a tab character on line
 -- resume tab check
   SELECT 1 // will warn here if there is a tab character on line
         </source>
-        <p>
+        <p id="Example4-config">
           To configure a filter so that name of suppressed check mentioned
           in comment <code>CSOFF: <i>regexp</i></code>
           and <code>CSON: <i>regexp</i></code> mark a matching check
@@ -175,6 +175,7 @@ my.property=value2 // No violation events will be reported
 
 &lt;/module&gt;
         </source>
+        <p id="Example4-code">Example:</p>
         <source>
 // CSOFF: RegexpSinglelineCheck
  // RegexpSingleline check won't warn any lines below here if the line matches regexp
@@ -185,7 +186,7 @@ my.property=value2 // No violation events will be reported
 // RegexpSingleline check will warn below here if the line matches regexp
 &lt;property name=&quot;checkstyle.pattern.todo&quot; value=&quot;NOTHingWillMatCH_-&quot;/&gt;
         </source>
-        <p>
+        <p id="Example5-config">
           To configure a filter to suppress all audit events between a comment
           containing <code>CHECKSTYLE_OFF: ALMOST_ALL</code> and a comment containing
           <code>CHECKSTYLE_OFF: ALMOST_ALL</code> except for the <em>EqualsHashCode</em>
@@ -206,6 +207,7 @@ my.property=value2 // No violation events will be reported
 
 &lt;/module&gt;
         </source>
+        <p id="Example5-code">Example:</p>
         <source>
 // CHECKSTYLE_OFF: ALMOST_ALL
 public static final int array [];
@@ -213,7 +215,7 @@ private String [] strArray;
 // CHECKSTYLE_ON: ALMOST_ALL
 private int array1 [];
         </source>
-        <p>
+        <p id="Example6-config">
           To configure a filter to suppress Check's violation message <b>which matches
           specified message in messageFormat</b> (so suppression will not be only by
           Check's name, but also by message text, as the same Check can report
@@ -238,26 +240,8 @@ private int array1 [];
           with <code>-- CSOFF &lt;ID&gt; (reason)</code> and <code>-- CSON &lt;ID&gt;</code>,
           where ID is the ID of checks you want to suppress.
         </p>
-        <p>
-          Examples of Checkstyle checks configuration:
-        </p>
-        <source>
-&lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;count&quot;/&gt;
-  &lt;property name=&quot;format&quot; value=&quot;^.*COUNT(*).*$&quot;/&gt;
-  &lt;property name=&quot;message&quot;
-    value=&quot;Don't use COUNT(*), use COUNT(1) instead.&quot;/&gt;
-&lt;/module&gt;
-
-&lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
-  &lt;property name=&quot;id&quot; value=&quot;join&quot;/&gt;
-  &lt;property name=&quot;format&quot; value=&quot;^.*JOIN\s.+\s(ON|USING)$&quot;/&gt;
-  &lt;property name=&quot;message&quot;
-    value=&quot;Don't use JOIN, use sub-select instead.&quot;/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-            Example of SuppressWithPlainTextCommentFilter configuration
+        <p id="Example7-config">
+            Example of Checkstyle checks and SuppressWithPlainTextCommentFilter configuration
             (checkFormat which is set to '$1' points that ID of the checks
             is in the first group of offCommentFormat and onCommentFormat
             regular expressions):
@@ -272,8 +256,25 @@ private int array1 [];
     &lt;property name=&quot;idFormat&quot; value=&quot;$1&quot;/&gt;
   &lt;/module&gt;
 
+  &lt;module name=&quot;TreeWalker&quot;&gt;
+    &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;count&quot;/&gt;
+      &lt;property name=&quot;format&quot; value=&quot;^.*COUNT(*).*$&quot;/&gt;
+      &lt;property name=&quot;message&quot;
+        value=&quot;Don't use COUNT(*), use COUNT(1) instead.&quot;/&gt;
+    &lt;/module&gt;
+
+    &lt;module name=&quot;RegexpSinglelineJava&quot;&gt;
+      &lt;property name=&quot;id&quot; value=&quot;join&quot;/&gt;
+      &lt;property name=&quot;format&quot; value=&quot;^.*JOIN\s.+\s(ON|USING)$&quot;/&gt;
+      &lt;property name=&quot;message&quot;
+        value=&quot;Don't use JOIN, use sub-select instead.&quot;/&gt;
+    &lt;/module&gt;
+  &lt;/module&gt;
+
 &lt;/module&gt;
         </source>
+        <p id="Example7-code">Example:</p>
         <source>
 -- CSOFF join (it is ok to use join here for performance reasons)
 SELECT name, job_name
@@ -285,7 +286,7 @@ JOIN jobs AS j ON u.job_id = j.id
 EXPLAIN SELECT COUNT(*) FROM restaurants
 -- CSON count
         </source>
-        <p>
+        <p id="Example8-config">
             Example of how to configure the check to suppress more than one check
             (Checker is configured to check only sql files).
         </p>
@@ -300,6 +301,7 @@ EXPLAIN SELECT COUNT(*) FROM restaurants
 
 &lt;/module&gt;
         </source>
+        <p id="Example8-code">Example:</p>
         <source>
 -- @cs-: RegexpSinglelineCheck
 -- @cs-: FileTabCharacterCheck
@@ -310,6 +312,38 @@ CREATE TABLE STATION (
   LAT_N REAL,
   LONG_W REAL);
         </source>
+        <p id="Example9-config">
+            This check is not limited to comments. It can match any text in the given file
+            as <code>offCommentFormat</code> and <code>onCommentFormat</code> for the suppression.
+            The following example shows how to suppress violations within a text block for
+            LineLength.
+        </p>
+        <source>
+&lt;module name=&quot;Checker&quot;&gt;
+  &lt;module name=&quot;LineLength&quot;&gt;
+      &lt;property name=&quot;max&quot; value=&quot;100&quot;/&gt;
+  &lt;/module&gt;
+  &lt;module name=&quot;SuppressWithPlainTextCommentFilter&quot;&gt;
+    &lt;property name=&quot;offCommentFormat&quot; value='=\s+&quot;&quot;&quot;'/&gt;
+    &lt;property name=&quot;onCommentFormat&quot; value='^\s+&quot;&quot;&quot;;'/&gt;
+  &lt;/module&gt;
+&lt;/module&gt;
+        </source>
+        <p id="Example9-code">Example:</p>
+        <source>
+public class Example9 {
+
+  // ok, opening and closing triple quotes are 'offCommentFormat' and 'onCommentFormat'
+  static final String LOCATION_CSV_SAMPLE = &quot;&quot;&quot;
+          locationId,label,regionId,regionLabel,vendorId,vendorLabel,address,address2,city,stateProvinceCode,zipCode,countryCode,latitude,longitude
+          ST001,Station 001,ZONE1,Zone 1,CP1,Competitor 1,123 Street,Unit 2,Houston,TX,77033,US,29.761496813335178,-95.53049214204984
+          ST002,Station 002,ZONE2,,CP2,,668 Street,Unit 23,San Jose,CA,95191,US,37.35102477242508,-121.9209934020318
+          &quot;&quot;&quot;;
+
+  // violation below, 'Line is longer than 80 characters'
+  static final String SINGLE_LINE_SAMPLE = &quot;locationId,label,regionId,regionLabel,vendorId,vendorLabel,address,address2,city,stateProvinceCode,zipCode,countryCode,latitude,longitude&quot;;
+}
+        </source>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/filters/suppresswithplaintextcommentfilter.xml.template b/src/xdocs/filters/suppresswithplaintextcommentfilter.xml.template
index fb18b8a800f..351a07e29c8 100644
--- a/src/xdocs/filters/suppresswithplaintextcommentfilter.xml.template
+++ b/src/xdocs/filters/suppresswithplaintextcommentfilter.xml.template
@@ -39,50 +39,10 @@
       </subsection>
       <subsection name="Properties" id="Properties">
         <div class="wrapper">
-          <table>
-            <tr>
-              <th>name</th>
-              <th>description</th>
-              <th>type</th>
-              <th>default value</th>
-              <th>since</th>
-            </tr>
-            <tr>
-              <td>offCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to begin suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"// CHECKSTYLE:OFF"</code></td>
-              <td>8.6</td>
-            </tr>
-            <tr>
-              <td>onCommentFormat</td>
-              <td>Specify comment pattern to trigger filter to end suppression.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>"// CHECKSTYLE:ON"</code></td>
-              <td>8.6</td>
-            </tr>
-            <tr>
-              <td>checkFormat</td>
-              <td>Specify check pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>".*"</code></td>
-              <td>8.6</td>
-            </tr>
-            <tr>
-              <td>messageFormat</td>
-              <td>Specify message pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.6</td>
-            </tr>
-            <tr>
-              <td>idFormat</td>
-              <td>Specify check ID pattern to suppress.</td>
-              <td><a href="../property_types.html#Pattern">Pattern</a></td>
-              <td><code>null</code></td>
-              <td>8.24</td>
-            </tr>
-          </table>
+          <macro name="properties">
+            <param name="modulePath"
+                   value="src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java"/>
+          </macro>
         </div>
       </subsection>
       <subsection name="Notes" id="Notes">
@@ -98,139 +58,95 @@
         </p>
       </subsection>
       <subsection name="Examples" id="Examples">
-        <p>
+        <p id="Example1-config">
           To configure a filter to suppress audit events between a comment
           containing <code>CHECKSTYLE:OFF</code> and a comment containing
           <code>CHECKSTYLE:ON</code>:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  ...
-  &lt;module name="SuppressWithPlainTextCommentFilter"/&gt;
-  ...
-&lt;/module&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example1.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-config">
             To configure a filter to suppress audit events between a comment
             containing line <code>BEGIN GENERATED CONTENT</code> and a comment
             containing line <code>END GENERATED CONTENT</code>
             (Checker is configured to check only properties files):
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;property name="fileExtensions" value="properties"/&gt;
-
-  &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
-    &lt;property name="offCommentFormat" value="BEGIN GENERATED CONTENT"/&gt;
-    &lt;property name="onCommentFormat" value="END GENERATED CONTENT"/&gt;
-  &lt;/module&gt;
-
-&lt;/module&gt;
-        </source>
-        <source>
-//BEGIN GENERATED CONTENT
-my.property=value1 // No violation events will be reported
-my.property=value2 // No violation events will be reported
-//END GENERATED CONTENT
-. . .
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example2.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example2-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example2.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example3-config">
           To configure a filter so that <code>-- stop tab
           check</code> and <code>-- resume tab check</code> marks allowed tab positions
           (Checker is configured to check only sql files):
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;property name="fileExtensions" value="sql"/&gt;
-
-  &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
-    &lt;property name="offCommentFormat" value="stop tab check"/&gt;
-    &lt;property name="onCommentFormat" value="resume tab check"/&gt;
-    &lt;property name="checkFormat" value="FileTabCharacterCheck"/&gt;
-  &lt;/module&gt;
-
-&lt;/module&gt;
-        </source>
-        <source>
--- stop tab check
-  SELECT * FROM users // won't warn here if there is a tab character on line
--- resume tab check
-  SELECT 1 // will warn here if there is a tab character on line
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example3.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example3-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example3.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example4-config">
           To configure a filter so that name of suppressed check mentioned
           in comment <code>CSOFF: <i>regexp</i></code>
           and <code>CSON: <i>regexp</i></code> mark a matching check
           (Checker is configured to check only xml files):
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;property name="fileExtensions" value="xml"/&gt;
-
-  &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
-    &lt;property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/&gt;
-    &lt;property name="onCommentFormat" value="CSON\: ([\w\|]+)"/&gt;
-    &lt;property name="checkFormat" value="$1"/&gt;
-  &lt;/module&gt;
-
-&lt;/module&gt;
-        </source>
-        <source>
-// CSOFF: RegexpSinglelineCheck
- // RegexpSingleline check won't warn any lines below here if the line matches regexp
-&lt;condition property="checkstyle.ant.skip"&gt;
-  &lt;isset property="checkstyle.ant.skip"/&gt;
-&lt;/condition&gt;
-// CSON: RegexpSinglelineCheck
-// RegexpSingleline check will warn below here if the line matches regexp
-&lt;property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/&gt;
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example4.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example4-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example4.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example5-config">
           To configure a filter to suppress all audit events between a comment
           containing <code>CHECKSTYLE_OFF: ALMOST_ALL</code> and a comment containing
           <code>CHECKSTYLE_OFF: ALMOST_ALL</code> except for the <em>EqualsHashCode</em>
           check (Checker is configured to check only java files):
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;property name="fileExtensions" value="java"/&gt;
-
-  &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
-    &lt;property name="offCommentFormat"
-      value="CHECKSTYLE_OFF: ALMOST_ALL"/&gt;
-    &lt;property name="onCommentFormat"
-      value="CHECKSTYLE_ON: ALMOST_ALL"/&gt;
-    &lt;property name="checkFormat"
-      value="^((?!(FileTabCharacterCheck)).)*$"/&gt;
-  &lt;/module&gt;
-
-&lt;/module&gt;
-        </source>
-        <source>
-// CHECKSTYLE_OFF: ALMOST_ALL
-public static final int array [];
-private String [] strArray;
-// CHECKSTYLE_ON: ALMOST_ALL
-private int array1 [];
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example5.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example5-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example5.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example6-config">
           To configure a filter to suppress Check's violation message <b>which matches
           specified message in messageFormat</b> (so suppression will not be only by
           Check's name, but also by message text, as the same Check can report
           violations with different message format) between a comment
           containing <code>stop</code> and comment containing <code>resume</code>:
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
-    &lt;property name="offCommentFormat" value="stop"/&gt;
-    &lt;property name="onCommentFormat" value="resume"/&gt;
-    &lt;property name="checkFormat" value="FileTabCharacterCheck"/&gt;
-    &lt;property name="messageFormat"
-        value="^File contains tab characters (this is the first instance)\.$"/&gt;
-  &lt;/module&gt;
-&lt;/module&gt;
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example6.txt"/>
+          <param name="type" value="config"/>
+        </macro>
         <p>
           It is possible to specify an ID of checks, so that it can be leveraged by the
           SuppressWithPlainTextCommentFilter to skip validations.
@@ -238,78 +154,55 @@ private int array1 [];
           with <code>-- CSOFF &lt;ID&gt; (reason)</code> and <code>-- CSON &lt;ID&gt;</code>,
           where ID is the ID of checks you want to suppress.
         </p>
-        <p>
-          Examples of Checkstyle checks configuration:
-        </p>
-        <source>
-&lt;module name="RegexpSinglelineJava"&gt;
-  &lt;property name="id" value="count"/&gt;
-  &lt;property name="format" value="^.*COUNT(*).*$"/&gt;
-  &lt;property name="message"
-    value="Don't use COUNT(*), use COUNT(1) instead."/&gt;
-&lt;/module&gt;
-
-&lt;module name="RegexpSinglelineJava"&gt;
-  &lt;property name="id" value="join"/&gt;
-  &lt;property name="format" value="^.*JOIN\s.+\s(ON|USING)$"/&gt;
-  &lt;property name="message"
-    value="Don't use JOIN, use sub-select instead."/&gt;
-&lt;/module&gt;
-        </source>
-        <p>
-            Example of SuppressWithPlainTextCommentFilter configuration
+        <p id="Example7-config">
+            Example of Checkstyle checks and SuppressWithPlainTextCommentFilter configuration
             (checkFormat which is set to '$1' points that ID of the checks
             is in the first group of offCommentFormat and onCommentFormat
             regular expressions):
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;property name="fileExtensions" value="sql"/&gt;
-
-  &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
-    &lt;property name="offCommentFormat" value="CSOFF (\w+) \(\w+\)"/&gt;
-    &lt;property name="onCommentFormat" value="CSON (\w+)"/&gt;
-    &lt;property name="idFormat" value="$1"/&gt;
-  &lt;/module&gt;
-
-&lt;/module&gt;
-        </source>
-        <source>
--- CSOFF join (it is ok to use join here for performance reasons)
-SELECT name, job_name
-FROM users AS u
-JOIN jobs AS j ON u.job_id = j.id
--- CSON join
-
--- CSOFF count (test query execution plan)
-EXPLAIN SELECT COUNT(*) FROM restaurants
--- CSON count
-        </source>
-        <p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example7.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example7-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example7.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example8-config">
             Example of how to configure the check to suppress more than one check
             (Checker is configured to check only sql files).
         </p>
-        <source>
-&lt;module name="Checker"&gt;
-  &lt;property name="fileExtensions" value="sql"/&gt;
-
-  &lt;module name="SuppressWithPlainTextCommentFilter"&gt;
-    &lt;property name="offCommentFormat" value="@cs-\: ([\w\|]+)"/&gt;
-    &lt;property name="checkFormat" value="$1"/&gt;
-  &lt;/module&gt;
-
-&lt;/module&gt;
-        </source>
-        <source>
--- @cs-: RegexpSinglelineCheck
--- @cs-: FileTabCharacterCheck
-CREATE TABLE STATION (
-  ID INTEGER PRIMARY KEY,
-  CITY CHAR(20),
-  STATE CHAR(2),
-  LAT_N REAL,
-  LONG_W REAL);
-        </source>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example8.txt"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example8-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example8.txt"/>
+          <param name="type" value="code"/>
+        </macro>
+        <p id="Example9-config">
+            This check is not limited to comments. It can match any text in the given file
+            as <code>offCommentFormat</code> and <code>onCommentFormat</code> for the suppression.
+            The following example shows how to suppress violations within a text block for
+            LineLength.
+        </p>
+        <macro name="example">
+          <param name="path"
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example9.java"/>
+          <param name="type" value="config"/>
+        </macro>
+        <p id="Example9-code">Example:</p>
+        <macro name="example">
+          <param name="path"
+                 value="resources-noncompilable/com/puppycrawl/tools/checkstyle/filters/suppresswithplaintextcommentfilter/Example9.java"/>
+          <param name="type" value="code"/>
+        </macro>
       </subsection>
       <subsection name="Example of Usage" id="Example_of_Usage">
         <ul>
diff --git a/src/xdocs/index.xml.vm b/src/xdocs/index.xml.vm
index 3189d3b88b6..89c315b6c13 100644
--- a/src/xdocs/index.xml.vm
+++ b/src/xdocs/index.xml.vm
@@ -442,7 +442,7 @@
               <td/>
             </tr>
             <tr>
-              <td><a href="https://netbeans.apache.org/">NetBeans</a></td>
+              <td><a href="https://netbeans.apache.org/front/main/index.html">NetBeans</a></td>
               <td>Petr Hejl</td>
               <td>
                 <a href="https://www.sickboy.cz/checkstyle/">Checkstyle Beans</a>
@@ -453,7 +453,7 @@
               </td>
             </tr>
             <tr>
-              <td><a href="https://netbeans.apache.org/">NetBeans</a></td>
+              <td><a href="https://netbeans.apache.org/front/main/index.html">NetBeans</a></td>
               <td/>
               <td>
                 <a href="http://sqe-team.github.io">Software Quality Environment (SQE)</a>
@@ -468,9 +468,9 @@
               <td><a href="https://sonarcloud.io/projects">Demo site of SonarQube</a></td>
             </tr>
             <tr>
-              <td><a href="http://www.jedit.org/">jEdit</a></td>
+              <td><a href="https://www.jedit.org/">jEdit</a></td>
               <td>Todd Papaioannou</td>
-              <td><a href="http://plugins.jedit.org/plugins/?CheckStylePlugin">
+              <td><a href="https://plugins.jedit.org/plugins/?CheckStylePlugin">
                   JEdit CheckStylePlugin</a></td>
               <td/>
             </tr>
@@ -530,6 +530,14 @@
                   in your repository sources, and apply their related linters. Available as GitHub
                   Action, other CI tools and locally</td>
             </tr>
+            <tr>
+              <td>
+                <a href="https://rife2.com/bld">bld</a>
+              </td>
+              <td>Erik C. Thauvin</td>
+              <td><a href="https://github.com/rife2/bld-checkstyle">Checkstyle Extension</a> for bld</td>
+              <td>An extension for checking source code in a bld project</td>
+            </tr>
           </table>
         </div>
       </subsection>
diff --git a/src/xdocs/property_types.xml b/src/xdocs/property_types.xml
index 990a1d56808..3422134535c 100644
--- a/src/xdocs/property_types.xml
+++ b/src/xdocs/property_types.xml
@@ -673,8 +673,21 @@
     <section name="Pattern[]">
       <p>
         This type represents a set of patterns. The string representation
-        is parsed as a set of forward slash ('/') separated patterns.
+        is parsed as a set of comma (',') separated patterns.
       </p>
+      <p>
+        Alternatively, a property of this type can be supplied multiple
+        times which is equivalent to a set of comma separated patterns.
+        For example, the following:
+      </p>
+      <source>
+&lt;property name=&quot;patterns&quot; value=&quot;^prefix*$, ^*suffix$&quot;/&gt;
+      </source>
+      <p>can instead be expressed as:</p>
+      <source>
+&lt;property name=&quot;patterns&quot; value=&quot;^prefix*&quot;/&gt;
+&lt;property name=&quot;patterns&quot; value=&quot;^*suffix$&quot;/&gt;
+      </source>
     </section>
 
     <section name="RightCurlyOption">
@@ -925,7 +938,7 @@
     <section name="String[]">
       <p>
         This type represents a set of strings. The string representation
-        is parsed as a set of comma (',') separated strings.
+        is parsed as a set of comma (',') separated strings. Extra spaces are allowed.
       </p>
       <p>
         Alternatively, a property of this type can be supplied multiple times which
@@ -933,7 +946,7 @@
         following:
       </p>
       <source>
-&lt;property name=&quot;tokens&quot; value=&quot;DIV_ASSIGN,PLUS_ASSIGN&quot;/&gt;
+&lt;property name=&quot;tokens&quot; value=&quot;DIV_ASSIGN, PLUS_ASSIGN&quot;/&gt;
       </source>
       <p>can instead be expressed as:</p>
       <source>
diff --git a/src/xdocs/releasenotes.xml b/src/xdocs/releasenotes.xml
index 63dad6d6dfb..76573d1bde3 100644
--- a/src/xdocs/releasenotes.xml
+++ b/src/xdocs/releasenotes.xml
@@ -10,6 +10,1226 @@
 
   <body>
     <!-- placeholder for a new section -->
+    <section name="Release 10.17.0">
+      <div class="releaseDate">26.05.2024</div>
+      <p>Breaking backward compatibility:</p>
+        <ul>
+          <li>
+            ImportOrder: replace Pattern[] with String[] type for properties staticGroups and groups.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/13758">#13758</a>
+          </li>
+        </ul>
+      <p>New:</p>
+        <ul>
+          <li>
+            new Check: ConstructorsDeclarationGrouping to check the grouping of overloaded
+            constructors.
+            Author: Mauryan Kansara
+            <a href="https://github.com/checkstyle/checkstyle/issues/14726">#14726</a>
+          </li>
+        </ul>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            Checkstyle fails with &quot;Path contains invalid character&quot; if path to config file
+            contains non-ascii characters.
+            Author: Andrei Paikin
+            <a href="https://github.com/checkstyle/checkstyle/issues/13012">#13012</a>
+          </li>
+          <li>
+            Null pointer Exception in UnusedLocalVariableCheck.
+            Author: Vyom-Yadav
+            <a href="https://github.com/checkstyle/checkstyle/issues/13167">#13167</a>
+          </li>
+          <li>
+            False positive for UnusedLocalVariable.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/14506">#14506</a>
+          </li>
+          <li>
+            WhitespaceAround reports a violation when switch expression is passed as a method
+            argument.
+            Author: Andrei Paikin
+            <a href="https://github.com/checkstyle/checkstyle/issues/14825">#14825</a>
+          </li>
+          <li>
+            InnerAssignmentCheck failed for one line code in Java 14 switch expression.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/13086">#13086</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Drop ci jobs for unsupported java versions.
+            Author: Andrei Paikin
+            <a href="https://github.com/checkstyle/checkstyle/issues/14877">#14877</a>
+          </li>
+          <li>
+            test: shallowClone in checkstyle-tester with SHA checkout.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/14662">#14662</a>
+          </li>
+          <li>
+            --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin  
+            dependency-type: direct:production   update-type: version-update:semver-minor ....
+            Author: dependabot[bot]
+          </li>
+          <li>
+            --- updated-dependencies: - dependency-name:
+            org.codehaus.mojo:build-helper-maven-plugin   dependency-type: direct:production  
+            update-type: version-update:semver-minor ....
+            Author: dependabot[bot]
+          </li>
+          <li>
+            doc: makes links relative for version documentation.
+            Author: rnveach
+          </li>
+          <li>
+            doc: added link to video instructions.
+            Author: SteLeo1602
+          </li>
+          <li>
+            update JavadocTokenTypes.java to new format of AST print.
+            Author: SteLeo1603, prathm3
+            <a href="https://github.com/checkstyle/checkstyle/issues/14631">#14631</a>
+          </li>
+          <li>
+            doc: update issue template reference.
+            Author: Emmanuel Ferdman
+          </li>
+          <li>
+            Fix performance test.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/14852">#14852</a>
+          </li>
+          <li>
+            Optimize testing methods like verifyWithInlineConfigParser to run Check one time over
+            file.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/12586">#12586</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: prathm3
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            build failure due to maven.plugin.json.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/14853">#14853</a>
+          </li>
+          <li>
+            Parsing performance regression testing.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/14599">#14599</a>
+          </li>
+          <li>
+            doc: added additional explanation for clarification.
+            Author: SteLeo1602
+          </li>
+          <li>
+            doc: Updated demonstrative images on intellij doc page.
+            Author: SteLeo1602
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: prathm3
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.16.0">
+      <div class="releaseDate">28.04.2024</div>
+      <p>New:</p>
+        <ul>
+          <li>
+            LITERAL_CASE token support in RightCurlyCheck.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/14620">#14620</a>
+          </li>
+        </ul>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            OverloadMethodDeclarationOrder check ignores anything besides methods.
+            Author: Mauryan Kansara
+            <a href="https://github.com/checkstyle/checkstyle/issues/14765">#14765</a>
+          </li>
+          <li>
+            MagicNumberCheck NPE when ignoring field declarations.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/14788">#14788</a>
+          </li>
+          <li>
+            UnusedLocalVariable does not support local classes.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/14092">#14092</a>
+          </li>
+          <li>
+            UnusedImports does not report unused static imports when the method is used as a method
+            reference.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/12923">#12923</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            IDEA inspection suppressions resulted from migration to v2022.3.3.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14625">#14625</a>
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: Acesif, prathm3, Tara
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            Enforce new naming convention &quot;InputXpath{Checkname}Xxxx.java&quot; in IT area.
+            Author: Minghao Li, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14715">#14715</a>
+          </li>
+          <li>
+            update version of IDEA inspection engine Version:2022.3.3.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14448">#14448</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: Omar Shawky, Prathamesh-007
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            doc: updated cmdline docs to be more specific.
+            Author: MANISH-K-07
+          </li>
+          <li>
+            update JavadocTokenTypes.java to new format of AST print.
+            Author: Prathamesh-007
+            <a href="https://github.com/checkstyle/checkstyle/issues/14631">#14631</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.15.0">
+      <div class="releaseDate">01.04.2024</div>
+      <p>Breaking backward compatibility:</p>
+        <ul>
+          <li>
+            fix ordering of AST under STRING_TEMPLATE_BEGIN and remove empty
+            STRING_TEMPLATE_CONTENT nodes.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/14615">#14615</a>
+          </li>
+        </ul>
+      <p>New:</p>
+        <ul>
+          <li>
+            Add ignoreMethodAnnotatedBy property to ParameterNumberCheck.
+            Author: sktpy
+            <a href="https://github.com/checkstyle/checkstyle/issues/11340">#11340</a>
+          </li>
+        </ul>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            FallThrough check false positive with labelled break.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/11230">#11230</a>
+          </li>
+          <li>
+            some messages are still hardcoded in english.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/3110">#3110</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Enforce new naming convention &quot;InputXpath{Checkname}Xxxx.java&quot; in IT area.
+            Author: Kexin2000, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14715">#14715</a>
+          </li>
+          <li>
+            Wrap `assertThrows` with `getExpectedThrowable` method..
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/11343">#11343</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: Kexin2000
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            Enforce input naming convention in IT.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/6981">#6981</a>
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: Kexin2000, Acesif, 10zhu, Smit Joshi, lmgyuan
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: Kexin2000, Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Resolve Pitest Suppression in Pitest-Javadoc Profile.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/13999">#13999</a>
+          </li>
+          <li>
+            update JavadocTokenTypes.java to new format of AST print.
+            Author: pinti0001
+            <a href="https://github.com/checkstyle/checkstyle/issues/14631">#14631</a>
+          </li>
+          <li>
+            Resolve CheckerFramework violations.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/14084">#14084</a>
+          </li>
+          <li>
+            Use module properties macro in all templates.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13693">#13693</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.14.2">
+      <div class="releaseDate">16.03.2024</div>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            Transitive dependency rejection after Guava upgrade to 32.1.3-jre.
+            Author: lukasgraef
+            <a href="https://github.com/checkstyle/checkstyle/issues/14123">#14123</a>
+          </li>
+          <li>
+            GenericWhitespaceCheck: Handling of whitespace between generic and record header.
+            Author: sktpy
+            <a href="https://github.com/checkstyle/checkstyle/issues/14502">#14502</a>
+          </li>
+          <li>
+            JavadocStyle doesn&#39;t work with inline `@return`.
+            Author: Omar Bakry
+            <a href="https://github.com/checkstyle/checkstyle/issues/12600">#12600</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Refactor AbstractModuleTestSupport and InlineConfigParser to support XML configs in
+            Input files without extra detalization on modules.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/14653">#14653</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: Minghao Li
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            Resolve Pitest Suppression in Pitest-Javadoc Profile.
+            Author: Tanay
+            <a href="https://github.com/checkstyle/checkstyle/issues/13999">#13999</a>
+          </li>
+          <li>
+            update JavadocTokenTypes.java to new format of AST print.
+            Author: SteLeo1602, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14631">#14631</a>
+          </li>
+          <li>
+            spelling: Some traditional Chinese characters were changed to simplified Chinese.
+            Author: zhen6.gao
+          </li>
+          <li>
+            Cover pitest survivals with tests.
+            Author: Mauryan Kansara
+            <a href="https://github.com/checkstyle/checkstyle/issues/14019">#14019</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.14.1">
+      <div class="releaseDate">11.03.2024</div>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            Performance regression from 10.12.4 to 10.13.0.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/14566">#14566</a>
+          </li>
+          <li>
+            False positive in RightCurly with &#39;alone_or_singleline&#39; RightCurlyOption in
+            try/catch.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/12020">#12020</a>
+          </li>
+          <li>
+            some messages are still hardcoded in english.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/3110">#3110</a>
+          </li>
+          <li>
+            False positive error from JavadocType with record.
+            Author: sktpy
+            <a href="https://github.com/checkstyle/checkstyle/issues/13309">#13309</a>
+          </li>
+          <li>
+            VariableDeclarationUsageDistance: no violation to move variables closer to block.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/3502">#3502</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Enable examples tests.
+            Author: Minghao Li, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: Minghao Li, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: Minghao Li, DevangJagdale, pinti0001, Omar Shawky, 555vedant,
+            Raja Raghu Ram Pydi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            Rename Java Input files and test methods to specify Test functionality.
+            Author: pinti0001, Abhishek Maity, MANISH-K-07, CubeTures
+            <a href="https://github.com/checkstyle/checkstyle/issues/14436">#14436</a>
+          </li>
+          <li>
+            update JavadocTokenTypes.java to new format of AST print.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14631">#14631</a>
+          </li>
+          <li>
+            doc: Updated description and docs of TextBlock.
+            Author: MANISH-K-07
+          </li>
+          <li>
+            inconsistent documentation for TEXT_BLOCK_abc token types.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/12491">#12491</a>
+          </li>
+          <li>
+            Excludes for createTempFile forbidden method .
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/14465">#14465</a>
+          </li>
+          <li>
+            doc: Update TokenTypes link to be more specific.
+            Author: MANISH-K-07
+          </li>
+          <li>
+            update TokenTypes.java to new format of AST print.
+            Author: SteLeo1602, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14516">#14516</a>
+          </li>
+          <li>
+            Update Tests to use new &#39;verifyXxxxxx&#39; method or &#39;execute&#39; that use
+            inlined config in Input files.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/11446">#11446</a>
+          </li>
+          <li>
+            AbstractXpathTestSupport does not support generating multiple xpath suppressions.
+            Author: Tanay
+            <a href="https://github.com/checkstyle/checkstyle/issues/14435">#14435</a>
+          </li>
+          <li>
+            move AllBlockCommentTest and AllSinglelineCommentsTest to AST Tests.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/14518">#14518</a>
+          </li>
+          <li>
+            doc: fix line length violation in releasenotes.xml.
+            Author: mahfouz72
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.14.0">
+      <div class="releaseDate">28.02.2024</div>
+      <p>New:</p>
+        <ul>
+          <li>
+            Checkstyle fails to parse unnamed variable.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13988">#13988</a>
+          </li>
+        </ul>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            GenericWhitespace Check ignores exception to the &quot;&gt;&quot; rule for succeeding
+            whitespaces.
+            Author: sktpy
+            <a href="https://github.com/checkstyle/checkstyle/issues/14344">#14344</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: Aye Nyein San, biplavoraon, mahfouz72, Abhishek Maity, SteLeo1602,
+            akanksha, MANISH-K-07, Tahanima Chowdhury, CubeTures
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            Update Codenarc to highest compatible release - v2.2.0.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14556">#14556</a>
+          </li>
+          <li>
+            Remove UnmodifiableCollectionUtil and use pitest funmodifiablecollection feature.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/14482">#14482</a>
+          </li>
+          <li>
+            Enable checks from Error Prone Support.
+            Author: Rick Ossendrijver
+            <a href="https://github.com/checkstyle/checkstyle/issues/14137">#14137</a>
+          </li>
+          <li>
+            Cover pitest survivals with tests.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/14019">#14019</a>
+          </li>
+          <li>
+            improve text block grammar.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/14503">#14503</a>
+          </li>
+          <li>
+            checker-framework.yml should be able to fail execution if report generation is failed.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/14396">#14396</a>
+          </li>
+          <li>
+            upadat example in javadoc for EMBEDDED_EXPRESSION* tokens.
+            Author: mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/14317">#14317</a>
+          </li>
+          <li>
+            doc: mention text block suppression.
+            Author: Nick Mancuso
+          </li>
+          <li>
+            Rename Java Input files and test methods to specify Test functionality.
+            Author: MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/14436">#14436</a>
+          </li>
+          <li>
+            infra: should use release 11 for compilation.
+            Author: Michael Keppler
+            <a href="https://github.com/checkstyle/checkstyle/issues/14485">#14485</a>
+          </li>
+          <li>
+            Resolve Pitest Suppression in Pitest-Javadoc Profile.
+            Author: Coding-Aliens, sktpy, mahfouz72
+            <a href="https://github.com/checkstyle/checkstyle/issues/13999">#13999</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: mahfouz72, MANISH-K-07, ChristianCecili
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Execute all checkstyle samples in each PR execution.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/12558">#12558</a>
+          </li>
+          <li>
+            Update Tests to use new &#39;verifyXxxxxx&#39; method or &#39;execute&#39; that use
+            inlined config in Input files.
+            Author: mahfouz72, piyush bakde, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/11446">#11446</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: mahfouz72, Tanay
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            Forbid Files.createTempDirectory in Checkstyle and replace with @TempDir.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/14220">#14220</a>
+          </li>
+          <li>
+            Enforce file size on Java inputs.
+            Author: mahfouz72, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/11163">#11163</a>
+          </li>
+          <li>
+            Resolve CheckerFramework violations.
+            Author: Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/14084">#14084</a>
+          </li>
+          <li>
+            Expanding maxmem to resolve OOM Exception (Checker checks).
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/14346">#14346</a>
+          </li>
+          <li>
+            doc: fix releasenotes.xml line length violation.
+            Author: Nick Mancuso
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.13.0">
+      <div class="releaseDate">28.01.2024</div>
+      <p>New:</p>
+        <ul>
+          <li>
+            IllegalTokenText support for STRING_TEMPLATE_CONTENT.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/14289">#14289</a>
+          </li>
+          <li>
+            Support Java 21 string template syntax.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13830">#13830</a>
+          </li>
+        </ul>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            &quot;Unable to persist cache file&quot; if target directory is a symlink.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/12238">#12238</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Enforce file size on Java inputs.
+            Author: sktpy, mahfouz72, MANISH-K-07
+            <a href="https://github.com/checkstyle/checkstyle/issues/11163">#11163</a>
+          </li>
+          <li>
+            Enable checks from Error Prone Support.
+            Author: Rick Ossendrijver
+            <a href="https://github.com/checkstyle/checkstyle/issues/14137">#14137</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: Gahlot Kapil, Coding-Aliens, sktpy, Mauryan Kansara, Rohanraj123,
+            Charisma Kausar
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: Coding-Aliens, mahfouz72, sktpy, Charisma Kausar, MANISH-K-07,
+            ChristianCecili, Tahanima Chowdhury
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: Coding-Aliens, sktpy, Tanay, Mauryan Kansara
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            Resolve Pitest Suppression in Pitest-Javadoc Profile.
+            Author: Suniti, Mauryan Kansara
+            <a href="https://github.com/checkstyle/checkstyle/issues/13999">#13999</a>
+          </li>
+          <li>
+            CustomImportOrder property &#39;customImportOrderRules&#39; should be String[].
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/14216">#14216</a>
+          </li>
+          <li>
+            PropertyCacheFileTest Failing: 3 Test Methods Failing Along With
+            testSymbolicLinkResolution() Causing Issue.
+            Author: dependabot[bot]
+            <a href="https://github.com/checkstyle/checkstyle/issues/14219">#14219</a>
+          </li>
+          <li>
+            Update Tests to use new &#39;verifyXxxxxx&#39; method or &#39;execute&#39; that use
+            inlined config in Input files.
+            Author: Tanay Morakhia, Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/11446">#11446</a>
+          </li>
+          <li>
+            Use module properties macro in all templates.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13693">#13693</a>
+          </li>
+          <li>
+            Make Checkstyle an (automatic) module.
+            Author: Frank Ulbricht
+            <a href="https://github.com/checkstyle/checkstyle/issues/14120">#14120</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.12.7">
+      <div class="releaseDate">31.12.2023</div>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            False positive in MissingSwitchDefault for switch statement where null label is present.
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/14068">#14068</a>
+          </li>
+          <li>
+            HiddenField false positive on inner records.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/14028">#14028</a>
+          </li>
+          <li>
+            Indentation: split line new array not checked.
+            Author: plan3d
+            <a href="https://github.com/checkstyle/checkstyle/issues/3132">#3132</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Use module properties macro in all templates.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13693">#13693</a>
+          </li>
+          <li>
+            Resolve Pitest Suppression in Pitest-Javadoc Profile.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/13999">#13999</a>
+          </li>
+          <li>
+            Enable checks from Error Prone Support.
+            Author: Rick Ossendrijver
+            <a href="https://github.com/checkstyle/checkstyle/issues/14137">#14137</a>
+          </li>
+          <li>
+            Update Tests to use new &#39;verifyXxxxxx&#39; method or &#39;execute&#39; that use
+            inlined config in Input files.
+            Author: Suniti, piyush bakde, Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/11446">#11446</a>
+          </li>
+          <li>
+            Add support to our Inputs for lines with multiple violations.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13307">#13307</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: Tarun Alapati
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Enforce file size on Java inputs.
+            Author: Mauryan Kansara
+            <a href="https://github.com/checkstyle/checkstyle/issues/11163">#11163</a>
+          </li>
+          <li>
+            Transitive dependency rejection after Guava upgrade to 32.1.3-jre.
+            Author: Christopher Lambert
+            <a href="https://github.com/checkstyle/checkstyle/issues/14123">#14123</a>
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: mahfouz72, Andrei Yusupau, Tarun Alapati, Mauryan Kansara
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            Cover pitest survivals with tests.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/14019">#14019</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            File name too long error.
+            Author: Rick Ossendrijver
+            <a href="https://github.com/checkstyle/checkstyle/issues/14129">#14129</a>
+          </li>
+          <li>
+            Update CI to have Maven Version 3.8.8, update min required maven version in pom to
+            3.6.3 .
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13970">#13970</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.12.6">
+      <div class="releaseDate">07.12.2023</div>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            Regexp: violation pointing to line 0 while other Checks count first line as 1.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/14064">#14064</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Resolve CheckerFramework violations.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/14084">#14084</a>
+          </li>
+          <li>
+            Resolve Pitest Suppression in Pitest-Javadoc Profile.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/13999">#13999</a>
+          </li>
+          <li>
+            Update Tests to use new &#39;verifyXxxxxx&#39; method or &#39;execute&#39; that use
+            inlined config in Input files.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/11446">#11446</a>
+          </li>
+          <li>
+            Test inputs should be completely standalone..
+            Author: piyush bakde, Pubudu Fernando
+            <a href="https://github.com/checkstyle/checkstyle/issues/4845">#4845</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            Update CI to have Maven Version 3.8.8, update min required maven version in pom to
+            3.5.4 .
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13970">#13970</a>
+          </li>
+          <li>
+            Fix typo in Indentation check for word &#39;initialisation&#39;.
+            Author: Redeem-Grimm-Satoshi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13783">#13783</a>
+          </li>
+          <li>
+            Remove ArchUnit FreezingArchRule as it unstable to skip line numbers and any other
+            extra changes .
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/14053">#14053</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: rishivardhanm, Yukai Xiao
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            use valid SPDX license identifier.
+            Author: Michael Keppler
+            <a href="https://github.com/checkstyle/checkstyle/issues/13889">#13889</a>
+          </li>
+          <li>
+            Cover pitest survivals with tests.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/14019">#14019</a>
+          </li>
+          <li>
+            Re-enable ArchUnit Testing.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13544">#13544</a>
+          </li>
+          <li>
+            Surefire test exclusion can cause NoClassDefFoundError on case-insensitive file system.
+            Author: Stephan Schroevers
+            <a href="https://github.com/checkstyle/checkstyle/issues/14042">#14042</a>
+          </li>
+          <li>
+            migrate SuppressWarningsHolder to use property macro.
+            Author: piyush kumar sadangi, Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13839">#13839</a>
+          </li>
+          <li>
+            Use module properties macro in all templates.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13693">#13693</a>
+          </li>
+          <li>
+            doc: add direct link to check.
+            Author: Nick Mancuso
+          </li>
+          <li>
+            Resolve pitest survivals in modules - 4.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/13672">#13672</a>
+          </li>
+          <li>
+            Migrate magicnumber.xml.template to use properties template.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13930">#13930</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.12.5">
+      <div class="releaseDate">14.11.2023</div>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            Indentation: Switch expression doesn&#39;t pass with LeftCurlies on newlines.
+            Author: Markus Jung
+            <a href="https://github.com/checkstyle/checkstyle/issues/14014">#14014</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Resolve pitest survivals in modules - 5.
+            Author: Kevin222004, Nick Mancuso, Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13809">#13809</a>
+          </li>
+          <li>
+            Resolve pitest survivals in modules - 2.
+            Author: Kevin222004, Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13321">#13321</a>
+          </li>
+          <li>
+            Since version is determined incorrectly by property macros at returncount.xml.template.
+            Author: Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/13934">#13934</a>
+          </li>
+          <li>
+            Resolve Pitest Suppression in Pitest-Javadoc Profile.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/13999">#13999</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: piyush kumar sadangi, Tanay Morakhia, Suniti, Tanay, piyush bakde,
+                    Rohanraj123, Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Expand XPath IT Regression Testing.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/6207">#6207</a>
+          </li>
+          <li>
+            doc: Added reference to the Checkstyle extension for bld.
+            Author: Erik C. Thauvin
+          </li>
+          <li>
+            Migrate illegaltype.xml.template to use properties template.
+            Author: Suniti, Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13893">#13893</a>
+          </li>
+          <li>
+            Specify violation messages in input files.
+            Author: Suniti, sushant1987
+            <a href="https://github.com/checkstyle/checkstyle/issues/11214">#11214</a>
+          </li>
+          <li>
+            Migrate multiplestringliterals.xml.template to use properties template.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13933">#13933</a>
+          </li>
+          <li>
+            Run regression testing in CI over openjdk21.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13982">#13982</a>
+          </li>
+          <li>
+            Remove call to Lexer#removeErrorListeners.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/12186">#12186</a>
+          </li>
+          <li>
+            Migrate DescendantToken to properties macros.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13885">#13885</a>
+          </li>
+          <li>
+            Test inputs should be completely standalone..
+            Author: Tanay Morakhia, Suniti, Guneetsinghtuli, Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/4845">#4845</a>
+          </li>
+          <li>
+            Update Javadoc checks to avoid // violation in Javadoc comments.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/13969">#13969</a>
+          </li>
+          <li>
+            Targeted Pitest Mutation in July 2023.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/13328">#13328</a>
+          </li>
+          <li>
+            create validation of git status on Windows environments.
+            Author: Kumar Kalpadiptya Roy
+            <a href="https://github.com/checkstyle/checkstyle/issues/11816">#11816</a>
+          </li>
+          <li>
+            Improve XdocGenerator to generate file in temp folder and replace xdoc only on success.
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13869">#13869</a>
+          </li>
+          <li>
+            Enforce Linux Style End-of-Line (LF instead of CRLF) in all XML files for windows
+            environment..
+            Author: Kumar Kalpadiptya Roy
+            <a href="https://github.com/checkstyle/checkstyle/issues/13770">#13770</a>
+          </li>
+          <li>
+            migrate FinalLocalVariable xdoc to use property macro.
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13853">#13853</a>
+          </li>
+          <li>
+            Use module properties macro in all templates.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13693">#13693</a>
+          </li>
+          <li>
+            SpotBugs: checks a map with containsKey(), before using get().
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13877">#13877</a>
+          </li>
+          <li>
+            migrate IllegalToken to properties macros.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13860">#13860</a>
+          </li>
+          <li>
+            Fix typo in Indentation check for word &#39;initialization&#39;.
+            Author: Suniti
+            <a href="https://github.com/checkstyle/checkstyle/issues/13783">#13783</a>
+          </li>
+          <li>
+            infra: do not allow in-progress site action to be cancelled by skipped run.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13863">#13863</a>
+          </li>
+          <li>
+            Resolve pitest for FinalLocalVariableCheck.
+            Author: Ruslan Diachenko
+            <a href="https://github.com/checkstyle/checkstyle/issues/12671">#12671</a>
+          </li>
+          <li>
+            MacroExecutionException: TypecastParenPadCheck: Failed to find setter javadoc for
+            property &#39;option&#39;.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13867">#13867</a>
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: Suniti, Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            migrate to property macros IllegalTokenText .
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13859">#13859</a>
+          </li>
+          <li>
+            Enforce file size on Java inputs.
+            Author: Rohanraj123
+            <a href="https://github.com/checkstyle/checkstyle/issues/11163">#11163</a>
+          </li>
+          <li>
+            False Positive and Negative in SummaryJavaDocCheck.
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13347">#13347</a>
+          </li>
+          <li>
+            infra: actionlint bad yaml.
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13765">#13765</a>
+          </li>
+          <li>
+            Infra: enable dependabot for github actions.
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/12984">#12984</a>
+          </li>
+          <li>
+            &#39;javadoc.unclosedHtml&#39; message is not present in documentation for most Javadoc
+            Checks.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13775">#13775</a>
+          </li>
+          <li>
+            Use violation messages macro in all templates.
+            Author: piyush kumar sadangi, Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13627">#13627</a>
+          </li>
+          <li>
+            .vscode folder must be added to .gitignore to avoid getting tracked by git..
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13834">#13834</a>
+          </li>
+          <li>
+            Convert Parent Modules to Macro.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13829">#13829</a>
+          </li>
+          <li>
+            Resolve pitest survivals in modules - 4.
+            Author: Kevin222004, Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13672">#13672</a>
+          </li>
+          <li>
+            Node.js 12 actions are deprecated..
+            Author: Aayush
+            <a href="https://github.com/checkstyle/checkstyle/issues/13045">#13045</a>
+          </li>
+          <li>
+            Document ability to use whitespace in array configuration properties.
+            Author: Redeem-Grimm-Satoshi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13650">#13650</a>
+          </li>
+          <li>
+            Create a Checkstyle module to enforce comment formatting in input files.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13797">#13797</a>
+          </li>
+        </ul>
+    </section>
+    <section name="Release 10.12.4">
+      <div class="releaseDate">02.10.2023</div>
+      <p>Bug fixes:</p>
+        <ul>
+          <li>
+            MissingDeprecated shows unclear message on not closed html tag.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13745">#13745</a>
+          </li>
+        </ul>
+      <p>Notes:</p>
+        <ul>
+          <li>
+            Resolve pitest survivals in modules - 5.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/13809">#13809</a>
+          </li>
+          <li>
+            Resolve pitest survivals in modules - 4.
+            Author: Vyom-Yadav, Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/13672">#13672</a>
+          </li>
+          <li>
+            Assert that properties are ordered alphabetically in xdoc.
+            Author: Stoyan Kostadinov, Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13666">#13666</a>
+          </li>
+          <li>
+            Enable examples tests.
+            Author: piyush kumar sadangi, Guneetsinghtuli, Rohanraj123, Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13345">#13345</a>
+          </li>
+          <li>
+            Test inputs should be completely standalone..
+            Author: Guneetsinghtuli
+            <a href="https://github.com/checkstyle/checkstyle/issues/4845">#4845</a>
+          </li>
+          <li>
+            Remove &#39;//ok&#39; comments from Input files .
+            Author: piyush kumar sadangi, Rohanraj123, Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13213">#13213</a>
+          </li>
+          <li>
+            Surviving pitest mutations for conditions reducing time complexity at
+            PackageObjectFactory.
+            Author: Ruslan Diachenko
+            <a href="https://github.com/checkstyle/checkstyle/issues/11902">#11902</a>
+          </li>
+          <li>
+            Extend `generate-extra-site-links.sh` to not include deleted pages in comments.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13175">#13175</a>
+          </li>
+          <li>
+            Order properties alphabetically in xdocs and javadocs.
+            Author: Stoyan Kostadinov, Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13668">#13668</a>
+          </li>
+          <li>
+            Add Examples Macro Support to All Checks.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13732">#13732</a>
+          </li>
+          <li>
+            Typo.
+            Author: Clint-Mathews
+            <a href="https://github.com/checkstyle/checkstyle/issues/13735">#13735</a>
+          </li>
+          <li>
+            Fix Pitest script to recognize unstable mutations.
+            Author: Vyom-Yadav
+            <a href="https://github.com/checkstyle/checkstyle/issues/13492">#13492</a>
+          </li>
+          <li>
+            Resolve pitest survivals in modules - 3.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/13501">#13501</a>
+          </li>
+          <li>
+            Targeted Pitest Mutation in July 2023.
+            Author: Ruslan Diachenko
+            <a href="https://github.com/checkstyle/checkstyle/issues/13328">#13328</a>
+          </li>
+          <li>
+            Create checks to place violations on missing macros in templates.
+            Author: Nick Mancuso
+            <a href="https://github.com/checkstyle/checkstyle/issues/13682">#13682</a>
+          </li>
+          <li>
+            Use module properties macro in all templates.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13693">#13693</a>
+          </li>
+          <li>
+            Update Violation Message in Input files for FallThroughCheck.
+            Author: Kumar Kalpadiptya Roy
+            <a href="https://github.com/checkstyle/checkstyle/issues/13552">#13552</a>
+          </li>
+          <li>
+            Simplify requirement for what we consider a setter method in
+            ClassAndPropertiesSettersJavadocScraper.
+            Author: Stoyan Kostadinov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13680">#13680</a>
+          </li>
+          <li>
+            NonEmptyAtclauseDescription examples are cut in website.
+            Author: Roman Ivanov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13660">#13660</a>
+          </li>
+          <li>
+            Move CheckUtil#isGetterMethod and CheckUtil#isSetterMethod to MissingJavadocMethodCheck.
+            Author: piyush kumar sadangi
+            <a href="https://github.com/checkstyle/checkstyle/issues/13596">#13596</a>
+          </li>
+          <li>
+            Implement module properties macro.
+            Author: Stoyan Kostadinov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13399">#13399</a>
+          </li>
+          <li>
+            Get rid of module javadoc examples.
+            Author: Stoyan Kostadinov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13429">#13429</a>
+          </li>
+          <li>
+            Fix existing cases of `getFileContents()` usage.
+            Author: Kevin222004
+            <a href="https://github.com/checkstyle/checkstyle/issues/11166">#11166</a>
+          </li>
+          <li>
+            Create tests from xdoc examples.
+            Author: Stoyan Kostadinov
+            <a href="https://github.com/checkstyle/checkstyle/issues/13100">#13100</a>
+          </li>
+        </ul>
+    </section>
     <section name="Release 10.12.3">
       <div class="releaseDate">28.08.2023</div>
       <p>Bug fixes:</p>
diff --git a/src/xdocs/releasenotes_old_1-0_5-9.xml b/src/xdocs/releasenotes_old_1-0_5-9.xml
index 71c05a286fb..4da60e333b7 100644
--- a/src/xdocs/releasenotes_old_1-0_5-9.xml
+++ b/src/xdocs/releasenotes_old_1-0_5-9.xml
@@ -70,7 +70,7 @@
         <li>
           New: EmptyLineSeparator check. Author: Max Vetrenko. <a href="https://github.com/checkstyle/checkstyle/issues/186">#186</a>
         </li>
-        <li> Enable array initialisation indentation settings. Author: Vaclav Chalupa. </li>
+        <li> Enable array initialization indentation settings. Author: Vaclav Chalupa. </li>
         <li> Enhance WhitespaceAroundCheck to ignore Annotation Array Initialization curlies as it
         does for Array Initialization outside of annotations. Author: Jacob Tomaw </li>
         <li>
diff --git a/src/xdocs/sponsoring.xml b/src/xdocs/sponsoring.xml
index a8945d29435..7b44d75aa05 100644
--- a/src/xdocs/sponsoring.xml
+++ b/src/xdocs/sponsoring.xml
@@ -18,24 +18,6 @@
       </p>
 
       <p>
-        <span class="wrapper">
-          <a href="https://www.bountysource.com/teams/checkstyle/issues">
-            <span class="wrapper inline">
-              <img src="https://api.bountysource.com/badge/team?team_id=3568&amp;style=bounties_posted"
-                   alt="bountysource" title="bountysource" border="0"/>
-            </span>
-          </a>
-        </span>
-        <br/>
-        <span class="wrapper">
-          <a href="https://salt.bountysource.com/teams/checkstyle">
-            <span class="wrapper inline">
-              <img src="https://img.shields.io/bountysource/team/checkstyle/activity.svg?label=salt.bountysource"
-                   alt="salt.bountysource" title="salt.bountysource" border="0"/>
-            </span>
-          </a>
-        </span>
-        <br/>
         <span class="wrapper">
           <a href="https://flattr.com/submit/auto?fid=g39d10&amp;url=https%3A%2F%2Fcheckstyle.org"
              target="_blank">
diff --git a/src/xdocs/sun_style.xml b/src/xdocs/sun_style.xml
index a357e71a5c2..584b1bd0e55 100644
--- a/src/xdocs/sun_style.xml
+++ b/src/xdocs/sun_style.xml
@@ -22,7 +22,7 @@
         </p>
 
         <p>
-          <a href="https://checkstyle.org/reports/javadoc/openjdk8/">
+          <a href="reports/javadoc/openjdk8/">
             Checkstyle's html report for Open JDK library (javadoc validation)</a>
         </p>
         <p>
diff --git a/src/xdocs/writingchecks.xml b/src/xdocs/writingchecks.xml
index bd34de7ff8f..2386287b0ea 100644
--- a/src/xdocs/writingchecks.xml
+++ b/src/xdocs/writingchecks.xml
@@ -384,7 +384,7 @@ public class MethodLimitCheck extends AbstractCheck
 
       <p>
         There are four methods in Check class to control the processed
-        <a href="apidocs/index.html">TokenTypes</a> -
+        <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html">TokenTypes</a> -
         one setter
         <a href="apidocs/com/puppycrawl/tools/checkstyle/api/AbstractCheck.html#setTokens-java.lang.String...-">
         setTokens()</a>, which is used to define a custom set (which is different
diff --git a/src/xdocs/writingjavadocchecks.xml.vm b/src/xdocs/writingjavadocchecks.xml.vm
index ed6b7d00cdc..8077a9004ca 100644
--- a/src/xdocs/writingjavadocchecks.xml.vm
+++ b/src/xdocs/writingjavadocchecks.xml.vm
@@ -766,7 +766,7 @@ Checkstyle ends with 5 errors.
       </p>
       <p>
         For detail reference you can see
-        <a href="https://checkstyle.org/writingchecks.html#The_Checkstyle_SDK_Gui">
+        <a href="./writingchecks.html#The_Checkstyle_SDK_Gui">
           Checkstyle GUI documentation
         </a>.
       </p>